Changeset 1363 for trunk/testcase/1023-maxfilehandles.c

Timestamp:

Apr 15, 2004, 12:27:11 AM (21 years ago)

Author:

bird

Message:

both.

File:

• trunk/testcase/1023-maxfilehandles.c (modified) (4 diffs, 1 prop)

trunk/testcase/1023-maxfilehandles.c

@@ -38 +38 @@
     unsigned        msEnd;
     unsigned        msStart;
+    unsigned        msTotal = 0;
+    unsigned        cFiles = 0;
+    unsigned        cIncrements = 0;
+    int             fStreams;
     PGINFOSEG       pGIS = GETGINFOSEG();
 #define MAX_FHS 10000
-#ifdef TEST_STREAMS
     static FILE    *apFiles[MAX_FHS];
-#else
     static int      aiFiles[MAX_FHS];
-#endif
 
     DosSetRelMaxFH(&lFHDelta, &cFHs);
     printf("cFHs=%d\n", cFHs);
+
+    /* check for args */
+    fStreams = argc >= 2;
 
     cFHLast = cFHs;
@@ -54 +58 @@
     {
         msStart = pGIS->msecs;
-#ifdef TEST_STREAMS
-        apFiles[i] = fopen(argv[argc - 1], "rb");
-#else
-        aiFiles[i] = open(argv[argc - 1], O_BINARY | O_RDONLY);
-#endif
+        if (fStreams)
+            apFiles[i] = fopen(argv[argc - 1], "rb");
+        else
+            aiFiles[i] = open(argv[argc - 1], O_BINARY | O_RDONLY);
         msEnd = pGIS->msecs;
-#ifdef TEST_STREAMS
-        if (apFiles[i] == NULL)
-#else
-        if (aiFiles[i] < 0)
-#endif
+        if (fStreams ? apFiles[i] == NULL : aiFiles[i] < 0)
         {
             printf("error %d!\n", i + 1);
@@ -77 +76 @@
         {
             printf("Max FH change %i (fh=%d): %d -> %d (inc: %d ms  since last: %d ms)\n",
-                   i + 1,
-#ifdef TEST_STREAMS
-                   fileno(apFiles[i]),
-#else
-                   aiFiles[i],
-#endif
-                   cFHLast, cFHs,
-                   msEnd - msStart, msStart - msLastInc);
-            msLastInc = msEnd;
+                   i + 1, fStreams ? fileno(apFiles[i]) : aiFiles[i],
+                   cFHLast, cFHs, msEnd - msStart, msStart - msLastInc);
+            /* stats */
+            cIncrements++;
+            msTotal += msEnd - msLastInc;
+            msEnd = msLastInc = pGIS->msecs;
         }
         cFHLast = cFHs;
     }
 
+    msTotal += msEnd - msLastInc;
+    cFiles = i;
+
     lFHDelta = cFHs = 0;
     DosSetRelMaxFH(&lFHDelta, &cFHs);
     printf("cFHs=%d\n", cFHs);
+    printf("msTotal=%d  cIncrements=%d  cFiles=%d  i.e. %d handles per second\n",
+           msTotal, cIncrements, cFiles, cFiles * 1000 / msTotal);
 
     /*
@@ -98 +99 @@
      */
     msStart = pGIS->msecs;
-    for (j = 0; j < i; j++)
-#ifdef TEST_STREAMS
-        fclose(apFiles[j]);
-#else
-        close(aiFiles[j]);
-#endif
+    if (fStreams)
+    {
+        for (j = 0; j < i; j++)
+            fclose(apFiles[j]);
+    }
+    else
+    {
+        for (j = 0; j < i; j++)
+            close(aiFiles[j]);
+    }
     msEnd = pGIS->msecs;
     printf("close of %d files took %d ms\n", j, msEnd - msStart);