diff options
| author | tjung | 2012-01-14 15:38:44 +0000 |
|---|---|---|
| committer | tjung | 2012-01-14 15:38:44 +0000 |
| commit | a295c9c05c3f95c2b50803a5993600149ce09782 (patch) | |
| tree | 78e2a7d9cd0798719700f516acc554afa58048c1 | |
| parent | 08b22487886cc7ad9ae8aa77394541f5c52d14a0 (diff) | |
| download | org.eclipse.etrice-a295c9c05c3f95c2b50803a5993600149ce09782.tar.gz org.eclipse.etrice-a295c9c05c3f95c2b50803a5993600149ce09782.tar.xz org.eclipse.etrice-a295c9c05c3f95c2b50803a5993600149ce09782.zip | |
[runtime.modellib] LogService adapted to new Java Types
| -rw-r--r-- | runtime/org.eclipse.etrice.modellib/models/ALogService.room | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/runtime/org.eclipse.etrice.modellib/models/ALogService.room b/runtime/org.eclipse.etrice.modellib/models/ALogService.room index 26047225e..3a946c1ce 100644 --- a/runtime/org.eclipse.etrice.modellib/models/ALogService.room +++ b/runtime/org.eclipse.etrice.modellib/models/ALogService.room @@ -58,8 +58,7 @@ RoomModel room.basic.service.logging { <internalLog: log> } action { - "long s = Long.valueOf(data.timeStamp);" - "p.println(\"Timestamp: \" + Long.toString(s-tStart) + \"ms\");" + "p.println(\"Timestamp: \" + Long.toString(data.timeStamp-tStart) + \"ms\");" "p.println(\"SenderInstance: \"+ data.sender);" "p.println(\"UserString: \" + data.userString);" "p.println(\"--------------------------------------------------\");" @@ -95,8 +94,7 @@ RoomModel room.basic.service.logging { "long s;" "if (logLevel>this.logLevel){" "d.userString=userString;" - "s=System.currentTimeMillis();" - "d.timeStamp=Long.toString(s);" + "d.timeStamp=System.currentTimeMillis();" "d.sender=getInstancePath();" "if (getPeerAddress()!=null)" "getPeerMsgReceiver().receive(new EventWithDataMessage(getPeerAddress(), IN_internalLog, d));" @@ -105,15 +103,10 @@ RoomModel room.basic.service.logging { } } - DataClass LogData { - Attribute logLevel: int32 - Attribute userString: string - } - DataClass InternalLogData { Attribute userString: string Attribute sender: string - Attribute timeStamp: string + Attribute timeStamp: int64 } }
\ No newline at end of file |