diff options
| -rw-r--r-- | nxcomp/src/Channel.cpp | 4 | ||||
| -rw-r--r-- | nxcomp/src/Children.cpp | 8 | ||||
| -rw-r--r-- | nxcomp/src/ClientChannel.cpp | 2 | ||||
| -rw-r--r-- | nxcomp/src/Loop.cpp | 92 | ||||
| -rw-r--r-- | nxcomp/src/Proxy.cpp | 38 | ||||
| -rw-r--r-- | nxcomp/src/ServerChannel.cpp | 14 | ||||
| -rw-r--r-- | nxcomp/src/Statistics.cpp | 6 | ||||
| -rw-r--r-- | nxcomp/src/Timestamp.h | 4 | ||||
| -rw-r--r-- | nxcomp/src/Transport.cpp | 6 |
9 files changed, 84 insertions, 90 deletions
diff --git a/nxcomp/src/Channel.cpp b/nxcomp/src/Channel.cpp index 24a422e37..e575a9e6b 100644 --- a/nxcomp/src/Channel.cpp +++ b/nxcomp/src/Channel.cpp @@ -1238,7 +1238,7 @@ int Channel::handleWait(int timeout) } #ifdef TEST - *logofs << "handleWait: Waiting " << remaining << " Ms " + *logofs << "handleWait: Waiting " << remaining << " ms " << "for a new message on FD#" << fd_ << ".\n" << logofs_flush; #endif @@ -1306,7 +1306,7 @@ int Channel::handleDrain(int limit, int timeout) #ifdef TEST *logofs << "handleDrain: Trying to write to FD#" - << fd_ << " with " << remaining << " Ms " + << fd_ << " with " << remaining << " ms " << "remaining.\n" << logofs_flush; #endif diff --git a/nxcomp/src/Children.cpp b/nxcomp/src/Children.cpp index e77d1defd..9486f189a 100644 --- a/nxcomp/src/Children.cpp +++ b/nxcomp/src/Children.cpp @@ -628,7 +628,7 @@ int NXTransWatchdog(int timeout) { #ifdef TEST *logofs << "NXTransWatchdog: Timeout of " << timeout - << " Ms raised in watchdog.\n" << logofs_flush; + << " ms raised in watchdog.\n" << logofs_flush; #endif // @@ -645,7 +645,7 @@ int NXTransWatchdog(int timeout) { #ifdef TEST *logofs << "NXTransWatchdog: Waiting for the timeout " - << "with " << timeout - diffTs << " Ms to run.\n" + << "with " << timeout - diffTs << " ms to run.\n" << logofs_flush; #endif @@ -847,7 +847,7 @@ int NXTransKeeper(int caches, int images, const char *root) #ifdef TEST *logofs << "NXTransKeeper: Going to sleep for " - << timeout / 20 << " Ms.\n" << logofs_flush; + << timeout / 20 << " ms.\n" << logofs_flush; #endif usleep(timeout / 20 * 1000); @@ -937,7 +937,7 @@ int NXTransKeeper(int caches, int images, const char *root) #ifdef TEST *logofs << "NXTransKeeper: Going to sleep for " << timeout - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; #endif usleep(timeout * 1000); diff --git a/nxcomp/src/ClientChannel.cpp b/nxcomp/src/ClientChannel.cpp index f01ad6d7b..1c6354897 100644 --- a/nxcomp/src/ClientChannel.cpp +++ b/nxcomp/src/ClientChannel.cpp @@ -5782,7 +5782,7 @@ int ClientChannel::handleSplitEvent(DecodeBuffer &decodeBuffer) #if defined(TEST) || defined(SPLIT) *logofs << "handleSplitEvent: SPLIT! Spent " - << diffTimestamp(startTs, getTimestamp()) << " Ms " + << diffTimestamp(startTs, getTimestamp()) << " ms " << "handling abort split events for FD#" << fd_ << ".\n" << logofs_flush; #endif diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp index 197167380..b51d7e7e3 100644 --- a/nxcomp/src/Loop.cpp +++ b/nxcomp/src/Loop.cpp @@ -391,7 +391,7 @@ static int CheckProcess(int pid, const char *label); // Start or restart the house-keeper process. // -static int StartKeeper(); +static void StartKeeper(); // // Cleanup functions. @@ -425,10 +425,10 @@ static int SetupProxyInstance(); static int SetupAuthInstance(); static int SetupAgentInstance(); -static int SetupTcpSocket(); -static int SetupUnixSocket(); -static int SetupServiceSockets(); -static int SetupDisplaySocket(int &addr_family, sockaddr *&addr, +static void SetupTcpSocket(); +static void SetupUnixSocket(); +static void SetupServiceSockets(); +static void SetupDisplaySocket(int &addr_family, sockaddr *&addr, unsigned int &addr_length); // @@ -2578,15 +2578,15 @@ int NXTransPrepare(int *setFDs, fd_set *readSet, if (isTimestamp(*selectTs) == 0) { nxinfo << "Loop: WARNING! Preparing the select with requested " - << "timeout of " << selectTs -> tv_sec << " S and " - << (double) selectTs -> tv_usec / 1000 << " Ms.\n" + << "timeout of " << selectTs -> tv_sec << " s and " + << (double) selectTs -> tv_usec / 1000 << " ms.\n" << std::flush; } else { nxinfo << "Loop: Preparing the select with requested " - << "timeout of " << selectTs -> tv_sec << " S and " - << (double) selectTs -> tv_usec / 1000 << " Ms.\n" + << "timeout of " << selectTs -> tv_sec << " s and " + << (double) selectTs -> tv_usec / 1000 << " ms.\n" << std::flush; } @@ -2632,7 +2632,7 @@ int NXTransPrepare(int *setFDs, fd_set *readSet, int diffTs = diffTimestamp(startTs, nowTs); nxinfo << "Loop: Mark - 0 - at " << strMsTimestamp() - << " with " << diffTs << " Ms elapsed.\n" + << " with " << diffTs << " ms elapsed.\n" << std::flush; // @@ -2701,7 +2701,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, if (diffTs > 20) { nxdbg << "Loop: TIME! Spent " << diffTs - << " Ms handling messages for proxy FD#" + << " ms handling messages for proxy FD#" << proxyFD << ".\n" << std::flush; } @@ -2711,8 +2711,8 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, if (isTimestamp(*selectTs) == 0) { nxinfo << "Loop: WARNING! Executing the select with requested " - << "timeout of " << selectTs -> tv_sec << " S and " - << (double) selectTs -> tv_usec / 1000 << " Ms.\n" + << "timeout of " << selectTs -> tv_sec << " s and " + << (double) selectTs -> tv_usec / 1000 << " ms.\n" << std::flush; } else if (proxy != NULL && proxy -> getFlushable(proxyFD) > 0) @@ -2720,8 +2720,8 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: WARNING! Proxy FD#" << proxyFD << " has " << proxy -> getFlushable(proxyFD) << " bytes to write but timeout is " - << selectTs -> tv_sec << " S and " - << selectTs -> tv_usec / 1000 << " Ms.\n" + << selectTs -> tv_sec << " s and " + << selectTs -> tv_usec / 1000 << " ms.\n" << std::flush; } @@ -2742,7 +2742,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, if (diffTs > 100) { nxdbg << "Loop: TIME! Spent " << diffTs - << " Ms waiting for new data for proxy FD#" + << " ms waiting for new data for proxy FD#" << proxyFD << ".\n" << std::flush; } @@ -2767,7 +2767,7 @@ int NXTransSelect(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, diffTs = diffTimestamp(startTs, nowTs); - nxinfo << "Loop: Out of select after " << diffTs << " Ms " + nxinfo << "Loop: Out of select after " << diffTs << " ms " << "at " << strMsTimestamp(nowTs) << " with result " << *resultFDs << ".\n" << std::flush; @@ -2874,7 +2874,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: Mark - 1 - at " << strMsTimestamp() << " with " << diffTimestamp(startTs, getTimestamp()) - << " Ms elapsed.\n" << std::flush; + << " ms elapsed.\n" << std::flush; // // Rotate the channel that will be handled @@ -2891,7 +2891,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: Mark - 2 - at " << strMsTimestamp() << " with " << diffTimestamp(startTs, getTimestamp()) - << " Ms elapsed.\n" << std::flush; + << " ms elapsed.\n" << std::flush; // // Check if any socket has become readable. @@ -2901,7 +2901,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: Mark - 3 - at " << strMsTimestamp() << " with " << diffTimestamp(startTs, getTimestamp()) - << " Ms elapsed.\n" << std::flush; + << " ms elapsed.\n" << std::flush; // // Handle the scheduled events on channels. @@ -2923,7 +2923,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: Mark - 4 - at " << strMsTimestamp() << " with " << diffTimestamp(startTs, getTimestamp()) - << " Ms elapsed.\n" << std::flush; + << " ms elapsed.\n" << std::flush; // // Check if user sent a signal to produce @@ -2946,7 +2946,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: Mark - 5 - at " << strMsTimestamp() << " with " << diffTimestamp(startTs, getTimestamp()) - << " Ms elapsed.\n" << std::flush; + << " ms elapsed.\n" << std::flush; // // Check if there is any data to flush. @@ -2958,7 +2958,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: Mark - 6 - at " << strMsTimestamp() << " with " << diffTimestamp(startTs, getTimestamp()) - << " Ms elapsed.\n" << std::flush; + << " ms elapsed.\n" << std::flush; } // @@ -2991,7 +2991,7 @@ int NXTransExecute(int *resultFDs, int *errorFDs, int *setFDs, fd_set *readSet, nxinfo << "Loop: Mark - 7 - at " << strMsTimestamp() << " with " << diffTimestamp(startTs, getTimestamp()) - << " Ms elapsed.\n" << std::flush; + << " ms elapsed.\n" << std::flush; } // @@ -3360,7 +3360,7 @@ int InitAfterNegotiation() nxinfo << "Loop: INIT! Completed initialization at " << strMsTimestamp(nowTs) << " with " - << diffTimestamp(initTs, nowTs) << " Ms " + << diffTimestamp(initTs, nowTs) << " ms " << "since the init mark.\n" << std::flush; initTs = getNewTimestamp(); @@ -3735,16 +3735,16 @@ int SetupAgentInstance() return 1; } -int SetupTcpSocket() +void SetupTcpSocket() { // // Open TCP socket emulating local display. // - return ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11"); + tcpFD = ListenConnectionTCP((loopbackBind ? "localhost" : "*"), X_TCP_PORT + proxyPort, "X11"); } -int SetupUnixSocket() +void SetupUnixSocket() { // // Open UNIX domain socket for display. @@ -3763,7 +3763,7 @@ int SetupUnixSocket() unixFD = ListenConnectionUnix(unixSocketName, "x11"); if (unixFD >= 0) chmod(unixSocketName, 0777); - return unixFD; + return; } } @@ -3781,7 +3781,7 @@ int SetupUnixSocket() // implementation. // -int SetupDisplaySocket(int &addr_family, sockaddr *&addr, +void SetupDisplaySocket(int &addr_family, sockaddr *&addr, unsigned int &addr_length) { addr_family = AF_INET; @@ -3948,7 +3948,7 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr, close(testSocketFD); addr = (sockaddr *) xServerAddrABSTRACT; - return 1; + return; } else { @@ -4061,11 +4061,9 @@ int SetupDisplaySocket(int &addr_family, sockaddr *&addr, } delete [] display; - - return 1; } -int SetupServiceSockets() +void SetupServiceSockets() { if (control -> ProxyMode == proxy_client) { @@ -4148,8 +4146,6 @@ int SetupServiceSockets() useSlaveSocket = 0; } } - - return 1; } int ListenConnectionAny(sockaddr *addr, socklen_t addrlen, const char *label) @@ -4453,7 +4449,7 @@ int CheckProcess(int pid, const char *label) return 1; } -int StartKeeper() +void StartKeeper() { if (IsRunning(lastKeeper) == 1 || @@ -4511,8 +4507,6 @@ int StartKeeper() << "with persistent cache not enabled.\n" << std::flush; } - - return 1; } void HandleCleanupForReconnect() @@ -6083,8 +6077,8 @@ void SetTimer(int value) timer.it_value = lastTimer.next; nxinfo << "Loop: Timer set to " << lastTimer.next.tv_sec - << " S and " << lastTimer.next.tv_usec / 1000 - << " Ms at " << strMsTimestamp() << " in process " + << " s and " << lastTimer.next.tv_usec / 1000 + << " ms at " << strMsTimestamp() << " in process " << "with pid '" << getpid() << "'.\n" << std::flush; @@ -6606,7 +6600,7 @@ int ConnectToRemote(ChannelEndPoint &socketAddress) { nxdbg << "Loop: Timer set to " << connectTimeout / 1000 - << " S " << "with retry set to " << retryConnect + << " s " << "with retry set to " << retryConnect << " in process with pid '" << getpid() << "'.\n" << std::flush; @@ -13805,7 +13799,7 @@ static void handleCheckSessionInLoop() } nxinfo << "Loop: Starting watchdog process with timeout " - << "of " << timeout << " Ms.\n" + << "of " << timeout << " ms.\n" << std::flush; } else @@ -14070,9 +14064,9 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet, } nxinfo << "Loop: Select timeout is " - << selectTs.tv_sec << " S and " + << selectTs.tv_sec << " s and " << (double) selectTs.tv_usec / 1000 - << " Ms.\n" << std::flush; + << " ms.\n" << std::flush; } static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, fd_set &readSet, @@ -14088,14 +14082,14 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs, nxinfo << "Loop: Select result is [" << resultFDs << "] at " << strMsTimestamp() << " with no " << "communication within " << diffTs - << " Ms.\n" << std::flush; + << " ms.\n" << std::flush; } else { nxinfo << "Loop: Select result is [" << resultFDs << "] error is [" << errorFDs << "] at " << strMsTimestamp() << " after " << diffTs - << " Ms.\n" << std::flush; + << " ms.\n" << std::flush; } @@ -14530,8 +14524,8 @@ static void handleNegotiationInLoop(int &setFDs, fd_set &readSet, setMinTimestamp(selectTs, control -> PingTimeout); nxinfo << "Loop: Selected proxy FD#" << proxyFD << " in negotiation " - << "phase with timeout of " << selectTs.tv_sec << " S and " - << selectTs.tv_usec << " Ms.\n" << std::flush; + << "phase with timeout of " << selectTs.tv_sec << " s and " + << selectTs.tv_usec << " ms.\n" << std::flush; return; diff --git a/nxcomp/src/Proxy.cpp b/nxcomp/src/Proxy.cpp index dabf7532e..437296f60 100644 --- a/nxcomp/src/Proxy.cpp +++ b/nxcomp/src/Proxy.cpp @@ -410,8 +410,8 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax) #ifdef TEST *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec - << " S and " << (double) tsMax.tv_usec / - 1000 << " Ms with congestion " + << " s and " << (double) tsMax.tv_usec / + 1000 << " ms with congestion " << statistics -> getCongestionInFrame() << ".\n" << logofs_flush; #endif @@ -422,8 +422,8 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax) #ifdef TEST *logofs << "Proxy: Initial timeout is " << tsMax.tv_sec - << " S and " << (double) tsMax.tv_usec / - 1000 << " Ms.\n" << logofs_flush; + << " s and " << (double) tsMax.tv_usec / + 1000 << " ms.\n" << logofs_flush; #endif } @@ -449,12 +449,12 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax) { *logofs << "Proxy: FLUSH! SPLIT! WARNING! Running with " << diffTimestamp(timeouts_.splitTs, getTimestamp()) - << " Ms elapsed since the last split.\n" + << " ms elapsed since the last split.\n" << logofs_flush; } *logofs << "Proxy: FLUSH! SPLIT! Requesting timeout of " - << diffTs << " Ms as there are splits to send.\n" + << diffTs << " ms as there are splits to send.\n" << logofs_flush; #endif @@ -525,12 +525,12 @@ int Proxy::setReadDescriptors(fd_set *fdSet, int &fdMax, T_timestamp &tsMax) { *logofs << "Proxy: FLUSH! WARNING! Running with " << diffTimestamp(timeouts_.motionTs, getTimestamp()) - << " Ms elapsed since the last motion.\n" + << " ms elapsed since the last motion.\n" << logofs_flush; } *logofs << "Proxy: FLUSH! Requesting timeout of " - << diffTs << " Ms as FD#" << fd << " has motion " + << diffTs << " ms as FD#" << fd << " has motion " << "events to send.\n" << logofs_flush; #endif @@ -1946,7 +1946,7 @@ int Proxy::handleEvents() *logofs << "Proxy: FLUSH! Motion timeout expired after " << diffTimestamp(timeouts_.motionTs, getTimestamp()) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; #endif @@ -1972,7 +1972,7 @@ int Proxy::handleEvents() { *logofs << "Proxy: Running with " << diffTimestamp(timeouts_.motionTs, getTimestamp()) - << " Ms elapsed since the last motion.\n" + << " ms elapsed since the last motion.\n" << logofs_flush; } #endif @@ -1990,7 +1990,7 @@ int Proxy::handleEvents() #if defined(TEST) || defined(INFO) || defined(SPLIT) *logofs << "Proxy: SPLIT! Split timeout expired after " << diffTimestamp(timeouts_.splitTs, getTimestamp()) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; #endif #if defined(TEST) || defined(INFO) || defined(SPLIT) @@ -2033,7 +2033,7 @@ int Proxy::handleEvents() { *logofs << "Proxy: SPLIT! Running with " << diffTimestamp(timeouts_.splitTs, getTimestamp()) - << " Ms elapsed since the last split.\n" + << " ms elapsed since the last split.\n" << logofs_flush; } #endif @@ -2252,7 +2252,7 @@ int Proxy::handleFrame(T_frame_type type) << " new " << outputLength << " flushable " << transport_ -> flushable() << " tokens " << tokens_[token_control].remaining << " after " << diffTimestamp(timeouts_.writeTs, nowTs) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; *logofs << "Proxy: FLUSH! Immediate flush to proxy FD#" << fd_ << " of " << outputLength << " bytes at " << strMsTimestamp() @@ -2276,7 +2276,7 @@ int Proxy::handleFrame(T_frame_type type) *logofs << "Proxy: WARNING! TIME! Data written to proxy FD#" << fd_ << " at " << strMsTimestamp() << " after " << diffTimestamp(timeouts_.writeTs, nowTs) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; } #endif @@ -2533,7 +2533,7 @@ int Proxy::handleDrain() *logofs << "Proxy: Timeout raised while draining " << "FD#" << fd_ << " at " << strMsTimestamp() << " after " << diffTimestamp(startTs, nowTs) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; #endif result = 0; @@ -2547,7 +2547,7 @@ int Proxy::handleDrain() *logofs << "Proxy: Trying to write to FD#" << fd_ << " at " << strMsTimestamp() << " with length " << transport_ -> length() << " and " - << remaining << " Ms remaining.\n" + << remaining << " ms remaining.\n" << logofs_flush; #endif @@ -2590,7 +2590,7 @@ int Proxy::handleDrain() #if defined(TEST) || defined(INFO) *logofs << "Proxy: Waiting for more data from proxy " << "FD#" << fd_ << " at " << strMsTimestamp() - << " with " << remaining << " Ms remaining.\n" + << " with " << remaining << " ms remaining.\n" << logofs_flush; #endif @@ -2633,7 +2633,7 @@ int Proxy::handleDrain() *logofs << "Proxy: Got decongestion for proxy FD#" << fd_ << " at " << strMsTimestamp() << " after " << diffTimestamp(startTs, getTimestamp()) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; #endif result = 1; @@ -3599,7 +3599,7 @@ int Proxy::handlePing() #if defined(TEST) || defined(INFO) *logofs << "Proxy: WARNING! No data received from " << "remote proxy on FD#" << fd_ << " since " - << diffIn << " Ms.\n" << logofs_flush; + << diffIn << " ms.\n" << logofs_flush; #endif if (control -> ProxyTimeout > 0 && 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; diff --git a/nxcomp/src/Statistics.cpp b/nxcomp/src/Statistics.cpp index ab8fd74dc..68673ffc1 100644 --- a/nxcomp/src/Statistics.cpp +++ b/nxcomp/src/Statistics.cpp @@ -361,14 +361,14 @@ void Statistics::updateBitrate(int bytes) #ifdef DEBUG *logofs << "Statistics: Difference since previous timestamp is " - << diffFramesInMs << " Ms.\n" << logofs_flush; + << diffFramesInMs << " ms.\n" << logofs_flush; #endif if (diffFramesInMs > 0) { #ifdef DEBUG *logofs << "Statistics: Removing " << diffFramesInMs - << " Ms in short and long time frame.\n" + << " ms in short and long time frame.\n" << logofs_flush; #endif @@ -1751,7 +1751,7 @@ int Statistics::getTimeStats(int type, char *&buffer) char format[FORMAT_LENGTH]; - sprintf(format, "\ntime: %.0f Ms idle, %.0f Ms (%.0f Ms in read, %.0f Ms in write) running.\n\n", + sprintf(format, "\ntime: %.0f ms idle, %.0fms (%.0f ms in read, %.0f ms in write) running.\n\n", transportData -> idleTime_, transportData -> readTime_, transportData -> readTime_ - transportData -> writeTime_, transportData -> writeTime_); diff --git a/nxcomp/src/Timestamp.h b/nxcomp/src/Timestamp.h index 604f5a3bc..bb9b243db 100644 --- a/nxcomp/src/Timestamp.h +++ b/nxcomp/src/Timestamp.h @@ -135,7 +135,7 @@ inline T_timestamp getTimestamp() if (diffTs > DRIFT_TIMESTAMP) { *logofs << "Timestamp: WARNING! Time difference since the " - << "current timestamp is " << diffTs << " Ms.\n" + << "current timestamp is " << diffTs << "ms.\n" << logofs_flush; } @@ -293,7 +293,7 @@ inline T_timestamp getNewTimestamp() if (diffTs > DRIFT_TIMESTAMP) { *logofs << "Timestamp: WARNING! Time difference since the " - << "old timestamp is " << diffTs << " Ms.\n" + << "old timestamp is " << diffTs << "ms.\n" << logofs_flush; } diff --git a/nxcomp/src/Transport.cpp b/nxcomp/src/Transport.cpp index 897bf32f1..63e26bae6 100644 --- a/nxcomp/src/Transport.cpp +++ b/nxcomp/src/Transport.cpp @@ -868,7 +868,7 @@ int Transport::wait(int timeout) const #ifdef TEST *logofs << "Transport: There are " << available << " bytes on FD#" << fd_ << " after " - << diffTs << " Ms.\n" << logofs_flush; + << diffTs << " ms.\n" << logofs_flush; #endif return available; @@ -933,13 +933,13 @@ int Transport::wait(int timeout) const { *logofs << "Transport: No data available on FD#" << fd_ << " after " << diffTimestamp(startTs, nowTs) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; } else { *logofs << "Transport: Data became available on FD#" << fd_ << " after " << diffTimestamp(startTs, nowTs) - << " Ms.\n" << logofs_flush; + << " ms.\n" << logofs_flush; } #endif } |