|
From: <rjo...@us...> - 2014-09-29 05:24:38
|
Revision: 32852
http://sourceforge.net/p/opalvoip/code/32852
Author: rjongbloed
Date: 2014-09-29 05:24:33 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
Fixed PThread actual time for primary/process thread under Linux.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-09-29 05:20:55 UTC (rev 32851)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-09-29 05:24:33 UTC (rev 32852)
@@ -259,7 +259,9 @@
, PX_priority(NormalPriority)
#if defined(P_LINUX)
, PX_linuxId(GetCurrentUniqueIdentifier())
+ , PX_startTick(PTimer::Tick())
#endif
+#endif
, PX_suspendMutex(MutexInitialiser)
, PX_suspendCount(0)
, PX_state(PX_running)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-09-29 05:27:02
|
Revision: 32853
http://sourceforge.net/p/opalvoip/code/32853
Author: rjongbloed
Date: 2014-09-29 05:26:58 +0000 (Mon, 29 Sep 2014)
Log Message:
-----------
Fixed PThread actual time for primary/process thread under Linux.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-09-29 05:24:33 UTC (rev 32852)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-09-29 05:26:58 UTC (rev 32853)
@@ -261,7 +261,6 @@
, PX_linuxId(GetCurrentUniqueIdentifier())
, PX_startTick(PTimer::Tick())
#endif
-#endif
, PX_suspendMutex(MutexInitialiser)
, PX_suspendCount(0)
, PX_state(PX_running)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-10 11:40:45
|
Revision: 32978
http://sourceforge.net/p/opalvoip/code/32978
Author: rjongbloed
Date: 2014-10-10 11:40:42 +0000 (Fri, 10 Oct 2014)
Log Message:
-----------
Finished Linux version of Process and System CPU times.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-10 11:17:47 UTC (rev 32977)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-10 11:40:42 UTC (rev 32978)
@@ -939,16 +939,8 @@
}
-bool PThread::GetTimes(Times & times)
+static bool InternalGetTimes(const char * filename, PThread::Times & times)
{
- // Do not use any PTLib functions in here as they could to a PTRACE, and this deadlock
- times.m_name = m_threadName;
- times.m_threadId = m_threadId;
- times.m_uniqueId = PX_linuxId;
-
- std::stringstream statFileName;
- statFileName << "/proc/" << getpid() << "/task/" << PX_linuxId << "/stat";
-
/* From the man page on the "stat" file
Status information about the process. This is used by ps(1). It is defined in /usr/src/linux/fs/proc/array.c.
The fields, in order, with their proper scanf(3) format specifiers, are:
@@ -1023,7 +1015,7 @@
*/
for (int retry = 0; retry < 3; ++retry) {
- std::ifstream statfile(statFileName.str().c_str());
+ std::ifstream statfile(filename);
char line[1000];
statfile.getline(line, sizeof(line));
@@ -1065,7 +1057,6 @@
times.m_kernel = jiffies_to_msecs(stime);
times.m_user = jiffies_to_msecs(utime);
- times.m_real = (PX_endTick != 0 ? PX_endTick : PTimer::Tick()) - PX_startTick;
return true;
}
@@ -1073,15 +1064,23 @@
}
+bool PThread::GetTimes(Times & times)
+{
+ // Do not use any PTLib functions in here as they could to a PTRACE, and this deadlock
+ times.m_name = m_threadName;
+ times.m_threadId = m_threadId;
+ times.m_uniqueId = PX_linuxId;
+ times.m_real = (PX_endTick != 0 ? PX_endTick : PTimer::Tick()) - PX_startTick;
+
+ return InternalGetTimes(PSTRSTRM("/proc/" << getpid() << "/task/" << PX_linuxId << "/stat"), times);
+}
+
+
bool PProcess::GetProcessTimes(Times & times) const
{
times.m_name = GetName();
-
- std::ifstream pf("/proc/self/stat");
- if (!pf.is_open())
- return false;
-
- return true;
+ times.m_real = PTime() - GetStartTime();
+ return InternalGetTimes("/proc/self/stat", times);
}
@@ -1089,16 +1088,20 @@
{
times.m_name = "SYSTEM";
- std::ifstream statfile("/proc/stat");
+ for (int retry = 0; retry < 3; ++retry) {
+ std::ifstream statfile("/proc/stat");
- char dummy[10];
- unsigned user, nice, system, idle, iowait, irq, softirq, steal, guest, guest_nice;
- statfile >> dummy >> user >> nice >> system >> idle >> iowait >> irq >> softirq >> steal >> guest >> guest_nice;
- if (!statfile.good())
- return false;
-
- times.m_kernel = system
- return true;
+ char dummy[10];
+ unsigned user, nice, system, idle, iowait, irq, softirq, steal, guest, guest_nice;
+ statfile >> dummy >> user >> nice >> system >> idle >> iowait >> irq >> softirq >> steal >> guest >> guest_nice;
+ if (statfile.good()) {
+ times.m_kernel = jiffies_to_msecs(system);
+ times.m_user = jiffies_to_msecs(user);
+ times.m_real = times.m_kernel + times.m_user + jiffies_to_msecs(idle);
+ return true;
+ }
+ }
+ return false;
}
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-13 10:51:07
|
Revision: 32979
http://sourceforge.net/p/opalvoip/code/32979
Author: rjongbloed
Date: 2014-10-13 10:50:58 +0000 (Mon, 13 Oct 2014)
Log Message:
-----------
Fixed bizare problem where a thread can be terminated unexpectedly. This happens only on Linux where the pthread_t id can be re-used. If it happens that the thread deleting a PThread object has the exact same, reused, pthread_t then IT gets terminated as the thread PThread instance wraps around is already gone.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-10 11:40:42 UTC (rev 32978)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-13 10:50:58 UTC (rev 32979)
@@ -790,6 +790,10 @@
if (m_originalStackSize <= 0)
return;
+ // if the thread is already terminated, then nothing to do
+ if (IsTerminated())
+ return;
+
// if thread calls Terminate on itself, then do it
// don't use PThread::Current, as the thread may already not be in the
// active threads list
@@ -798,10 +802,6 @@
return; // keeps compiler happy
}
- // if the thread is already terminated, then nothing to do
- if (IsTerminated())
- return;
-
// otherwise force thread to die
PTRACE(2, "PTLib\tForcing termination of thread id=0x" << hex << m_threadId << dec);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-15 09:42:26
|
Revision: 32987
http://sourceforge.net/p/opalvoip/code/32987
Author: rjongbloed
Date: 2014-10-15 09:42:23 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
Better names for process and system CPU times.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-15 09:29:31 UTC (rev 32986)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-15 09:42:23 UTC (rev 32987)
@@ -1078,7 +1078,7 @@
bool PProcess::GetProcessTimes(Times & times) const
{
- times.m_name = GetName();
+ times.m_name = "Process Total";
times.m_real = PTime() - GetStartTime();
return InternalGetTimes("/proc/self/stat", times);
}
@@ -1086,7 +1086,7 @@
bool PProcess::GetSystemTimes(Times & times)
{
- times.m_name = "SYSTEM";
+ times.m_name = "System Total";
for (int retry = 0; retry < 3; ++retry) {
std::ifstream statfile("/proc/stat");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-15 11:32:41
|
Revision: 32988
http://sourceforge.net/p/opalvoip/code/32988
Author: rjongbloed
Date: 2014-10-15 11:32:33 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
FIxed Linux system CPU
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-15 09:42:23 UTC (rev 32987)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-15 11:32:33 UTC (rev 32988)
@@ -1092,8 +1092,8 @@
std::ifstream statfile("/proc/stat");
char dummy[10];
- unsigned user, nice, system, idle, iowait, irq, softirq, steal, guest, guest_nice;
- statfile >> dummy >> user >> nice >> system >> idle >> iowait >> irq >> softirq >> steal >> guest >> guest_nice;
+ unsigned user, nice, system, idle, iowait, irq, softirq, steal;
+ statfile >> dummy >> user >> nice >> system >> idle >> iowait >> irq >> softirq >> steal;
if (statfile.good()) {
times.m_kernel = jiffies_to_msecs(system);
times.m_user = jiffies_to_msecs(user);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-15 12:05:21
|
Revision: 32989
http://sourceforge.net/p/opalvoip/code/32989
Author: rjongbloed
Date: 2014-10-15 12:05:17 +0000 (Wed, 15 Oct 2014)
Log Message:
-----------
Fixed System Total CPU times, part 2.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-15 11:32:33 UTC (rev 32988)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-15 12:05:17 UTC (rev 32989)
@@ -1092,7 +1092,7 @@
std::ifstream statfile("/proc/stat");
char dummy[10];
- unsigned user, nice, system, idle, iowait, irq, softirq, steal;
+ uint64_t user, nice, system, idle, iowait, irq, softirq, steal;
statfile >> dummy >> user >> nice >> system >> idle >> iowait >> irq >> softirq >> steal;
if (statfile.good()) {
times.m_kernel = jiffies_to_msecs(system);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-16 11:29:08
|
Revision: 32991
http://sourceforge.net/p/opalvoip/code/32991
Author: rjongbloed
Date: 2014-10-16 11:29:05 +0000 (Thu, 16 Oct 2014)
Log Message:
-----------
Added assert for pthreads stack size not being set.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-15 14:23:19 UTC (rev 32990)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-16 11:29:05 UTC (rev 32991)
@@ -256,7 +256,7 @@
PThread::PThread(bool isProcess)
: m_type(isProcess ? e_IsProcess : e_IsExternal)
- , m_originalStackSize(0) // 0 indicates external thread
+ , m_originalStackSize(0)
, m_threadId(pthread_self())
, PX_priority(NormalPriority)
#if defined(P_LINUX)
@@ -310,8 +310,6 @@
, PX_WaitSemMutex(MutexInitialiser)
#endif
{
- PAssert(m_originalStackSize > 0, PInvalidParameter);
-
#ifdef P_RTEMS
PAssertOS(socketpair(AF_INET,SOCK_STREAM,0,unblockPipe) == 0);
#else
@@ -448,11 +446,6 @@
pthread_attr_init(&threadAttr);
PAssertPTHREAD(pthread_attr_setdetachstate, (&threadAttr, PTHREAD_CREATE_DETACHED));
- if (m_originalStackSize == 0) {
- PTRACE(3, "PTlib\tUsing default stack size: " << PThreadMinimumStack);
- m_originalStackSize = PThreadMinimumStack;
- }
-
PAssertPTHREAD(pthread_attr_setstacksize, (&threadAttr, m_originalStackSize));
#if defined(P_LINUX)
@@ -469,6 +462,10 @@
PProcess & process = PProcess::Current();
+ size_t checkSize = 0;
+ PAssertPTHREAD(pthread_attr_getstacksize, (&threadAttr, &checkSize));
+ PAssert(checkSize == m_originalStackSize, "Stack size not set correctly");
+
// create the thread
PAssertPTHREAD(pthread_create, (&m_threadId, &threadAttr, &PThread::PX_ThreadMain, this));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-20 14:26:32
|
Revision: 33009
http://sourceforge.net/p/opalvoip/code/33009
Author: rjongbloed
Date: 2014-10-20 14:26:24 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
Fixed Linux build
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-20 14:15:04 UTC (rev 33008)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-20 14:26:24 UTC (rev 33009)
@@ -52,6 +52,7 @@
// going to need the main thread for adjusting relative priority
static pthread_t baseThread;
#elif defined(P_LINUX)
+#include <malloc.h>
#include <sys/syscall.h>
#include <fstream>
#elif defined(P_ANDROID)
@@ -1115,7 +1116,7 @@
struct mallinfo info = mallinfo();
usage.m_malloc = info.uordblks;
usage.m_blocks = info.hblks;
- usage.m_free = info.uordblks;
+ usage.m_freed = info.uordblks;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2014-10-20 15:20:43
|
Revision: 33010
http://sourceforge.net/p/opalvoip/code/33010
Author: rjongbloed
Date: 2014-10-20 15:20:35 +0000 (Mon, 20 Oct 2014)
Log Message:
-----------
Fixed incorrect frred blocks in glibc PProcess::GetMemoryUsage
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-20 14:26:24 UTC (rev 33009)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-10-20 15:20:35 UTC (rev 33010)
@@ -1116,7 +1116,7 @@
struct mallinfo info = mallinfo();
usage.m_malloc = info.uordblks;
usage.m_blocks = info.hblks;
- usage.m_freed = info.uordblks;
+ usage.m_freed = info.fordblks;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-01-06 01:02:54
|
Revision: 33209
http://sourceforge.net/p/opalvoip/code/33209
Author: rjongbloed
Date: 2015-01-06 01:02:46 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
Fixed PProcess::GetMemoryUsage() for Linux
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2014-12-29 10:56:56 UTC (rev 33208)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-01-06 01:02:46 UTC (rev 33209)
@@ -1114,23 +1114,49 @@
usage.m_virtual = virtPages * 4096;
usage.m_resident = resPages * 4096;
}
+ else
+ usage.m_virtual = usage.m_resident = 0;
#if P_HAS_MALLOC_INFO
+ usage.m_max = usage.m_current = usage.m_blocks = 0;
+
char * buffer = NULL;
size_t size;
FILE * mem = open_memstream(&buffer, &size);
malloc_info(0, mem);
fclose(mem);
+#if P_XML
+ PXML xml;
+ if (xml.Load(buffer)) {
+ PXMLElement * root = xml.GetRootElement();
+ PXMLElement * element = root->GetElement("system", "type", "current");
+ if (element != NULL)
+ usage.m_current = (size_t)element->GetAttribute("size").AsUnsigned64();
+ element = root->GetElement("system", "type", "max");
+ if (element != NULL)
+ usage.m_max = (size_t)element->GetAttribute("size").AsUnsigned64();
+ }
+#else
+ // Find last </heap> in XML
+ size_t offset = 0;
+ static PRegularExpression HeapRE("< */ *heap *>", PRegularExpression::Extended);
+ PINDEX pos, len;
+ while (HeapRE.Execute(buffer + offset, pos, len))
+ offset += pos + len;
+
+ // The <system type="xxx" size=yyy> after the <heap>s is total
+
PStringArray substrings(2);
static PRegularExpression MaxRE("< *system *type *= *\"max\" *size *= *\"([0-9]+)", PRegularExpression::Extended);
- if (MaxRE.Execute(buffer, substrings))
+ if (MaxRE.Execute(buffer+offset, substrings))
usage.m_max = (size_t)substrings[1].AsUnsigned64();
static PRegularExpression CurrentRE("< *system *type *= *\"current\" *size *= *\"([0-9]+)", PRegularExpression::Extended);
- if (CurrentRE.Execute(buffer, substrings))
+ if (CurrentRE.Execute(buffer+offset, substrings))
usage.m_current = (size_t)substrings[1].AsUnsigned64();
+#endif
free(buffer);
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-01-06 02:26:09
|
Revision: 33211
http://sourceforge.net/p/opalvoip/code/33211
Author: rjongbloed
Date: 2015-01-06 02:26:02 +0000 (Tue, 06 Jan 2015)
Log Message:
-----------
Fixed XML parser version of memory usage.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-01-06 01:56:27 UTC (rev 33210)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-01-06 02:26:02 UTC (rev 33211)
@@ -32,6 +32,7 @@
*/
#include <ptlib/socket.h>
+#include <ptclib/pxml.h>
#include <sched.h>
#include <pthread.h>
#include <sys/resource.h>
@@ -1126,7 +1127,7 @@
malloc_info(0, mem);
fclose(mem);
-#if P_XML
+#if P_EXPAT
PXML xml;
if (xml.Load(buffer)) {
PXMLElement * root = xml.GetRootElement();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-04-22 09:35:32
|
Revision: 33532
http://sourceforge.net/p/opalvoip/code/33532
Author: rjongbloed
Date: 2015-04-22 09:35:29 +0000 (Wed, 22 Apr 2015)
Log Message:
-----------
Make sure deadlock detection is only done on ETIMEDOUT error for mutex, other errors should assert.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-04-22 01:50:59 UTC (rev 33531)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-04-22 09:35:29 UTC (rev 33532)
@@ -1287,7 +1287,12 @@
absTime.tv_sec = time(NULL)+15;
absTime.tv_nsec = 0;
PPROFILE_PRE_SYSTEM();
- if (pthread_mutex_timedlock(&m_mutex, &absTime) != 0) {
+ /* Note, from man page "This function shall not return an error code of [EINTR]"
+ so we do not need a loop to retry. */
+ int err = pthread_mutex_timedlock(&m_mutex, &absTime);
+ if (err != ETIMEDOUT)
+ PAssertOS(err == 0);
+ else {
ExcessiveLockWait();
PAssertPTHREAD(pthread_mutex_lock, (&m_mutex));
PTRACE_BEGIN(0, "PTLib") << "Phantom deadlock in mutex " << this << PTrace::End;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-05-19 05:09:18
|
Revision: 33608
http://sourceforge.net/p/opalvoip/code/33608
Author: rjongbloed
Date: 2015-05-19 05:09:16 +0000 (Tue, 19 May 2015)
Log Message:
-----------
Do not use pthread_kill() with SIGKILL, kills the whole process. Correct mechanism for forceful termination of a thread is pthread_cancel() with pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS).
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-05-18 04:05:31 UTC (rev 33607)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-05-19 05:09:16 UTC (rev 33608)
@@ -356,6 +356,9 @@
#if P_USE_THREAD_CANCEL
// make sure the cleanup routine is called when the threade cancelled
pthread_cleanup_push(&PThread::PX_ThreadEnd, arg);
+ // Allow cancel to happen any time
+ pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL);
+ pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
#endif
thread->PX_ThreadBegin();
@@ -761,7 +764,7 @@
PTRACE(2, "PTLib\tForcing termination of thread id=0x" << hex << m_threadId << dec);
PXAbortBlock();
- if (WaitForTermination(20))
+ if (WaitForTermination(100))
return;
#ifndef P_HAS_SEMAPHORES
@@ -778,12 +781,10 @@
if (m_threadId != PNullThreadIdentifier) {
#if P_USE_THREAD_CANCEL
pthread_cancel(m_threadId);
- if (WaitForTermination(20))
- return;
- // get more forceful
+#else
+ pthread_kill(m_threadId, SIGKILL);
#endif
-
- pthread_kill(m_threadId, SIGKILL);
+ WaitForTermination(100);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-09-07 10:26:18
|
Revision: 33983
http://sourceforge.net/p/opalvoip/code/33983
Author: rjongbloed
Date: 2015-09-07 10:26:16 +0000 (Mon, 07 Sep 2015)
Log Message:
-----------
Fixed initialisation of thread name on Linux (new unique ID change)
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-09-05 12:38:24 UTC (rev 33982)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-09-07 10:26:16 UTC (rev 33983)
@@ -313,13 +313,13 @@
PAssert(PX_state == PX_starting, PLogicError);
PX_state = PX_running;
- SetThreadName(GetThreadName());
-
#if defined(P_LINUX)
PX_linuxId = GetCurrentUniqueIdentifier();
PX_startTick = PTimer::Tick();
#endif
+ SetThreadName(GetThreadName());
+
pthread_mutex_unlock(&PX_suspendMutex);
PX_Suspended();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-10-09 10:16:54
|
Revision: 34172
http://sourceforge.net/p/opalvoip/code/34172
Author: rjongbloed
Date: 2015-10-09 10:16:51 +0000 (Fri, 09 Oct 2015)
Log Message:
-----------
Fixed GNU compile
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-10-09 10:13:58 UTC (rev 34171)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-10-09 10:16:51 UTC (rev 34172)
@@ -416,7 +416,7 @@
bool PThread::PX_kill(PThreadIdentifier id, int sig)
{
-#if P_LINUX
+#if defined(P_LINUX)
if (!PProcess::IsInitialised())
return false;
PProcess & process = PProcess::Current();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-10-21 13:30:49
|
Revision: 34219
http://sourceforge.net/p/opalvoip/code/34219
Author: rjongbloed
Date: 2015-10-21 13:30:47 +0000 (Wed, 21 Oct 2015)
Log Message:
-----------
Attempt to fix random closing of a channel (TCP socket in particular) when Linux under very heavy load.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-10-21 09:59:43 UTC (rev 34218)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-10-21 13:30:47 UTC (rev 34219)
@@ -931,9 +931,8 @@
retval = ::poll(pfd, PARRAYSIZE(pfd), timeout.GetInterval());
} while (retval < 0 && errno == EINTR);
- if (retval > 0 && pfd[1].revents != 0) {
- BYTE ch;
- PAssertOS(::read(unblockPipe[0], &ch, 1) != -1);
+ BYTE dummy;
+ if (retval > 0 && pfd[1].revents != 0 && ::read(unblockPipe[0], &dummy, 1) == 1) {
errno = ECANCELED;
retval = -1;
PTRACE(6, "PTLib\tUnblocked I/O fd=" << unblockPipe[0]);
@@ -985,9 +984,8 @@
);
} while (retval < 0 && errno == EINTR);
- if ((retval == 1) && read_fds.IsPresent(unblockPipe[0])) {
- BYTE ch;
- PAssertOS(::read(unblockPipe[0], &ch, 1) != -1);
+ BYTE dummy;
+ if (retval > 0 && read_fds.IsPresent(unblockPipe[0]) && ::read(unblockPipe[0], &ch, 1) == 1) {
errno = ECANCELED;
retval = -1;
PTRACE(6, "PTLib\tUnblocked I/O fd=" << unblockPipe[0]);
@@ -1001,7 +999,7 @@
void PThread::PXAbortBlock() const
{
static BYTE ch = 0;
- PAssertOS(::write(unblockPipe[1], &ch, 1) != -1);
+ PAssertOS(::write(unblockPipe[1], &ch, 1) == 1);
PTRACE(6, "PTLib\tUnblocking I/O fd=" << unblockPipe[0] << " thread=" << GetThreadName());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2015-10-27 10:26:55
|
Revision: 34244
http://sourceforge.net/p/opalvoip/code/34244
Author: rjongbloed
Date: 2015-10-27 10:26:53 +0000 (Tue, 27 Oct 2015)
Log Message:
-----------
Remove I/O abort on *nix when calling PThread::WaitForTermination(), you might actually want that last I/O operation to complete and have set that function to wait long enough for it.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-10-26 12:10:30 UTC (rev 34243)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2015-10-27 10:26:53 UTC (rev 34244)
@@ -856,8 +856,6 @@
PTRACE(6, "WaitForTermination on 0x" << hex << id << dec << " for " << maxWait);
- PXAbortBlock(); // this assist in clean shutdowns on some systems
-
PTimeInterval start = PTimer::Tick();
while (!IsTerminated()) {
if ((PTimer::Tick() - start) > maxWait)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2016-02-04 19:30:44
|
Revision: 34593
http://sourceforge.net/p/opalvoip/code/34593
Author: rjongbloed
Date: 2016-02-04 19:30:41 +0000 (Thu, 04 Feb 2016)
Log Message:
-----------
Applied patch #323 Fix ptlib and opal build without PTRACE, thanks Alexander Sverdlin
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-02-04 19:29:02 UTC (rev 34592)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-02-04 19:30:41 UTC (rev 34593)
@@ -1316,7 +1316,9 @@
else {
ExcessiveLockWait();
PAssertPTHREAD(pthread_mutex_lock, (&m_mutex));
+#if PTRACING
PTRACE_BEGIN(0, "PTLib") << "Phantom deadlock in mutex " << *this << PTrace::End;
+#endif
}
PPROFILE_POST_SYSTEM();
#else
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2016-02-09 12:48:24
|
Revision: 34609
http://sourceforge.net/p/opalvoip/code/34609
Author: rjongbloed
Date: 2016-02-09 12:48:22 +0000 (Tue, 09 Feb 2016)
Log Message:
-----------
Fix Linux compile
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-02-09 12:41:26 UTC (rev 34608)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-02-09 12:48:22 UTC (rev 34609)
@@ -1258,7 +1258,6 @@
m_lastLockerId = m_lockerId = PNullThreadIdentifier;
m_lastUniqueId = 0;
m_lockCount = 0;
- m_excessiveLockTime = false;
InitialiseRecursiveMutex(&m_mutex);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2016-04-25 13:12:59
|
Revision: 34792
http://sourceforge.net/p/opalvoip/code/34792
Author: rjongbloed
Date: 2016-04-25 13:12:57 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
Fixed tiny race condition where PThread::IsTerminated() could return true when thread is starting up.
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-04-23 13:12:10 UTC (rev 34791)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-04-25 13:12:57 UTC (rev 34792)
@@ -791,8 +791,15 @@
if (m_type == e_IsProcess)
return false; // Process is always still running
- if (PX_state == PX_finished)
- return true;
+ switch (PX_state) {
+ case PX_starting :
+ case PX_firstResume :
+ return false;
+ case PX_finished:
+ return true;
+ default :
+ break:
+ }
// See if thread is still running, copy variable in case changes between two statements
pthread_t id = m_threadId;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rjo...@us...> - 2016-04-25 13:15:45
|
Revision: 34793
http://sourceforge.net/p/opalvoip/code/34793
Author: rjongbloed
Date: 2016-04-25 13:15:43 +0000 (Mon, 25 Apr 2016)
Log Message:
-----------
Fixed typo
Modified Paths:
--------------
ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-04-25 13:12:57 UTC (rev 34792)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx 2016-04-25 13:15:43 UTC (rev 34793)
@@ -798,7 +798,7 @@
case PX_finished:
return true;
default :
- break:
+ break;
}
// See if thread is still running, copy variable in case changes between two statements
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
