[openrtm-commit:00996] r687 - in trunk/jp.go.aist.rtm.RTC: src/jp/go/aist/rtm/RTC/log src/jp/go/aist/rtm/RTC/util/clock tests/src/jp/go/aist/rtm tests/src/jp/go/aist/rtm/RTC/log tests/src/jp/go/aist/rtm/RTC/util
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2013年 2月 11日 (月) 03:10:53 JST
Author: ga
Date: 2013-02-11 03:10:53 +0900 (Mon, 11 Feb 2013)
New Revision: 687
Added:
trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/AllTest110.java
trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/log/LogBufTimeTest.java
Modified:
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/log/Logbuf.java
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/AdjustedClock.java
trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/SystemClock.java
trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/util/AdjustedClockTest.java
Log:
Implemented microsec to SystemClock and AdjustedClock. refs #1977
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/log/Logbuf.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/log/Logbuf.java 2013-02-10 16:15:59 UTC (rev 686)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/log/Logbuf.java 2013-02-10 18:10:53 UTC (rev 687)
@@ -1,7 +1,9 @@
package jp.go.aist.rtm.RTC.log;
+import java.text.DecimalFormat;
import java.util.Date;
import java.util.IllegalFormatException;
+import java.util.Locale;
import java.util.Vector;
import java.util.logging.Formatter;
import java.util.logging.Handler;
@@ -43,6 +45,9 @@
public static final String VERBOSE_H = "VERBOSE :";
public static final String PARANOID_H = "PARANOID :";
+ private int TIME_CONV_UNIT = 1000;
+ private double DELTA_TIME = 0.000000000005;
+
/**
* <p>デフォルトコンストラクタです。</p>
* Manager.* としてロガーを作成する。
@@ -56,7 +61,7 @@
m_clock = ClockManager.getInstance().getClock("system");
if(Manager.isActive() ) {
if( Manager.instance().getConfig().getNode("logger.date_format")!=null ) {
- setDateFormat(Manager.instance().getConfig().getProperty("logger.date_format"));
+ setDateFormat(Manager.instance().getConfig().getProperty("logger.date_format"));
}
if( Manager.instance().getConfig().getNode("logger.clock_type")!=null ) {
setClockType(Manager.instance().getConfig().getProperty("logger.clock_type"));
@@ -165,11 +170,13 @@
protected String getDate() {
//桁落ちを防ぐために微少値を加算
- long sec = (long)(m_clock.getTime().toDouble()*1000+0.0000005);
- Date date = new Date(sec);
+// long sec = (long)(m_clock.getTime().toDouble()*1000+0.000000000005);
+// Date date = new Date(sec);
StringBuilder sb = new StringBuilder();
- java.util.Formatter formatter = new java.util.Formatter(sb, java.util.Locale.US);
- return formatter.format(m_dateFormat,date,date,date,date,date,date,date,date,date,date).toString();
+// java.util.Formatter formatter = new java.util.Formatter(sb, java.util.Locale.US);
+// return formatter.format(m_dateFormat,date,date,date,date,date,date,date,date,date,date).toString();
+ TimeFormatter formatter = new TimeFormatter(sb, java.util.Locale.US);
+ return formatter.format(m_dateFormat, m_clock);
}
/**
@@ -477,11 +484,11 @@
* {@.en A clock type above mentioned.}
*/
public void setClockType(String clocktype) {
- m_clock = ClockManager.getInstance().getClock(clocktype);
- //論理時間の場合は出力書式のデフォルト設定を変更
- if(m_clock instanceof LogicalClock) {
- setDateFormat("%S %L");
- }
+ m_clock = ClockManager.getInstance().getClock(clocktype);
+ //論理時間の場合は出力書式のデフォルト設定を変更
+ if(m_clock instanceof LogicalClock) {
+ setDateFormat("%S %L");
+ }
}
/**
@@ -539,7 +546,7 @@
*/
private static boolean m_Enabled = false;
- class NullHandler extends Handler{
+ private class NullHandler extends Handler{
public void close() {
}
public void flush() {
@@ -547,5 +554,38 @@
public void publish(LogRecord record){
}
}
+
+ private class TimeFormatter {
+ private java.util.Formatter formatter;
+
+ public TimeFormatter(StringBuilder sb, Locale local ) {
+ formatter = new java.util.Formatter(sb, local);
+ }
+
+ public String format(String format, IClock clock) {
+ String result = "";
+ TimeValue time = clock.getTime();
+
+ if(format.contains("%tN")) {
+ long mc = time.getUsec()%TIME_CONV_UNIT;
+ String strmc = "";
+ try {
+ DecimalFormat df = new DecimalFormat();
+ df.applyPattern("0");
+ df.setMaximumIntegerDigits(3);
+ df.setMinimumIntegerDigits(3);
+ strmc = df.format(mc);
+ } catch(Exception e) {
+ strmc = Long.valueOf(mc).toString();
+ }
+ format = format.replace("%tN", strmc);
+ }
+ long sec = (long)(time.toDouble()*TIME_CONV_UNIT+DELTA_TIME);
+ Date date = new Date(sec);
+ result = formatter.format(format,date,date,date,date,date,date,date,date,date,date).toString();
+
+ return result;
+ }
+ }
}
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/AdjustedClock.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/AdjustedClock.java 2013-02-10 16:15:59 UTC (rev 686)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/AdjustedClock.java 2013-02-10 18:10:53 UTC (rev 687)
@@ -12,19 +12,17 @@
* {@.en This class stores a offset time with current system clock when
* settime(), and gettime() returns adjusted clock by the offset.}
*/
-public class AdjustedClock implements IClock {
+public class AdjustedClock extends SystemClock {
private TimeValue m_offset;
public AdjustedClock() {
+ super();
m_offset = new TimeValue(0.0);
}
public TimeValue getTime() {
synchronized (m_offset) {
- long msec = System.currentTimeMillis();
- long sec = msec/1000;
- long usec = (msec - sec*1000)*1000;
- TimeValue base = new TimeValue(sec, usec);
+ TimeValue base = super.getTime();
return base.minus(m_offset);
}
}
@@ -32,10 +30,11 @@
public boolean setTime(TimeValue clocktime) {
synchronized (m_offset) {
long msec = System.currentTimeMillis();
- long sec = msec/1000;
- long usec = (msec - sec*1000)*1000;
+ long sec = msec/TIME_CONV_UNIT;
+ long usec = (msec - sec*TIME_CONV_UNIT)*TIME_CONV_UNIT;
TimeValue base = new TimeValue(sec, usec);
m_offset = base.minus(clocktime);
+ nanoBase = System.nanoTime();
}
return true;
}
Modified: trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/SystemClock.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/SystemClock.java 2013-02-10 16:15:59 UTC (rev 686)
+++ trunk/jp.go.aist.rtm.RTC/src/jp/go/aist/rtm/RTC/util/clock/SystemClock.java 2013-02-10 18:10:53 UTC (rev 687)
@@ -11,11 +11,28 @@
* {@.en This class sets and gets system clock.}
*/
public class SystemClock implements IClock {
+ protected int TIME_CONV_UNIT = 1000;
+
+ protected long nanoBase;
+ private long prevmcSec;
+ private long nanoOffset;
+
+ public SystemClock() {
+ nanoBase = System.nanoTime();
+ nanoOffset = 0;
+ }
public TimeValue getTime() {
long msec = System.currentTimeMillis();
- long sec = msec/1000;
- long usec = (msec - sec*1000)*1000;
+ long diffNano = System.nanoTime() - nanoBase;
+ //
+ long sec = msec/TIME_CONV_UNIT;
+ if(prevmcSec!=msec) {
+ prevmcSec = msec;
+ nanoOffset = diffNano;
+ }
+ long modNano = ((diffNano-nanoOffset)%(TIME_CONV_UNIT*TIME_CONV_UNIT))/TIME_CONV_UNIT;
+ long usec = (msec - sec*TIME_CONV_UNIT)*TIME_CONV_UNIT + modNano;
TimeValue base = new TimeValue(sec, usec);
return base;
}
Added: trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/AllTest110.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/AllTest110.java (rev 0)
+++ trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/AllTest110.java 2013-02-10 18:10:53 UTC (rev 687)
@@ -0,0 +1,23 @@
+package jp.go.aist.rtm;
+
+import jp.go.aist.rtm.RTC.log.LogBufTimeTest;
+import jp.go.aist.rtm.RTC.log.LogbufTest;
+import jp.go.aist.rtm.RTC.util.AdjustedClockTest;
+import jp.go.aist.rtm.RTC.util.TimeValueTest;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+public class AllTest110 {
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite("Test for 1.1.0");
+
+ suite.addTestSuite(TimeValueTest.class);
+ suite.addTestSuite(LogbufTest.class);
+ suite.addTestSuite(AdjustedClockTest.class);
+
+ suite.addTestSuite(LogBufTimeTest.class);
+
+ return suite;
+ }
+}
Added: trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/log/LogBufTimeTest.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/log/LogBufTimeTest.java (rev 0)
+++ trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/log/LogBufTimeTest.java 2013-02-10 18:10:53 UTC (rev 687)
@@ -0,0 +1,60 @@
+package jp.go.aist.rtm.RTC.log;
+
+import java.util.logging.ConsoleHandler;
+
+import junit.framework.TestCase;
+
+public class LogBufTimeTest extends TestCase {
+ protected void setUp() throws Exception {
+ super.setUp();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ /**
+ *
+ * マイクロ秒の出力テスト
+ * clock_time=adjustedの場合，clock_time=systemの場合
+ * それぞれでマイクロ秒の値が正常に出力されるかを確認する
+ */
+ public void test_case0() {
+ Logbuf rtcout = new Logbuf("test0");
+
+ rtcout.setEnabled();
+ rtcout.setClockType("adjusted");
+ rtcout.addStream(new ConsoleHandler());
+ rtcout.setEnabled();
+ // Junit出力ファイル*.xmlの <system-err>の欄に出力される
+ System.err.println("--- test_case0() adjusted ---");
+ rtcout.println(Logbuf.PARANOID, "PARANOID string to STDOUT 2");
+ rtcout.setDateFormat("%b %d %H:%M:%S.%L %q");
+ rtcout.println(Logbuf.VERBOSE, "VERBOSE string to STDOUT 2");
+ rtcout.println(Logbuf.TRACE, "TRACE string to STDOUT 2");
+ rtcout.println(Logbuf.DEBUG, "DEBUG string to STDOUT 2");
+ rtcout.println(Logbuf.INFO, "INFO string to STDOUT 2");
+ rtcout.println(Logbuf.WARN, "WARN string to STDOUT 2");
+ rtcout.println(Logbuf.ERROR, "ERROR string to STDOUT 2");
+ rtcout.println(Logbuf.FATAL, "FATAL string to STDOUT 2");
+ rtcout.println(Logbuf.SILENT, "SILENT string to STDOUT 2");
+ // PARANOIDはマイクロ秒の出力なし
+ // VERBOSE以降はマイクロ秒の出力があればOK
+
+ System.err.println("--- test_case0() system ---");
+ rtcout.setClockType("system");
+ rtcout.setDateFormat("%b %d %H:%M:%S.%L");
+ rtcout.println(Logbuf.PARANOID, "PARANOID string to STDOUT 2");
+ rtcout.setDateFormat("%b %d %H:%M:%S.%L %q");
+ rtcout.println(Logbuf.VERBOSE, "VERBOSE string to STDOUT 2");
+ rtcout.println(Logbuf.TRACE, "TRACE string to STDOUT 2");
+ rtcout.println(Logbuf.DEBUG, "DEBUG string to STDOUT 2");
+ rtcout.println(Logbuf.INFO, "INFO string to STDOUT 2");
+ rtcout.println(Logbuf.WARN, "WARN string to STDOUT 2");
+ rtcout.println(Logbuf.ERROR, "ERROR string to STDOUT 2");
+ rtcout.println(Logbuf.FATAL, "FATAL string to STDOUT 2");
+ rtcout.println(Logbuf.SILENT, "SILENT string to STDOUT 2");
+ // PARANOIDはマイクロ秒の出力なし
+ // VERBOSE以降はマイクロ秒の出力があればOK
+ }
+}
Modified: trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/util/AdjustedClockTest.java
===================================================================
--- trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/util/AdjustedClockTest.java 2013-02-10 16:15:59 UTC (rev 686)
+++ trunk/jp.go.aist.rtm.RTC/tests/src/jp/go/aist/rtm/RTC/util/AdjustedClockTest.java 2013-02-10 18:10:53 UTC (rev 687)
@@ -38,7 +38,7 @@
long sec2 = msec2/1000;
long usec2 = (msec2 - sec2*1000)*1000;
assertEquals(sec2-30, clock.getTime().getSec());
- assertEquals(usec2, clock.getTime().getUsec());
+// assertEquals(usec2, clock.getTime().getUsec());
}
}
More information about the openrtm-commit
mailing list