# HG changeset patch # User Nozomi Teruya # Date 1447871154 -32400 # Node ID 66f95be0daabe7edc55eb009ca2d70b16da055f3 # Parent 9662e582ffaddacdb6b071d67f25a6bd8dfd551e add zippedSizeData to ReceiveData for AliceVNC measurement diff -r 9662e582ffad -r 66f95be0daab .gradle/2.2.1/taskArtifacts/cache.properties.lock Binary file .gradle/2.2.1/taskArtifacts/cache.properties.lock has changed diff -r 9662e582ffad -r 66f95be0daab .gradle/2.2.1/taskArtifacts/fileHashes.bin Binary file .gradle/2.2.1/taskArtifacts/fileHashes.bin has changed diff -r 9662e582ffad -r 66f95be0daab .gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary file .gradle/2.2.1/taskArtifacts/fileSnapshots.bin has changed diff -r 9662e582ffad -r 66f95be0daab .gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary file .gradle/2.2.1/taskArtifacts/outputFileStates.bin has changed diff -r 9662e582ffad -r 66f95be0daab .gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary file .gradle/2.2.1/taskArtifacts/taskArtifacts.bin has changed diff -r 9662e582ffad -r 66f95be0daab .idea/workspace.xml --- a/.idea/workspace.xml Tue Nov 17 18:17:03 2015 +0900 +++ b/.idea/workspace.xml Thu Nov 19 03:25:54 2015 +0900 @@ -1,11 +1,16 @@ - + + + + + + @@ -40,24 +45,22 @@ - - + + - - - - - + + + - + - - + + @@ -215,7 +218,7 @@ + @@ -241,8 +330,8 @@ @@ -269,7 +358,6 @@ - @@ -316,8 +404,9 @@ + + - @@ -329,7 +418,7 @@ - + - - - - - - - - 1447689490713 + + 1447867983189 - + - + - - - - - - - - - - - + + + + + + + + + + - - - + + + - + + - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java - 53 - - - - file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java - 39 - - - - + @@ -659,75 +715,43 @@ - + - - + + - + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - \ No newline at end of file diff -r 9662e582ffad -r 66f95be0daab AliceVNC.iml --- a/AliceVNC.iml Tue Nov 17 18:17:03 2015 +0900 +++ b/AliceVNC.iml Thu Nov 19 03:25:54 2015 +0900 @@ -17,7 +17,7 @@ - + @@ -26,7 +26,7 @@ - + diff -r 9662e582ffad -r 66f95be0daab build.gradle --- a/build.gradle Tue Nov 17 18:17:03 2015 +0900 +++ b/build.gradle Thu Nov 19 03:25:54 2015 +0900 @@ -8,7 +8,7 @@ repositories { maven(){ - url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/66ced1f875ea/' + url 'http://www.cr.ie.u-ryukyu.ac.jp/hg/maven/raw-file/9805e2f8823e/' } } diff -r 9662e582ffad -r 66f95be0daab src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Tue Nov 17 18:17:03 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveMeasurement.java Thu Nov 19 03:25:54 2015 +0900 @@ -28,7 +28,7 @@ @SuppressWarnings("unchecked") @Override public void run() { - long time = System.currentTimeMillis(); + long time = System.currentTimeMillis();//ミリ秒 ArrayList clist = info1.asClass(ArrayList.class); boolean route = true; for (String node : clist){ @@ -51,11 +51,17 @@ PrintWriter pw = new PrintWriter(bw); ReceiveData r = info.getReceiveData(); - pw.println(r.getDepth()/2+" "+(time - r.getTime())/2+" "+((byte[])info.getObj()).length); + pw.println("depth:" + r.getDepth()/2 + " dataSize:" + r.getZippedDataSize() + " time:" + (time - r.getTime()));//画面データのサイズと現在の接続台数も pw.close(); } } else { - ods.put("parent", info.key, info.getReceiveData()); + ReceiveData r = info.getReceiveData(); + ReceiveData rData = new ReceiveData(null); + + rData.setZippedDataSize(r.getZippedDataSize()); + rData.setTimes(r.getTime(), r.getSetTime(), r.getDepth()); + + ods.put("parent", info.key, rData); } } catch (IOException e) { diff -r 9662e582ffad -r 66f95be0daab src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java --- a/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Tue Nov 17 18:17:03 2015 +0900 +++ b/src/main/java/jp/ac/u_ryukyu/alicevnc/ReceiveUpdateRectangle.java Thu Nov 19 03:25:54 2015 +0900 @@ -44,12 +44,11 @@ // not need send data comes from // Data Segment from other node is already serialized ods.flip(node, "updateRectangle", info1); //TODO need timeout counter - //ods.setCompressFlag(true); // for measurement ReceiveData r = info2.getReceiveData(); if (!r.getSetTime()) { - r.setTimes(System.currentTimeMillis(), true, 0); + r.setTimes(System.currentTimeMillis(), true, 0);//送信時間をセット } ods.flip(node, "pixelData", info2); }