projects
/
iotcloud.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f915d1e
)
Changes
author
Ali Younis
<ayounis@uci.edu>
Sun, 14 May 2017 23:08:30 +0000
(16:08 -0700)
committer
Ali Younis
<ayounis@uci.edu>
Sun, 14 May 2017 23:08:30 +0000
(16:08 -0700)
version2/src/java/iotcloud/CloudComm.java
patch
|
blob
|
history
version2/src/java/iotcloud/SlotBuffer.java
patch
|
blob
|
history
version2/src/java/light_fan_embed_benchmark/LightsController.java
patch
|
blob
|
history
version2/src/server/iotquery.h
patch
|
blob
|
history
diff --git
a/version2/src/java/iotcloud/CloudComm.java
b/version2/src/java/iotcloud/CloudComm.java
index 5e60e3c4b90f1cd82f6d88a501b662af1f95b8d2..064fae0e9022f5e3fb8964c2a5a6c4c3de38e6c1 100644
(file)
--- a/
version2/src/java/iotcloud/CloudComm.java
+++ b/
version2/src/java/iotcloud/CloudComm.java
@@
-140,6
+140,12
@@
class CloudComm {
byte[] saltTmp = new byte[SALT_SIZE];
random.nextBytes(saltTmp);
+ for(int i = 0; i < SALT_SIZE;i++)
+ {
+ System.out.println((int)saltTmp[i]&255);
+ }
+
+
URL url = new URL(baseurl + "?req=setsalt");
timer.startTime();
diff --git
a/version2/src/java/iotcloud/SlotBuffer.java
b/version2/src/java/iotcloud/SlotBuffer.java
index 716d0f28cd14bc1d5b1f1dee6f497c666f4a5de9..0bb5c8e69017f66000e9cc1ef5f5cd64930f8ab7 100644
(file)
--- a/
version2/src/java/iotcloud/SlotBuffer.java
+++ b/
version2/src/java/iotcloud/SlotBuffer.java
@@
-7,7
+7,7
@@
package iotcloud;
*/
class SlotBuffer {
- static final int DEFAULT_SIZE = 1
28
;
+ static final int DEFAULT_SIZE = 1
6
;
private Slot[] array;
private int head;
diff --git
a/version2/src/java/light_fan_embed_benchmark/LightsController.java
b/version2/src/java/light_fan_embed_benchmark/LightsController.java
index a8b7be2398f9032c8399ee10f8f4131e357e8eba..bc13be6759c36b6de3e68761d322c7802fdb8412 100644
(file)
--- a/
version2/src/java/light_fan_embed_benchmark/LightsController.java
+++ b/
version2/src/java/light_fan_embed_benchmark/LightsController.java
@@
-121,6
+121,7
@@
class LightsController {
} catch (Error e) {
+ e.printStackTrace();
for (int i = 0; i < 3; i++) {
bulbs.get(i).setColor(0, 100, 100);
}
diff --git
a/version2/src/server/iotquery.h
b/version2/src/server/iotquery.h
index 6ac5113df5b9b3b9be800a1961bd7a52329493a4..053a6db5ab1ba77df1ac88ec2ed98bd008575638 100644
(file)
--- a/
version2/src/server/iotquery.h
+++ b/
version2/src/server/iotquery.h
@@
-4,7
+4,7
@@
#include "fcgio.h"
#include "fcgi_stdio.h"
-#define DEFAULT_SIZE 1
28
+#define DEFAULT_SIZE 1
6
#define OFFSET_MAX 0
#define OFFSET_OLD 4
#define OFFSET_NEW 12