From 8fb84fdfbd03c8cd4cd30dbd3f8ded0835892496 Mon Sep 17 00:00:00 2001 From: Ali Younis Date: Mon, 15 May 2017 22:04:47 -0700 Subject: [PATCH] Changes --- .../light_fan_embed_benchmark/Sensor.java | 87 +++++++++++++++++++ .../java/light_fan_embed_benchmark/Setup.java | 12 +++ .../WemoController.java | 6 -- .../java/light_fan_embed_benchmark/run3.bash | 2 +- 4 files changed, 100 insertions(+), 7 deletions(-) create mode 100644 version2/src/java/light_fan_embed_benchmark/Sensor.java diff --git a/version2/src/java/light_fan_embed_benchmark/Sensor.java b/version2/src/java/light_fan_embed_benchmark/Sensor.java new file mode 100644 index 0000000..fe03e1d --- /dev/null +++ b/version2/src/java/light_fan_embed_benchmark/Sensor.java @@ -0,0 +1,87 @@ +import iotcloud.*; +import java.util.*; +import java.lang.*; +import java.io.*; + +class Sensor { + public static void main(String[] args) throws Exception { + + + Table t1 = new Table("http://dc-6.calit2.uci.edu/test.iotcloud/", "reallysecret", 361, -1); + t1.rebuild(); + + + + String pingTimerKey = "sensorController"; + IoTString ipingTimerKey = new IoTString(pingTimerKey); + + String a1 = "sensor"; + IoTString ia1 = new IoTString(a1); + + + System.out.println("Starting System"); + + + + + while (true) { + try { + + + + Runtime runTime = Runtime.getRuntime(); + // Process proc = runTime.exec("/opt/vc/bin/vcgencmd measure_temp | tr -d 'temp=' | tr -d \"'C\""); + Process proc = runTime.exec("/opt/vc/bin/vcgencmd measure_temp"); + BufferedReader reader = new BufferedReader(new InputStreamReader(proc.getInputStream())); + String line = null; + String dat = ""; + while ((line = reader.readLine()) != null) { + System.out.println(line); + dat = line; + } + reader.close(); + + + + String pingTimer = Long.toString(System.currentTimeMillis()); + IoTString ipingTimer = new IoTString(pingTimer); + + + IoTString senDat = new IoTString(dat); + + t1.update(); + t1.startTransaction(); + t1.addKV(ipingTimerKey, ipingTimer); + t1.addKV(ia1, senDat); + t1.commitTransaction(); + + + + + + + + + + + + + Thread.sleep(1000); + + } catch (Error e) { + e.printStackTrace(); + + Runtime runTime = Runtime.getRuntime(); + runTime.exec("gpio mode 4 out"); + + + while (true) { + runTime.exec("gpio write 4 1"); + Thread.sleep(500); + runTime.exec("gpio write 4 0"); + Thread.sleep(500); + } + } + } + } +} \ No newline at end of file diff --git a/version2/src/java/light_fan_embed_benchmark/Setup.java b/version2/src/java/light_fan_embed_benchmark/Setup.java index 1fb86c8..a9ae0f2 100644 --- a/version2/src/java/light_fan_embed_benchmark/Setup.java +++ b/version2/src/java/light_fan_embed_benchmark/Setup.java @@ -24,6 +24,10 @@ class Setup { IoTString ib2 = new IoTString(b2); + String c1 = "sensor"; + IoTString ic1 = new IoTString(c1); + + String pingTimerKey = "bulbController"; IoTString ipingTimerKey = new IoTString(pingTimerKey); @@ -32,6 +36,10 @@ class Setup { IoTString ipingTimerKey2 = new IoTString(pingTimerKey2); + String pingTimerKey3 = "sensorController"; + IoTString ipingTimerKey3 = new IoTString(pingTimerKey3); + + t1.createNewKey(ia1, 321); t1.createNewKey(ia2, 321); t1.createNewKey(ia3, 321); @@ -41,6 +49,10 @@ class Setup { t1.createNewKey(ib2, 351); t1.createNewKey(ipingTimerKey2, 351); + + t1.createNewKey(ic1, 361); + t1.createNewKey(ipingTimerKey3, 361); + t1.update(); } } \ No newline at end of file diff --git a/version2/src/java/light_fan_embed_benchmark/WemoController.java b/version2/src/java/light_fan_embed_benchmark/WemoController.java index f19ac62..41117fd 100644 --- a/version2/src/java/light_fan_embed_benchmark/WemoController.java +++ b/version2/src/java/light_fan_embed_benchmark/WemoController.java @@ -8,12 +8,6 @@ class WemoController { Table t1 = new Table("http://dc-6.calit2.uci.edu/test.iotcloud/", "reallysecret", 351, -1); t1.rebuild(); - - String a = "fan"; - IoTString ia = new IoTString(a); - t1.createNewKey(ia, 351); - - String a1 = "wemo1"; String a2 = "wemo2"; diff --git a/version2/src/java/light_fan_embed_benchmark/run3.bash b/version2/src/java/light_fan_embed_benchmark/run3.bash index c12e81c..0b71cec 100755 --- a/version2/src/java/light_fan_embed_benchmark/run3.bash +++ b/version2/src/java/light_fan_embed_benchmark/run3.bash @@ -1,3 +1,3 @@ #!/bin/sh -java -cp .:../iotcloud/bin WemoController \ No newline at end of file +java -cp .:../iotcloud/bin Sensor \ No newline at end of file -- 2.34.1