Changeset 436 for WizardsToolkit/trunk

Timestamp:

10/23/09 12:00:26 (4 weeks ago)

Author:

cristy

Message:

 

Location:

WizardsToolkit/trunk/wizard

Files:

• semaphore.c (modified) (5 diffs)
• semaphore.h (modified) (1 diff)
• wizard.c (modified) (2 diffs)

WizardsToolkit/trunk/wizard/semaphore.c

@@ -82 +82 @@
   semaphore_mutex = 0;
 #endif
-
-static WizardBooleanType
-  instantiate_semaphore = WizardFalse;
 
 /*
@@ -199 +196 @@
 %                                                                             %
 %                                                                             %
-%   D e s t r o y S e m a p h o r e                                           %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  DestroySemaphore() destroys the semaphore environment.
-%
-%  The format of the DestroySemaphore method is:
-%
-%      DestroySemaphore(void)
-%
-*/
-WizardExport void DestroySemaphore(void)
+%   D e s t r o y S e m a p h o r e C o m p o n e n t                         %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  DestroySemaphoreComponent() destroys the semaphore environment.
+%
+%  The format of the DestroySemaphoreComponent method is:
+%
+%      DestroySemaphoreComponent(void)
+%
+*/
+WizardExport void DestroySemaphoreComponent(void)
 {
 #if defined(WIZARDSTOOLKIT_HAVE_PTHREAD)
@@ -218 +215 @@
     (void) fprintf(stderr,"pthread_mutex_destroy failed %s\n",
       GetExceptionMessage(errno));
-#elif defined(WIZARDSTOOLKIT_HAVE_WINTHREADS)
-  if (instantiate_semaphore == WizardFalse)
-    DeleteCriticalSection(&semaphore_mutex);
-#endif
-  instantiate_semaphore=WizardFalse;
+#endif
 }
 
@@ -268 +261 @@
 %                                                                             %
 %                                                                             %
-%   I n s t a n t i a t e S e m a p h o r e                                   %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  InstantiateSemaphore() instantiates the semaphore environment.
-%
-%  The format of the InstantiateSemaphore method is:
+%   I n s t a n t i a t e S e m a p h o r e C o m p o n e n t                 %
+%                                                                             %
+%                                                                             %
+%                                                                             %
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%
+%  InstantiateSemaphoreComponent() instantiates the semaphore component.
+%
+%  The format of the InstantiateSemaphoreComponent method is:
 %
 %      WizardBooleanType InstantiateSemaphore(void)
 %
 */
-WizardExport WizardBooleanType InstantiateSemaphore(void)
+WizardExport WizardBooleanType InstantiateSemaphoreComponent(void)
 {
   LockWizardMutex();
@@ -314 +307 @@
       GetExceptionMessage(errno));
 #elif defined(WIZARDSTOOLKIT_HAVE_WINTHREADS)
-  if (instantiate_semaphore == WizardFalse)
-    InitializeCriticalSection(&semaphore_mutex);
-  instantiate_semaphore=WizardTrue;
   while (InterlockedCompareExchange(&semaphore_mutex,1L,0L) != 0)
     Sleep(10);

WizardsToolkit/trunk/wizard/semaphore.h

@@ -31 +31 @@
 extern WizardExport void
   AcquireSemaphoreInfo(SemaphoreInfo **),
-  DestroySemaphore(void),
+  DestroySemaphoreComponent(void),
   DestroySemaphoreInfo(SemaphoreInfo **),
   RelinquishSemaphoreInfo(SemaphoreInfo *);
 
 extern WizardExport WizardBooleanType
-  InstantiateSemaphore(void),
+  InstantiateSemaphoreComponent(void),
   LockSemaphoreInfo(SemaphoreInfo *),
   UnlockSemaphoreInfo(SemaphoreInfo *);

WizardsToolkit/trunk/wizard/wizard.c

@@ -315 +315 @@
 %      WizardsToolkitTerminus(void)
 %
-%
 */
 WizardExport void WizardsToolkitTerminus(void)
@@ -323 +322 @@
   DestroyRandomComponent();
   DestroyLogComponent();
-}
+  DestroySemaphoreComponent();
+}