Changeset 7451 for trunk/tools

Timestamp:

Nov 24, 2001, 9:40:44 PM (24 years ago)

Author:

bird

Message:

Corrected a few bugs. Introduced JobId and multiple daemons.

File:

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

trunk/tools/CmdQd/CmdQd.c

@@ -1 @@
-/* $Id: CmdQd.c,v 1.10 2001-11-24 06:05:31 bird Exp $
+/* $Id: CmdQd.c,v 1.11 2001-11-24 20:40:44 bird Exp $
  *
  * Command Queue Daemon / Client.
@@ -291 +291 @@
 {
     struct Job *    pNext;              /* Pointer to next job. */
+    int             iJobId;             /* JobId. */
     int             rc;                 /* Result. */
     PJOBOUTPUT      pJobOutput;         /* Output. */
@@ -330 +331 @@
                                         /* since we redirect standard files handles */
                                         /* and changes the currentdirectory. */
+
+PSZ         pszSharedMem = SHARED_MEM_NAME; /* Default shared memname */
+                                        /* Could be overridden by env.var. CMDQD_MEM_NAME. */
 
 /*******************************************************************************
@@ -367 +371 @@
 int main(int argc, char **argv)
 {
+    char *  psz;
+    char    szShrMemName[CCHMAXPATH];
 
     /*
@@ -380 +386 @@
         }
         return 0;
+    }
+
+    /*
+     * Check for environment variable which gives us
+     * the alternate shared mem name.
+     */
+    if ((psz = getenv("CMDQD_MEM_NAME")) != NULL)
+    {
+        if (strlen(psz) >= CCHMAXPATH - sizeof("\\SHAREMEM\\"))
+           {
+           printf("fatal error: CMDQD_MEM_NAME is is too long.\n");
+           return -1;
+           }
+        strcpy(pszSharedMem = &szShrMemName[0], "\\SHAREMEM\\");
+        strcat(pszSharedMem, psz);
     }
 
@@ -493 +514 @@
         "    showfailedjobs     - shows jobs which failed.\n"
         "\n"
+        "   To use multiple daemons for different purposed assing different\n"
+        "   values to CMDQD_MEM_NAME (env.var.) for the sessions.\n"
+        "\n"
         "Copyright (c) 2001 knut st. osmundsen (kosmunds@csc.com)\n"
         );
@@ -588 +612 @@
                         pJobQueueEnd = pJob;
                     }
-                    cJobs++;
+                    pJob->iJobId = cJobs++;
                     DosReleaseMutexSem(hmtxJobQueue);
 
@@ -804 +828 @@
                              */
                             cch = sprintf(szTmp,
-                                          "------------------ Job %d\n"
+                                          "------------------ JobId %d - %d\n"
                                           " command:  %s\n"
                                           " curdir:   %s\n"
                                           " rcIgnore: %d\n",
+                                          pJob->iJobId,
                                           iJob,
                                           pJob->JobInfo.szCommand,
@@ -834 +859 @@
                         *pszOutput = '\0';
                         pShrMem->u1.ShowJobsResponse.fMore = pJob != NULL;
+                        if (!pJob)
+                           DosReleaseMutexSem(hmtxJobQueue);
                         rc = shrmemSendDaemon(TRUE);
 
@@ -913 +940 @@
                              */
                             cch = sprintf(szTmp,
-                                          "------------------ Failed Job %d\n"
+                                          "------------------ Failed JobId %d - %d\n"
                                           " command:  %s\n"
                                           " curdir:   %s\n"
                                           " rc:       %d  (rcIgnore=%d)\n",
+                                          pJob->iJobId,
                                           iJob,
                                           pJob->JobInfo.szCommand,
@@ -944 +972 @@
                         *pszOutput = '\0';
                         pShrMem->u1.ShowFailedJobsResponse.fMore = pJob != NULL;
+                        if (!pJob)
+                           DosReleaseMutexSem(hmtxJobQueueFine);
                         rc = shrmemSendDaemon(TRUE);
 
@@ -1023 +1053 @@
                              */
                             cch = sprintf(szTmp,
-                                          "------------------ Running Job %d\n"
+                                          "------------------ Running JobId %d - %d\n"
                                           " command:  %s\n"
                                           " curdir:   %s\n"
                                           " rcIgnore: %d\n",
+                                          pJob->iJobId,
                                           iJob,
                                           pJob->JobInfo.szCommand,
@@ -1053 +1084 @@
                         *pszOutput = '\0';
                         pShrMem->u1.ShowRunningJobsResponse.fMore = pJob != NULL;
+                        if (!pJob)
+                           DosReleaseMutexSem(hmtxJobQueue);
                         rc = shrmemSendDaemon(TRUE);
 
@@ -1133 +1166 @@
                              */
                             cch = sprintf(szTmp,
-                                          "------------------ Completed Job %d\n"
+                                          "------------------ Completed JobId %d - %d\n"
                                           " command:  %s\n"
                                           " curdir:   %s\n"
                                           " rcIgnore: %d\n",
+                                          pJob->iJobId,
                                           iJob,
                                           pJob->JobInfo.szCommand,
@@ -1163 +1197 @@
                         *pszOutput = '\0';
                         pShrMem->u1.ShowCompletedJobsResponse.fMore = pJob != NULL;
+                        if (!pJob)
+                           DosReleaseMutexSem(hmtxJobQueueFine);
                         rc = shrmemSendDaemon(TRUE);
 
@@ -1392 +1428 @@
 
             /* insert into running */
-            pJob ->pNext = NULL;
+            pJob->pNext = NULL;
             if (pJobRunningEnd)
-                pJobRunningEnd->pNext = pJob;
+                pJobRunningEnd = pJobRunningEnd->pNext = pJob;
             else
                 pJobRunning = pJobRunningEnd = pJob;
@@ -1560 +1596 @@
                 while (pJobCur)
                 {
-                    if (pJobCur->pNext != pJob)
+                    if (pJobCur->pNext == pJob)
                     {
                         pJobCur->pNext = pJob->pNext;
@@ -2000 +2036 @@
     APIRET rc;
     rc = DosGetNamedSharedMem((PPVOID)(PVOID)&pShrMem,
-                              SHARED_MEM_NAME,
+                              pszSharedMem,
                               PAG_READ | PAG_WRITE);
     if (!rc)
@@ -2226 +2262 @@
     int rc;
     rc = DosAllocSharedMem((PPVOID)(PVOID)&pShrMem,
-                           SHARED_MEM_NAME,
+                           pszSharedMem,
                            SHARED_MEM_SIZE,
                            PAG_COMMIT | PAG_READ | PAG_WRITE);
@@ -2301 +2337 @@
      */
     rc = DosGetNamedSharedMem((PPVOID)(PVOID)&pShrMem,
-                              SHARED_MEM_NAME,
+                              pszSharedMem,
                               PAG_READ | PAG_WRITE);
     if (rc)