Changeset 6625 for trunk/tools/CmdQd/CmdQd.c

Timestamp:

Sep 2, 2001, 4:51:41 AM (24 years ago)

Author:

bird

Message:

Corrected some memory output buffer stuff.

File:

• trunk/tools/CmdQd/CmdQd.c (modified) (19 diffs)

trunk/tools/CmdQd/CmdQd.c

@@ -1 @@
-/* $Id: CmdQd.c,v 1.3 2001-09-01 22:48:10 bird Exp $
+/* $Id: CmdQd.c,v 1.4 2001-09-02 02:51:41 bird Exp $
  *
  * Command Queue Daemon / Client.
@@ -95 +95 @@
 
 
+/*
+ * Memory debugging.
+ */
+#ifdef DEBUGMEMORY
+void my_free(void *);
+void *my_malloc(size_t);
+
+#undef free
+#undef malloc
+
+#define free(pv) my_free(pv)
+#define malloc(cb) my_malloc(cb)
+
+#endif
+
 /*******************************************************************************
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
-#define SHARED_MEM_NAME     "\\SHAREMEM\\CmdQd"
+#define SHARED_MEM_NAME     "\\SHAREMEM\\CmdQd2"
 #define SHARED_MEM_SIZE     65536
 #define IDLE_TIMEOUT_MS     -1 //(60*1000*3)
@@ -125 +140 @@
         msgWaitResponse = 4,
         msgKill = 5,
-        msgKillResponse = 6
+        msgKillResponse = 6,
+        msgDying = 0xff
     }           enmMsgType;
 
@@ -234 +250 @@
 int  Daemon(int cWorkers);
 int  DaemonInit(int cWorkers);
-void signalhandler(int sig);
+void signalhandlerDaemon(int sig);
+void signalhandlerClient(int sig);
 void Worker(void * iWorkerId);
 char*WorkerArguments(char *pszArg, const char *pszzEnv, const char *pszCommand, char *pszCurDir, PPATHCACHE pPathCache);
@@ -371 +388 @@
     char            szArg[CCHMAXPATH + 32];
 
-    if (!getenv("COMSPEC"))
-    {
-        Error("Fatal error: env. var. COMSPEC not found!\n");
-        return 0;
-    }
-
     sprintf(&szArg[0], "%s\t!Daemon! %d", arg0, cWorkers);
     szArg[strlen(arg0)] = '\0';
@@ -499 +510 @@
                      * Wait for output.
                      */
-                    rc = DosWaitEventSem(hevJobQueueFine, SEM_INDEFINITE_WAIT);
-                    if (rc)
+                    /*rc = DosWaitEventSem(hevJobQueueFine, SEM_INDEFINITE_WAIT); - there is some timing problem here,  */
+                    rc = DosWaitEventSem(hevJobQueueFine, 1000); /* timeout after 1 second. */
+                    if (rc && rc != ERROR_TIMEOUT)
                         break;
+                    rc = NO_ERROR;      /* in case of TIMEOUT */
 
                     /*
@@ -620 +633 @@
 
     /*
+     * Set dying msg type. shrmemFree posts the hevClient so clients
+     * waiting for the daemon to respond will quit.
+     */
+    pShrMem->enmMsgType = msgDying;
+
+    /*
      * Cleanup.
      */
@@ -676 +695 @@
                          if (!rc)
                          {
-                             DosSetMaxFH(cWorkers * 3 + 20);
+                             DosSetMaxFH(cWorkers * 6 + 20);
                              return 0;      /* success! */
                          }
@@ -709 +728 @@
  * Daemon signal handler.
  */
-void signalhandler(int sig)
-{
-    sig = sig;
+void signalhandlerDaemon(int sig)
+{
+    /*
+     * Set dying msg type. shrmemFree posts the hevClient so clients
+     * waiting for the daemon to respond will quit.
+     */
+    pShrMem->enmMsgType = msgDying;
+
+    /*
+     * Free and exit.
+     */
     shrmemFree();
     exit(-42);
-}
+    sig = sig;
+}
+
+
+/**
+ * Client signal handler.
+ */
+void signalhandlerClient(int sig)
+{
+    shrmemFree();
+    exit(-42);
+    sig = sig;
+}
+
 
 
@@ -774 +814 @@
              * Redirect output and start process.
              */
-            WorkerArguments(szArg, &pJob->JobInfo.szzEnv, &pJob->JobInfo.szCommand[0],
+            WorkerArguments(&szArg[0], &pJob->JobInfo.szzEnv[0], &pJob->JobInfo.szCommand[0],
                             &pJob->JobInfo.szCurrentDir[0], &PathCache);
             rc = DosCreatePipe(&hPipeR, &hPipeW, sizeof(pJobOutput->szOutput) - 1);
@@ -826 +866 @@
                     ULONG       cchRead2 = 0;
 
-                    cchRead = sizeof(pJobOutput->szOutput) - 1;
+                    cchRead = sizeof(pJobOutput->szOutput) - pJobOutput->cchOutput - 1;
                     while (((rc = DosRead(hPipeR,
                                          &pJobOutput->szOutput[pJobOutput->cchOutput],
@@ -1399 +1439 @@
      * Install signal handlers.
      */
-    signal(SIGSEGV, signalhandler);
-    signal(SIGTERM, signalhandler);
-    signal(SIGABRT, signalhandler);
-    signal(SIGINT,  signalhandler);
-    signal(SIGBREAK,signalhandler);
+    signal(SIGSEGV, signalhandlerDaemon);
+    signal(SIGTERM, signalhandlerDaemon);
+    signal(SIGABRT, signalhandlerDaemon);
+    signal(SIGINT,  signalhandlerDaemon);
+    signal(SIGBREAK,signalhandlerDaemon);
 
     return rc;
@@ -1468 +1508 @@
     if (rc)
     {
-        Error("Fatal error: Failed to open aquire ownership of client mutex semaphore. rc=%d\n");
+        Error("Fatal error: Failed to open take ownership of client mutex semaphore. rc=%d\n");
         shrmemFree();
         return rc;
@@ -1476 +1516 @@
     if (rc)
     {
-        Error("Fatal error: Failed to open aquire ownership of mutex semaphore. rc=%d\n");
+        Error("Fatal error: Failed to open take ownership of mutex semaphore. rc=%d\n");
         shrmemFree();
         return rc;
@@ -1485 +1525 @@
      * Install signal handlers.
      */
-    signal(SIGSEGV, signalhandler);
-    signal(SIGTERM, signalhandler);
-    signal(SIGABRT, signalhandler);
-    signal(SIGINT,  signalhandler);
-    signal(SIGBREAK,signalhandler);
+    signal(SIGSEGV, signalhandlerClient);
+    signal(SIGTERM, signalhandlerClient);
+    signal(SIGABRT, signalhandlerClient);
+    signal(SIGINT,  signalhandlerClient);
+    signal(SIGBREAK,signalhandlerClient);
 
     return rc;
@@ -1502 +1542 @@
     if (!pShrMem)
         return;
+    /* wakeup any clients */
+    DosPostEventSem(pShrMem->hevClient);
+    /* free stuff */
     DosReleaseMutexSem(pShrMem->hmtxClient);
     DosReleaseMutexSem(pShrMem->hmtx);
@@ -1547 +1590 @@
 
         if (!rc)
+        {
             rc = DosRequestMutexSem(pShrMem->hmtx, SEM_INDEFINITE_WAIT);
+            if (rc == ERROR_SEM_OWNER_DIED)
+            {
+                DosCloseMutexSem(pShrMem->hmtx);
+                pShrMem->hmtx = NULLHANDLE;
+                rc = DosCreateMutexSem(NULL, &pShrMem->hmtx, DC_SEM_SHARED, TRUE);
+            }
+        }
+
         if (rc && rc != ERROR_INTERRUPT)
             Error("Internal error: failed to get next message from daemon, rc=%d\n", rc);
@@ -1581 +1633 @@
         {
             rc = DosRequestMutexSem(pShrMem->hmtx, SEM_INDEFINITE_WAIT);
+            if (rc == ERROR_SEM_OWNER_DIED)
+            {
+                Error("Internal error: shared mem mutex owner died.\n");
+                return -1;
+            }
+
             if (!rc && pShrMem->enmMsgType != enmMsgTypeResponse)
             {
-                Error("Internal error: Invalid response message. response=%d  expected=%d\n",
-                      pShrMem->enmMsgType, enmMsgTypeResponse);
+                if (pShrMem->enmMsgType != msgDying)
+                    Error("Internal error: Invalid response message. response=%d  expected=%d\n",
+                          pShrMem->enmMsgType, enmMsgTypeResponse);
+                else
+                    Error("Fatal error: daemon just died!\n");
                 return -1;
             }
@@ -1612 +1673 @@
 }
 
+
+#ifdef DEBUGMEMORY
+void my_free(void *pv)
+{
+    DosFreeMem((PVOID)((unsigned)pv & 0xffff0000));
+}
+
+void *my_malloc(size_t cb)
+{
+    APIRET  rc;
+    PVOID   pv;
+    ULONG   cbAlloc;
+    char    szMsg[200];
+
+    cbAlloc = (cb + 0x1fff) & (~0x0fff);
+
+    rc = DosAllocMem(&pv, cbAlloc, PAG_READ | PAG_WRITE);
+    if (!rc)
+    {
+        rc = DosSetMem(pv, cbAlloc - 0x1000, PAG_READ | PAG_WRITE | PAG_COMMIT);
+        if (rc)
+            __interrupt(3);
+        if (cb & 0xfff)
+            pv = (PVOID)((unsigned)pv + 0x1000 - (cb & 0x0fff));
+    }
+
+    strcpy(szMsg, "malloc(");
+    _itoa(cb, szMsg + strlen(szMsg), 16);
+    strcat(szMsg, ") -> ");
+    _itoa(pv, szMsg + strlen(szMsg), 16);
+    strcat(szMsg, "\r\n");
+
+    DosPutMessage(1, strlen(szMsg), szMsg);
+
+    return rc ? NULL : pv;
+}
+#endif