Changeset 6069 for trunk/src/kernel32/hmsemaphore.cpp

Timestamp:

Jun 22, 2001, 9:40:28 PM (24 years ago)

Author:

sandervl

Message:

semaphore update

File:

• trunk/src/kernel32/hmsemaphore.cpp (modified) (12 diffs)

trunk/src/kernel32/hmsemaphore.cpp

@@ -1 @@
-/* $Id: hmsemaphore.cpp,v 1.5 2001-06-21 21:07:54 sandervl Exp $ */
+/* $Id: hmsemaphore.cpp,v 1.6 2001-06-22 19:40:28 sandervl Exp $ */
 
 /*
@@ -8 +8 @@
  * TODO: No inheritance when CreateSemaphore is called for existing named event semaphore?
  *       (see HMCreateSemaphore in handlemanager.cpp)
- * TODO: OpenSemaphore does not work right now! initialcount/maximumcount)
+ * TODO: OpenSemaphore does not work. (get SEM_INFO pointer)
  * TODO: Name collisions with files & mutex not allowed. Check if this can happen in OS/2
- * TODO: Does NOT work for sharing semaphores between processes!!
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -44 +43 @@
 #include <stdlib.h>
 #include <string.h>
+#include <heapshared.h>
 #include "unicode.h"
 #include "misc.h"
@@ -62 +62 @@
 #endif
 
+typedef struct {
+    LONG currentCount;
+    LONG maximumCount;
+    LONG refCount;
+    HEV  hev;
+} SEM_INFO, *PSEM_INFO;
 
 /*****************************************************************************
@@ -125 +131 @@
   }
   pHMHandleData->dwAccess  = SEMAPHORE_ALL_ACCESS_W;
-  pHMHandleData->dwFlags   = lMaximumCount;
-  pHMHandleData->dwCreation= lInitialCount;
-  pHMHandleData->hHMHandle = hev;
+  PSEM_INFO pSemInfo       = (PSEM_INFO)_smalloc(sizeof(SEM_INFO));
+  pSemInfo->refCount       = 1;
+  pSemInfo->hev            = hev;
+  pSemInfo->maximumCount   = lMaximumCount;
+  pSemInfo->currentCount   = lInitialCount;
+  pHMHandleData->hHMHandle = (DWORD)pSemInfo;
+  pHMHandleData->dwInternalType = HMTYPE_SEMAPHORE;
   return ERROR_SUCCESS_W;
 #else
@@ -196 +206 @@
   }
   pHMHandleData->hHMHandle = hev;
+  pHMHandleData->dwInternalType = HMTYPE_SEMAPHORE;
   return ERROR_SUCCESS_W;
 #else
@@ -235 +246 @@
 {
   APIRET rc;
-
-  if(pHMHandleData->hHMHandle) {
-      rc = DosCloseEventSem((HEV)pHMHandleData->hHMHandle);
+  PSEM_INFO pSemInfo  = (PSEM_INFO)pHMHandleData->hHMHandle;
+
+  if(pSemInfo) {
+      rc = DosCloseEventSem(pSemInfo->hev);
       if(rc) {
-          dprintf(("DosCloseEventSem %x failed with rc %d", pHMHandleData->hHMHandle, rc));
+          dprintf(("DosCloseEventSem %x failed with rc %d", pSemInfo->hev, rc));
           SetLastError(error2WinError(rc));
           return FALSE;
+      }
+      if(InterlockedDecrement(&pSemInfo->refCount) == 0) {
+          free(pSemInfo);
       }
   }
@@ -273 +288 @@
 {
   APIRET rc; 
-  HEV hev;
+  HEV    hev;
+  PSEM_INFO pSemInfo  = (PSEM_INFO)pHMSrcHandle->hHMHandle;
   
   dprintf(("KERNEL32:HandleManager::DuplicateHandle %s(%08x,%08x,%08x,%08x,%08x)",
@@ -285 +301 @@
       return FALSE;
   }
-  hev = (HEV)pHMSrcHandle->hHMHandle;
-  rc = DosOpenEventSem(NULL, &hev);
-  if(rc) {
-      dprintf(("DosOpenEventSem %x failed with rc %d", pHMSrcHandle->hHMHandle, rc));
-      pHMHandleData->hHMHandle = 0;
-      SetLastError(error2WinError(rc));
-      return FALSE;
-  }
+  InterlockedIncrement(&pSemInfo->refCount);
   pHMHandleData->dwAccess  = fdwAccess;
-  pHMHandleData->dwFlags   = pHMSrcHandle->dwFlags;    //lMaximumCount;
-  pHMHandleData->dwCreation= pHMSrcHandle->dwCreation; //lInitialCount;
-  pHMHandleData->hHMHandle = hev;
+  pHMHandleData->hHMHandle = (DWORD)pSemInfo;
+  pHMHandleData->dwInternalType = HMTYPE_SEMAPHORE;
   SetLastError(ERROR_SUCCESS_W);
   return TRUE;
@@ -317 +325 @@
 
 DWORD HMDeviceSemaphoreClass::WaitForSingleObject(PHMHANDLEDATA pHMHandleData,
-                                               DWORD         dwTimeout)
+                                                  DWORD         dwTimeout)
 {
  DWORD rc;
@@ -331 +339 @@
   }
 
-  rc = DosWaitEventSem(pHMHandleData->hHMHandle, dwTimeout);
+  PSEM_INFO pSemInfo  = (PSEM_INFO)pHMHandleData->hHMHandle;
+
+  if(InterlockedDecrement(&pSemInfo->currentCount) >= 0) {
+      SetLastError(ERROR_SUCCESS_W);
+      return WAIT_OBJECT_0_W;  
+  }
+
+  rc = DosWaitEventSem(pSemInfo->hev, dwTimeout);
   if(rc && rc != ERROR_INTERRUPT && rc != ERROR_TIMEOUT && rc != ERROR_SEM_OWNER_DIED) {
-      dprintf(("DosWaitEventSem %x failed with rc %d", pHMHandleData->hHMHandle, rc));
+      dprintf(("DosWaitEventSem %x failed with rc %d", pSemInfo->hev, rc));
       SetLastError(error2WinError(rc));
       return WAIT_FAILED_W;
@@ -477 +492 @@
   }
 
-  rc = DosResetEventSem(pHMHandleData->hHMHandle, &count);
+  PSEM_INFO pSemInfo  = (PSEM_INFO)pHMHandleData->hHMHandle;
+
+  if(InterlockedIncrement(&pSemInfo->currentCount) > 0) {
+      //TODO: this is NOT thread safe:
+      if(pSemInfo->currentCount > pSemInfo->maximumCount) { 
+          pSemInfo->currentCount = pSemInfo->maximumCount;
+      }
+      SetLastError(ERROR_SUCCESS_W);
+      return TRUE;  
+  }
+
+  rc = DosResetEventSem(pSemInfo->hev, &count);
   if(rc) {
-      dprintf(("DosResetEventSem %x failed with rc %d", pHMHandleData->hHMHandle, rc));
+      dprintf(("DosResetEventSem %x failed with rc %d", pSemInfo->hev, rc));
       SetLastError(error2WinError(rc));
       return FALSE;