Skip to content

N
nx-libs
Unverified Commit 05cf54af authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

Merge branch 'uli42-pr/fix_global_tcpFD' into 3.6.x

Attributes GH PR #579: https://github.com/ArcticaProject/nx-libs/pull/579
parents 7f777e01 b8c92977
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 84 additions and 90 deletions
nxcomp/src/Channel.cpp
View file @ 05cf54af
......@@ -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
......
nxcomp/src/Children.cpp
View file @ 05cf54af
......@@ -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);
......
nxcomp/src/ClientChannel.cpp
View file @ 05cf54af
......@@ -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
......
nxcomp/src/Proxy.cpp
View file @ 05cf54af
......@@ -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 &&
......
nxcomp/src/ServerChannel.cpp
View file @ 05cf54af
......@@ -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;
......
nxcomp/src/Statistics.cpp
View file @ 05cf54af
......@@ -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_);
......
nxcomp/src/Timestamp.h
View file @ 05cf54af
......@@ -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;
}
......
nxcomp/src/Transport.cpp
View file @ 05cf54af
......@@ -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
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment