opalvoip-svn Mailing List for OpalVOIP (Page 644)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 18821
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=18821&view=rev
Author:   rjongbloed
Date:     2007-11-06 21:51:39 -0800 (Tue, 06 Nov 2007)

Log Message:
-----------
Added virtual functions on PProcess called whenever threads are started/ended.

Modified Paths:
--------------
    ptlib/trunk/include/ptlib/pprocess.h
    ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx
    ptlib/trunk/src/ptlib/common/osutils.cxx
    ptlib/trunk/src/ptlib/msos/win32.cxx
    ptlib/trunk/src/ptlib/unix/tlibbe.cxx
    ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx
    ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
    ptlib/trunk/src/ptlib/unix/tlibvx.cxx

Modified: ptlib/trunk/include/ptlib/pprocess.h
===================================================================

--- ptlib/trunk/include/ptlib/pprocess.h	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/include/ptlib/pprocess.h	2007-11-07 05:51:39 UTC (rev 18821)
@@ -455,6 +455,20 @@
      */
     static PProcess & Current();
 
+    /**Callback for when a thread is started by the PTLib system. Note this is
+       called in the context of the new thread.
+      */
+    virtual void OnThreadStart(
+      PThread & thread
+    );
+
+    /**Callback for when a thread is ended if wqas started in the PTLib system.
+       Note this is called in the context of the old thread.
+      */
+    virtual void OnThreadEnded(
+      PThread & thread
+    );
+
     /**Determine if the current processes object instance has been initialised.
        If this returns TRUE it is safe to use the PProcess::Current() function.
        
@@ -548,6 +562,10 @@
      */
     DWORD GetProcessID() const;
 
+    /**Return the time at which the program was started 
+    */
+    PTime GetStartTime() const;
+
     /**Get the effective user name of the owner of the process, eg "root" etc.
        This is a platform dependent string only provided by platforms that are
        multi-user. Note that some value may be returned as a "simulated" user.
@@ -712,35 +730,31 @@
     static PDirectory GetOSConfigDir();
   //@}
 
-    PTimerList * GetTimerList();
-    /* Get the list of timers handled by the application. This is an internal
+    /**Get the list of timers handled by the application. This is an internal
        function and should not need to be called by the user.
        
        @return
        list of timers.
      */
+    PTimerList * GetTimerList();
 
+    /**Internal initialisation function called directly from
+       #_main()#. The user should never call this function.
+     */
     static void PreInitialise(
       int argc,     // Number of program arguments.
       char ** argv, // Array of strings for program arguments.
       char ** envp  // Array of string for the system environment
     );
-    /* Internal initialisation function called directly from
+
+    /**Internal shutdown function called directly from the ~PProcess
        #_main()#. The user should never call this function.
      */
-
     static void PreShutdown();
-    /* Internal shutdown function called directly from the ~PProcess
-       #_main()#. The user should never call this function.
-     */
 
+    /// Main function for process, called from real main after initialisation
     virtual int _main(void * arg = NULL);
-    // Main function for process, called from real main after initialisation
 
-    PTime GetStartTime() const;
-    /* return the time at which the program was started 
-    */
-
   private:
     void Construct();
 

Modified: ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx
===================================================================
--- ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/Nucleus++/NucleusThread.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -291,6 +291,9 @@
 }
 
 void pwNUTask::Entry()
-  {
+{
+  PProcess & process = PProcess::Current();
+  process.OnThreadStart(*AssociatedPThread);
   AssociatedPThread->Main();
-  }
+  process.OnThreadEnded(*AssociatedPThread);
+}

Modified: ptlib/trunk/src/ptlib/common/osutils.cxx
===================================================================
--- ptlib/trunk/src/ptlib/common/osutils.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/common/osutils.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -2239,6 +2239,16 @@
 }
 
 
+void PProcess::OnThreadStart(PThread & /*thread*/)
+{
+}
+
+
+void PProcess::OnThreadEnded(PThread & /*thread*/)
+{
+}
+
+
 BOOL PProcess::IsInitialised()
 {
   return PProcessInstance != NULL;

Modified: ptlib/trunk/src/ptlib/msos/win32.cxx
===================================================================
--- ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/msos/win32.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -1262,7 +1262,9 @@
   ::CoInitializeEx(NULL, COINIT_MULTITHREADED);
 #endif
 
+  process.OnThreadStart(*thread);
   thread->Main();
+  process.OnThreadEnded(*thread);
 
 #if defined(_WIN32_DCOM)
   ::CoUninitialize();

Modified: ptlib/trunk/src/ptlib/unix/tlibbe.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibbe.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibbe.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -152,8 +152,12 @@
   process.activeThreads.SetAt((unsigned) thread->mId, thread);
   process.threadMutex.Signal();
 
+  process.OnThreadStart(*thread);
+
   thread->Main();
 
+  process.OnThreadEnded(*thread);
+
   return 0;
 }
 

Modified: ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibmpthrd.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -429,10 +429,14 @@
     thread->suspend_semaphore->Wait();	// Wait for the Resume
   }
 
+  process.OnThreadStart(*thread);
+
   // now call the the thread main routine
   //PTRACE(1, "tlibthrd\tAbout to call Main");
   thread->Main();
 
+  process.OnThreadEnded(*thread);
+
 #ifdef DEBUG_THREADS
   if (debug_mpthreads)
       fprintf(stderr,"thread %p returning\n", thread);

Modified: ptlib/trunk/src/ptlib/unix/tlibthrd.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibthrd.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -1357,6 +1357,8 @@
 
   PTRACE(5, "PWLib\tStarted thread " << thread << ' ' << thread->threadName);
 
+  PProcess::Current().OnThreadStart(*thread);
+
   // now call the the thread main routine
   thread->Main();
 
@@ -1369,10 +1371,11 @@
 
 void PThread::PX_ThreadEnd(void * arg)
 {
+  PThread * thread = (PThread *)arg;
   PProcess & process = PProcess::Current();
+  process.OnThreadEnded(*thread);
   process.threadMutex.Wait();
 
-  PThread * thread = (PThread *)arg;
   pthread_t id = thread->GetThreadId();
   if (id == 0) {
     // Don't know why, but pthreads under Linux at least can call this function

Modified: ptlib/trunk/src/ptlib/unix/tlibvx.cxx
===================================================================
--- ptlib/trunk/src/ptlib/unix/tlibvx.cxx	2007-11-07 00:00:15 UTC (rev 18820)
+++ ptlib/trunk/src/ptlib/unix/tlibvx.cxx	2007-11-07 05:51:39 UTC (rev 18821)
@@ -138,7 +138,9 @@
   if (::semTake(thread->syncPoint, WAIT_FOREVER) == OK) {
     if (::semDelete(thread->syncPoint) == OK)
       thread->syncPoint = NULL;
-  thread->Main();
+    process.OnThreadStart(*thread);
+    thread->Main();
+    process.OnThreadEnded(*thread);
   }
   else
     printf("::ThreadFunction> ::semTake failed, errno=0x%X\n",errno);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2007	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (71)	Nov (241)	Dec (143)
2008	Jan (210)	Feb (263)	Mar (214)	Apr (290)	May (203)	Jun (160)	Jul (128)	Aug (158)	Sep (376)	Oct (234)	Nov (227)	Dec (216)
2009	Jan (99)	Feb (151)	Mar (234)	Apr (143)	May (271)	Jun (244)	Jul (173)	Aug (124)	Sep (246)	Oct (178)	Nov (85)	Dec (77)
2010	Jan (101)	Feb (79)	Mar (92)	Apr (134)	May (125)	Jun (121)	Jul (61)	Aug (70)	Sep (86)	Oct (81)	Nov (65)	Dec (75)
2011	Jan (110)	Feb (119)	Mar (267)	Apr (154)	May (296)	Jun (177)	Jul (149)	Aug (124)	Sep (120)	Oct (116)	Nov (99)	Dec (121)
2012	Jan (78)	Feb (161)	Mar (323)	Apr (154)	May (190)	Jun (207)	Jul (176)	Aug (165)	Sep (137)	Oct (85)	Nov (112)	Dec (100)
2013	Jan (341)	Feb (102)	Mar (240)	Apr (216)	May (233)	Jun (226)	Jul (139)	Aug (192)	Sep (183)	Oct (211)	Nov (220)	Dec (110)
2014	Jan (203)	Feb (205)	Mar (100)	Apr (178)	May (194)	Jun (249)	Jul (136)	Aug (241)	Sep (226)	Oct (200)	Nov (94)	Dec (46)
2015	Jan (94)	Feb (74)	Mar (89)	Apr (78)	May (65)	Jun (70)	Jul (113)	Aug (176)	Sep (140)	Oct (154)	Nov (99)	Dec (115)
2016	Jan (102)	Feb (69)	Mar (97)	Apr (53)	May (42)	Jun (13)	Jul (42)	Aug (30)	Sep	Oct	Nov	Dec

opalvoip-svn Mailing List for OpalVOIP (Page 644)

opalvoip-svn — SVN changes