Changeset 17180 in vbox for trunk

Timestamp:

Feb 26, 2009 5:32:49 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

43459

Message:

Main/Unix: redo SYSV semaphore key generation. The old solution was prone to collisions, which led to mysterious hangs at VM poweroff for the second VM which accidentally shared the same semaphore. Additionally tightened access rights.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (5 diffs)
• Makefile.kmk (modified) (2 diffs)
• SessionImpl.cpp (modified) (2 diffs)
• include/MachineImpl.h (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -7758 +7758 @@
                      E_FAIL);
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
-    Utf8Str configFile = aMachine->mData->mConfigFileFull;
-    char *configFileCP = NULL;
-    int error;
-    RTStrUtf8ToCurrentCP (&configFileCP, configFile);
-    key_t key = ::ftok (configFileCP, 'V');
-    RTStrFree (configFileCP);
+# ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
+    AssertCompileSize(key_t, 4);
+    key_t key;
+    mIPCSem = -1;
+    mIPCKey = "0";
+    for (uint32_t i = 0; i < 1 << 24; i++)
+    {
+        key = ((uint32_t)'V' << 24) | i;
+        int sem = ::semget (key, 1, S_IRUSR | S_IWUSR | IPC_CREAT | IPC_EXCL);
+        if (sem < 0 && errno == EEXIST)
+            continue;
+        mIPCSem = sem;
+        if (sem >= 0)
+        {
+            mIPCKey = BstrFmt ("%u", key);
+            break;
+        }
+    }
+# else /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
+    Utf8Str semName = aMachine->mData->mConfigFileFull;
+    char *pszSemName = NULL;
+    RTStrUtf8ToCurrentCP (&pszSemName, semName);
+    key_t key = ::ftok (pszSemName, 'V');
+    RTStrFree (pszSemName);
+
     mIPCSem = ::semget (key, 1, S_IRWXU | S_IRWXG | S_IRWXO | IPC_CREAT);
-    error = errno;
-    if (mIPCSem < 0 && error == ENOSYS)
+# endif /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
+
+    int errnoSave = errno;
+    if (mIPCSem < 0 && errnoSave == ENOSYS)
     {
         setError (E_FAIL,
@@ -7774 +7795 @@
         return E_FAIL;
     }
-    ComAssertMsgRet (mIPCSem >= 0, ("Cannot create IPC semaphore, errno=%d", error),
+    ComAssertMsgRet (mIPCSem >= 0, ("Cannot create IPC semaphore, errno=%d", errnoSave),
                      E_FAIL);
     /* set the initial value to 1 */
@@ -7895 +7916 @@
             ::semctl (mIPCSem, 0, IPC_RMID);
         mIPCSem = -1;
+# ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
+        mIPCKey = "0";
+# endif /* VBOX_WITH_NEW_SYS_V_KEYGEN */
 #else
 # error "Port me!"
@@ -8059 +8083 @@
         ::semctl (mIPCSem, 0, IPC_RMID);
     mIPCSem = -1;
+# ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
+    mIPCKey = "0";
+# endif /* VBOX_WITH_NEW_SYS_V_KEYGEN */
 #else
 # error "Port me!"
@@ -8118 +8145 @@
     return S_OK;
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
+# ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
+    mIPCKey.cloneTo (aId);
+# else /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
     mData->mConfigFileFull.cloneTo (aId);
+# endif /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
     return S_OK;
 #else

trunk/src/VBox/Main/Makefile.kmk

@@ -78 +78 @@
  VBOX_MAIN_DEFS += VBOX_WITH_HOSTNETIF_API
 endif
+# Unconditionally enable the new semaphore key generation code
+VBOX_MAIN_DEFS += VBOX_WITH_NEW_SYS_V_KEYGEN
 
 VBOX_IDL_FILE.MSCOM    = $(VBOX_PATH_SDK)/bindings/mscom/idl/VirtualBox.idl
@@ -329 +331 @@
 
 ifdef VBOX_WITH_NETFLT
- #needed to include intsafe.h indirectly included by comdef.h 
+ #needed to include intsafe.h indirectly included by comdef.h
  VBoxSVC_INCS.win += $(foreach VARSDK, $(VBoxSVC_SDKS), $(PATH_SDK_$(VARSDK)_INC)/crt)
  #needed to include comsupp.lib

trunk/src/VBox/Main/SessionImpl.cpp

@@ -956 +956 @@
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
 
+# ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
+    Utf8Str ipcKey = ipcId;
+    key_t key = RTStrToUInt32(ipcKey.raw());
+    AssertMsgReturn (key != 0,
+                    ("Key value of 0 is not valid for IPC semaphore"),
+                    E_FAIL);
+# else /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
     Utf8Str semName = ipcId;
     char *pszSemName = NULL;
@@ -961 +968 @@
     key_t key = ::ftok (pszSemName, 'V');
     RTStrFree (pszSemName);
+# endif /* !VBOX_WITH_NEW_SYS_V_KEYGEN */
 
     mIPCSem = ::semget (key, 0, 0);

trunk/src/VBox/Main/include/MachineImpl.h

@@ -988 +988 @@
 #elif defined (VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)
     int mIPCSem;
+# ifdef VBOX_WITH_NEW_SYS_V_KEYGEN
+    Bstr mIPCKey;
+# endif /*VBOX_WITH_NEW_SYS_V_KEYGEN */
 #else
 # error "Port me!"