[Dotgnu-pnet-commits] CVS: pnet/support hb_gc.c,1.14,1.15

[Thong Nguyen <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnet/support
In directory subversions:/tmp/cvs-serv27035

Modified Files:
        hb_gc.c 
Log Message:


Index: hb_gc.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnet/support/hb_gc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** hb_gc.c     2 Jul 2003 23:35:12 -0000       1.14
--- hb_gc.c     2 Jul 2003 23:42:53 -0000       1.15
***************
*** 94,98 ****
   * Notify the finalization thread that there is work to do.
   */
! static int PrivateGCNotifyFinalize(void)
  {
        ILExecThread *thread;
--- 94,98 ----
   * Notify the finalization thread that there is work to do.
   */
! static int PrivateGCNotifyFinalize(int timeout)
  {
        ILExecThread *thread;
***************
*** 146,150 ****
                
        /* Wait until finalizers have finished */
!       ILWaitOne(g_FinalizerResponse, -1);
        
        GC_TRACE("ILGCInvokeFinalizers: Finalizers finished[thread: %d]\n", 
(int)ILThreadSelf());
--- 146,150 ----
                
        /* Wait until finalizers have finished */
!       ILWaitOne(g_FinalizerResponse, timeout);
        
        GC_TRACE("ILGCInvokeFinalizers: Finalizers finished[thread: %d]\n", 
(int)ILThreadSelf());
***************
*** 155,159 ****
  static void GCNotifyFinalize(void)
  {
!       PrivateGCNotifyFinalize();
  }
  
--- 155,159 ----
  static void GCNotifyFinalize(void)
  {
!       PrivateGCNotifyFinalize(-1);
  }
  
***************
*** 187,200 ****
        g_Deinit = 1;
  
!       if (g_FinalizerThread)
!       {
!               ILGCCollect();
!               
!               /* Notify the finalizer thread */
!               ILWaitEventSet(g_FinalizerSignal);
  
!               /* Wait 10(!?) seconds for the finalizers to finish */
!               ILWaitOne(g_FinalizerResponse, 10000);
!       }
  }
  
--- 187,195 ----
        g_Deinit = 1;
  
!       ILGCCollect();
  
!       /* Wait up to 10 seconds for the finalizers to run */
!               
!       PrivateGCNotifyFinalize(10000);
  }
  
***************
*** 251,255 ****
        if (GC_should_invoke_finalizers())
        {
!               PrivateGCNotifyFinalize();
        }
  }
--- 246,250 ----
        if (GC_should_invoke_finalizers())
        {
!               PrivateGCNotifyFinalize(-1);
        }
  }