• R/O
  • SSH
  • HTTPS

okuyama: 提交


Commit MetaInfo

修訂1039 (tree)
時間2013-09-20 14:13:26
作者okuyamaoo

Log Message

okuyamaFuseからデバッグを取り外し

Change Summary

差異

--- trunk/okuyamaFuse/okuyamaFuseMount.sh (revision 1038)
+++ trunk/okuyamaFuse/okuyamaFuseMount.sh (revision 1039)
@@ -1,6 +1,6 @@
11 #!/bin/sh
22
3-LD_LIBRARY_PATH=./:/usr/local/lib java -classpath ./okuyamaFuse-0.0.1.jar:./fuse-j.jar:./commons-logging-1.0.4.jar:./okuyama-0.9.4.jar:./javamail-1.4.1.jar:./log4j-1.2.14.jar \
3+LD_LIBRARY_PATH=./:/usr/local/lib java -classpath ./okuyamaFuse-0.0.2.jar:./fuse-j.jar:./commons-logging-1.0.4.jar:./okuyama-0.9.5.jar:./javamail-1.4.1.jar:./log4j-1.2.14.jar \
44 -Dorg.apache.commons.logging.Log=fuse.logging.FuseLog \
55 -Dfuse.logging.level=ERROR -Xmx1548m -Xms1524m -server -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC \
6- fuse.okuyamafs.OkuyamaFuse -f -o direct_io -o allow_other $1 $2 1>> ./okufs.log 2>>./okufs.log
\ No newline at end of file
6+ fuse.okuyamafs.OkuyamaFuse -f -o direct_io -o allow_other $1 $2 1>> ./okufs.log 2>>./okufs.log
--- trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaClientWrapper.java (revision 1038)
+++ trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaClientWrapper.java (revision 1039)
@@ -168,7 +168,6 @@
168168
169169 public int readValue(String key, long start, int offset, String realKeyNodeNo, ByteBuffer buf) throws Exception {
170170 //List dataReadKeyList = new ArrayList();
171-long start1 = System.nanoTime();
172171
173172 String[] dataReadKeyList = null;
174173 boolean allDataNull = true;
@@ -205,7 +204,6 @@
205204
206205 //replaceDataBuf = new byte[OkuyamaFilesystem.blockSize * dataReadKeyListSize];
207206
208-long start11 = System.nanoTime();
209207 if (CoreMapFactory.factoryType == 2) {
210208
211209 // okuyamaの場合事前にgetMultiByteでデータを取得しておく
@@ -216,9 +214,6 @@
216214 if (dataReadKeyListSize > 1) {
217215 //Map multiReadRet = this.getMultiValue(keyList);
218216 Map multiReadRet = this.getMultiValue(dataReadKeyList);
219-long end11 = System.nanoTime();
220-System.out.println("S1-1=" + (end11 - start11) / 1000);
221-long start2 = System.nanoTime();
222217 int totalReadLen = 0;
223218 if (multiReadRet != null) {
224219 for (int i = 0; i < dataReadKeyListSize; i++) {
@@ -237,8 +232,6 @@
237232 totalReadLen = totalReadLen + readData.length;
238233 }
239234 }
240-long end2 = System.nanoTime();
241-System.out.println("S2=" + (end2 - start2) / 1000);
242235
243236 return totalReadLen;
244237 } else {
@@ -287,8 +280,6 @@
287280 retData = new byte[realWritePoint];
288281 System.arraycopy(replaceDataBuf, bufReadPoint, retData, 0, realWritePoint);
289282 }
290-long end3 = System.nanoTime();
291-System.out.println("S3=" + (end3 - start1) / 1000);
292283
293284 return -1;
294285
@@ -469,7 +460,6 @@
469460
470461 lastSetKey = dataReadKeyList[idx];
471462 }
472-
473463 ((OkuyamaFsMap)dataMap).putMultiBytes(putDataList);
474464 }
475465
--- trunk/okuyamaFuse/src/fuse/okuyamafs/BufferedOkuyamaClient.java (revision 1038)
+++ trunk/okuyamaFuse/src/fuse/okuyamafs/BufferedOkuyamaClient.java (revision 1039)
@@ -375,23 +375,15 @@
375375
376376 // Stripingの場合で処理がことなる
377377 if (BufferedOkuyamaClient.stripingDataBlock == false) {
378-//long start = System.nanoTime();
379378 Object[] realClientRet = this.client.readByteValue(key);
380-//long end = System.nanoTime();
381379
382380 if (realClientRet != null && realClientRet[0].equals("true")) {
383381
384382 value = (byte[])realClientRet[1];
385-//System.out.println("time1=" + (end - start) + " len=" + value.length + " Key=" + key);
386383 }
387-
388-
389384 } else {
390385 // StripingBlock;
391-long start = System.nanoTime();
392386 value = this.readStripingBlock(key);
393-long end = System.nanoTime();
394-System.out.println("time2=" + (end - start));
395387 if (value.length == 0) value = null;
396388 }
397389 }
@@ -423,7 +415,6 @@
423415
424416 try {
425417
426-//long start = System.nanoTime();
427418 int strpngIndex = 0;
428419 for (int idx = 0; idx < BufferedOkuyamaClient.stripingLevel / 4; idx++) {
429420 stripingDataClient[0].requestReadByteValue(key+"\t"+strpngIndex);
@@ -436,11 +427,9 @@
436427 strpngIndex++;
437428
438429 boolean endRead = false;
439-long start = System.nanoTime();
440-
430+
441431 Object[] stripingRet1 = stripingDataClient[0].responseReadByteValue(key+"\t"+(strpngIndex - 4));
442432 if (endRead == false && stripingRet1[0].equals("true")) {
443-System.out.println("1Len=" + ((byte[])stripingRet1[1]).length);
444433 baos.write((byte[])stripingRet1[1]);
445434 } else {
446435 endRead = true;
@@ -448,7 +437,6 @@
448437
449438 Object[] stripingRet2 = stripingDataClient[1].responseReadByteValue(key+"\t"+(strpngIndex - 3));
450439 if (endRead == false && stripingRet2[0].equals("true")) {
451-System.out.println("2Len=" + ((byte[])stripingRet2[1]).length);
452440 baos.write((byte[])stripingRet2[1]);
453441 } else {
454442 endRead = true;
@@ -456,7 +444,6 @@
456444
457445 Object[] stripingRet3 = stripingDataClient[2].responseReadByteValue(key+"\t"+(strpngIndex - 2));
458446 if (endRead == false && stripingRet3[0].equals("true")) {
459-System.out.println("3Len=" + ((byte[])stripingRet3[1]).length);
460447 baos.write((byte[])stripingRet3[1]);
461448 } else {
462449 endRead = true;
@@ -464,18 +451,13 @@
464451
465452 Object[] stripingRet4 = stripingDataClient[3].responseReadByteValue(key+"\t"+(strpngIndex - 1));
466453 if (endRead == false && stripingRet4[0].equals("true")) {
467-System.out.println("4Len=" + ((byte[])stripingRet4[1]).length);
468454 baos.write((byte[])stripingRet4[1]);
469455 } else {
470456 endRead = true;
471457 }
472-long end = System.nanoTime();
473-System.out.println("StripingGet=" + (end - start));
474458
475459 if (endRead == true) break;
476460 }
477-//long end2 = System.nanoTime();
478-//System.out.println("2=" + (end2 - start2));
479461
480462 } catch (Exception e) {
481463 throw e;
--- trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaFilesystem.java (revision 1038)
+++ trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaFilesystem.java (revision 1039)
@@ -25,8 +25,8 @@
2525 public volatile static int blockSizeAssist = 50;
2626
2727 //public volatile static int blockSize = 1024*512;//5200; // Blockサイズ
28- public volatile static int blockSize = 1024*14;//1024*63; //1024*17; //5200; // Blockサイズ
29-//20480
28+ public volatile static int blockSize = 5632; // Blockサイズ
29+
3030
3131 public volatile static int writeBufferSize = 1024 * 1024 * 5 + 1024;
3232
@@ -831,10 +831,7 @@
831831 String pathInfoStr = (String)client.getPathDetail(trimToPath);
832832
833833 String[] pathInfo = pathInfoStr.split("\t");
834-//long start = System.nanoTime();
835834 int readLen = client.readValue(trimToPath, offset, buf.limit(), pathInfo[pathInfo.length - 2], buf);
836-//long end = System.nanoTime();
837-//System.out.println("ALL read=" + (end - start) / 1000 + " micro Len=" + readLen);
838835
839836 if (readLen == -1 || readLen < 1) {
840837
--- trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaFsMap.java (revision 1038)
+++ trunk/okuyamaFuse/src/fuse/okuyamafs/OkuyamaFsMap.java (revision 1039)
@@ -410,7 +410,7 @@
410410
411411 public Map getMultiBytes(Object[] keyList) {
412412 //return (byte[])dumm.get(type + "\t" + (String)key);
413-long start = System.nanoTime();
413+ //long start = System.nanoTime();
414414 Map retMap = new HashMap();
415415 Map okuyamaDataMap = new HashMap();
416416
@@ -485,8 +485,8 @@
485485 } catch (Exception e) {
486486 e.printStackTrace();
487487 }
488-long end = System.nanoTime();
489-System.out.println("Key count=" + keyList.length + " Time=" + ((end - start) / 1000));
488+ //long end = System.nanoTime();
489+ //System.out.println("Key count=" + keyList.length + " Time=" + ((end - start) / 1000));
490490 return retMap;
491491 }
492492
@@ -785,10 +785,7 @@
785785 if (client == null) client = new BufferedOkuyamaClient(this.factory.getClient(300*1000));
786786
787787 clientUseCount++;
788-//long start = System.nanoTime();
789788 boolean ret = client.sendByteValue((String)request[0], OkuyamaFsMapUtil.dataCompress((byte[])request[1]));
790-//long end = System.nanoTime();
791-//System.out.println("put=" + ((end - start) / 1000 / 1000) + " Len=" + ((byte[])request[1]).length);
792789 if (ret) {
793790 this.responseBox.put(new Integer(0));
794791 } else {
--- trunk/okuyamaFuse/build.xml (revision 1038)
+++ trunk/okuyamaFuse/build.xml (revision 1039)
@@ -4,7 +4,7 @@
44 <property name="project.title" value="okuyamaFuse" />
55 <property name="src.dir" value="src" />
66 <property name="build.dir" value="classes" />
7- <property name="version" value="0.0.1" />
7+ <property name="version" value="0.0.2" />
88 <property name="lib.dir" value="lib"/>
99
1010 <!-- Use Project Lib -->
Show on old repository browser