diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-05 18:12:11 +0100 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2017-12-05 18:12:11 +0100 |
commit | 05cf54af3de6f3e32e08d7bc32e10d58221a068b (patch) | |
tree | 05ee5221e4824d1210682e1be268c981684194f3 /nxcomp/src/ServerChannel.cpp | |
parent | 7f777e01e3bb8780ba91e70171a0aae78a95692e (diff) | |
parent | b8c929773fac19dad8af05d0bc64b1b3fed88309 (diff) | |
download | nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.tar.gz nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.tar.bz2 nx-libs-05cf54af3de6f3e32e08d7bc32e10d58221a068b.zip |
Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.x
Attributes GH PR #579: https://github.com/ArcticaProject/nx-libs/pull/579
Diffstat (limited to 'nxcomp/src/ServerChannel.cpp')
-rw-r--r-- | nxcomp/src/ServerChannel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nxcomp/src/ServerChannel.cpp b/nxcomp/src/ServerChannel.cpp index 830985295..0c99c9d33 100644 --- a/nxcomp/src/ServerChannel.cpp +++ b/nxcomp/src/ServerChannel.cpp @@ -4628,7 +4628,7 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer, MessageStore *store, #if defined(TEST) || defined(SPLIT) *logofs << "handleSplit: SPLIT! Spent " - << diffTimestamp(startTs, getTimestamp()) << " Ms " + << diffTimestamp(startTs, getTimestamp()) << " ms " << "handling abort split events for FD#" << fd_ << ".\n" << logofs_flush; @@ -4790,7 +4790,7 @@ int ServerChannel::handleSplit(DecodeBuffer &decodeBuffer) #if defined(TEST) || defined(SPLIT) *logofs << "handleSplit: WARNING! SPLIT! Spent " - << diffTimestamp(startTs, getTimestamp()) << " Ms " + << diffTimestamp(startTs, getTimestamp()) << " ms " << "handling asynchronous abort split events for " << "FD#" << fd_ << ".\n" << logofs_flush; @@ -5835,7 +5835,7 @@ int ServerChannel::handleAsyncEvents() #if defined(TEST) || defined(INFO) *logofs << "handleAsyncEvents: Spent " << diffTimestamp(startTs, - getTimestamp()) << " Ms handling events for FD#" + getTimestamp()) << " ms handling events for FD#" << fd_ << ".\n" << logofs_flush; #endif @@ -7268,7 +7268,7 @@ int ServerChannel::handleShmem(unsigned char &opcode, unsigned char *&buffer, #if defined(TEST) || defined(INFO) *logofs << "handleShmem: WARNING! Missing completion " << "after " << diffTimestamp(shmemState_ -> last, - getTimestamp()) << " Ms for shared memory " + getTimestamp()) << " ms for shared memory " << "for FD#" << fd_ << ".\n" << logofs_flush; #endif @@ -7402,7 +7402,7 @@ int ServerChannel::handleShmemEvent() { #if defined(TEST) || defined(INFO) *logofs << "handleShmemEvent: Spent " - << diffTimestamp(startTs, getTimestamp()) << " Ms " + << diffTimestamp(startTs, getTimestamp()) << " ms " << "waiting for shared memory sequence for FD#" << fd_ << ".\n" << logofs_flush; #endif @@ -7414,7 +7414,7 @@ int ServerChannel::handleShmemEvent() *logofs << "handleShmemEvent: WARNING! Can't reset shared " << "memory sequence for FD#" << fd_ << " after " << diffTimestamp(shmemState_ -> last, getTimestamp()) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; #endif return 0; @@ -7430,7 +7430,7 @@ int ServerChannel::checkShmemEvent(unsigned char event, unsigned short sequence, *logofs << "checkShmemEvent: Reset shared memory sequence " << shmemState_ -> sequence << " for FD#" << fd_ << " after " << diffTimestamp(shmemState_ -> last, - getTimestamp()) << " Ms.\n" << logofs_flush; + getTimestamp()) << " ms.\n" << logofs_flush; #endif shmemState_ -> sequence = 0; |