# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1663361379 -7200
# Node ID 61e336bc65e4c92b2251a1b24d5b59a8cc373a0d
# Parent  5a1169b9d06469a4abeb531b03d8fd0a5e2647b6
Fixed format specifiers for offset types.

diff -r 5a1169b9d064 -r 61e336bc65e4 tests/dstest_block_client.cc
--- a/tests/dstest_block_client.cc	Fri Sep 16 22:08:44 2022 +0200
+++ b/tests/dstest_block_client.cc	Fri Sep 16 22:49:39 2022 +0200
@@ -44,7 +44,7 @@
     offset_t remaining = file_populated_span(file) - offset;
     offset_t sample_remaining = remaining < sample ? remaining : sample;
 
-    printf("%ld bytes from %p...\n", sample_remaining, (file->memory + offset));
+    printf("%lld bytes from %p...\n", sample_remaining, (file->memory + offset));
     memcpy(buf, (file->memory + offset), sample_remaining);
     buf[sample_remaining] = '\0';
 
@@ -70,10 +70,10 @@
 
     printf("----\n%s\n----\n", outbuf);
 
-    printf("[%ld zero bytes at start]\n", leading);
-    printf("[%ld bytes shown]\n", strlen(outbuf));
-    printf("[%ld bytes after string]\n", sample_remaining - leading - strlen(outbuf));
-    printf("[%ld zero bytes at end]\n", trailing);
+    printf("[%lld zero bytes at start]\n", leading);
+    printf("[%d bytes shown]\n", strlen(outbuf));
+    printf("[%lld bytes after string]\n", sample_remaining - leading - strlen(outbuf));
+    printf("[%lld zero bytes at end]\n", trailing);
   }
 }
 
@@ -120,7 +120,7 @@
     return 1;
   }
 
-  printf("Region %ld...%ld populated size %ld size %ld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
+  printf("Region %lld...%lld populated size %lld size %lld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
   printf("File contents:\n");
 
   show(&file, step, sample);
@@ -128,7 +128,7 @@
   printf("File shown.\n");
   printf("Expected...\n"
          "[0 zero bytes at start]\n"
-         "[%ld bytes shown]\n"
+         "[%lld bytes shown]\n"
          "[0 bytes after string]\n"
          "[0 zero bytes at end]\n\n",
          original_size);
@@ -144,7 +144,7 @@
     return 1;
   }
 
-  printf("Region %ld...%ld populated size %ld size %ld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
+  printf("Region %lld...%lld populated size %lld size %lld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
   printf("File contents:\n");
 
   show(&file, step, sample);
@@ -152,10 +152,10 @@
   printf("File shown.\n");
   printf("Expected...\n"
          "[10 zero bytes at start]\n"
-         "[%ld bytes shown]\n"
-         "[%ld bytes after string]\n"
-         "[%ld zero bytes at end]\n\n",
-         original_size - 20, 10UL, 10UL);
+         "[%lld bytes shown]\n"
+         "[%lld bytes after string]\n"
+         "[%lld zero bytes at end]\n\n",
+         original_size - 20, 10ULL, 10ULL);
 
   /* Resizing must occur before writing beyond the end of file. Otherwise, the
      data may get discarded if the supporting flexpage needs to be flushed. */
@@ -166,7 +166,7 @@
   offset_t new_size = old_populated_size_rounded + old_populated_size;
   offset_t new_region = round(new_size, page(1));
 
-  printf("Resize to %ld...\n", new_size);
+  printf("Resize to %lld...\n", new_size);
 
   err = file_resize(&file, new_size);
 
@@ -177,8 +177,8 @@
   }
 
   printf("Resized file...\n");
-  printf("Region %ld...%ld populated size %ld size %ld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
-  printf("Expected %ld...%ld populated size %ld size %ld.\n\n", 0UL, old_populated_size_rounded, old_populated_size_rounded, new_size);
+  printf("Region %lld...%lld populated size %lld size %lld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
+  printf("Expected %lld...%lld populated size %lld size %lld.\n\n", 0ULL, old_populated_size_rounded, old_populated_size_rounded, new_size);
 
   /* Re-map to avoid masking the region. */
 
@@ -191,10 +191,10 @@
   }
 
   printf("Remapped file without masking...\n");
-  printf("Region %ld...%ld populated size %ld size %ld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
-  printf("Expected %ld...%ld populated size %ld size %ld.\n\n", 0UL, new_region, old_populated_size, old_size);
+  printf("Region %lld...%lld populated size %lld size %lld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
+  printf("Expected %lld...%lld populated size %lld size %lld.\n\n", 0ULL, new_region, old_populated_size, old_size);
 
-  printf("Resize to %ld...\n", new_size);
+  printf("Resize to %lld...\n", new_size);
 
   err = file_resize(&file, new_size);
 
@@ -205,16 +205,16 @@
   }
 
   printf("Resized file...\n");
-  printf("Region %ld...%ld populated size %ld size %ld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
-  printf("Expected %ld...%ld populated size %ld size %ld.\n\n", 0UL, round(new_size, page(1)), new_size, new_size);
+  printf("Region %lld...%lld populated size %lld size %lld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
+  printf("Expected %lld...%lld populated size %lld size %lld.\n\n", 0ULL, round(new_size, page(1)), new_size, new_size);
 
   /* Copy the file data to another file region. */
 
-  printf("Copy data to %ld...\n", old_populated_size_rounded);
+  printf("Copy data to %lld...\n", old_populated_size_rounded);
 
   memcpy(file.memory + old_populated_size_rounded, file.memory, old_size);
 
-  printf("Region %ld...%ld populated size %ld size %ld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
+  printf("Region %lld...%lld populated size %lld size %lld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
   printf("File contents:\n");
 
   show(&file, step, sample);
@@ -222,12 +222,12 @@
   printf("File shown.\n");
   printf("Expected...\n"
          "[0 zero bytes at start]\n"
-         "[%ld bytes shown]\n"
-         "[%ld bytes after string]\n"
-         "[%ld zero bytes at end]\n"
+         "[%lld bytes shown]\n"
+         "[%lld bytes after string]\n"
+         "[%lld zero bytes at end]\n"
          "...\n"
          "[0 zero bytes at start]\n"
-         "[%ld bytes shown]\n"
+         "[%lld bytes shown]\n"
          "[0 bytes after string]\n"
          "[0 zero bytes at end]\n\n",
          original_size, sample - original_size, sample - original_size,
@@ -243,7 +243,7 @@
     return 1;
   }
 
-  printf("Region %ld...%ld populated size %ld size %ld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
+  printf("Region %lld...%lld populated size %lld size %lld.\n", file.start_pos, file.end_pos, file_populated_span(&file), file.size);
   printf("File contents:\n");
 
   show(&file, step, sample);
@@ -251,12 +251,12 @@
   printf("File shown.\n");
   printf("Expected...\n"
          "[10 zero bytes at start]\n"
-         "[%ld bytes shown]\n"
-         "[%ld bytes after string]\n"
-         "[%ld zero bytes at end]\n"
+         "[%lld bytes shown]\n"
+         "[%lld bytes after string]\n"
+         "[%lld zero bytes at end]\n"
          "...\n"
          "[0 zero bytes at start]\n"
-         "[%ld bytes shown]\n"
+         "[%lld bytes shown]\n"
          "[10 bytes after string]\n"
          "[10 zero bytes at end]\n",
          original_size - 10, sample - original_size, sample - original_size,
diff -r 5a1169b9d064 -r 61e336bc65e4 tests/dstest_file_client.cc
--- a/tests/dstest_file_client.cc	Fri Sep 16 22:08:44 2022 +0200
+++ b/tests/dstest_file_client.cc	Fri Sep 16 22:49:39 2022 +0200
@@ -44,7 +44,7 @@
 
   offset_t nwritten = client_write(file, buffer, size);
 
-  printf("Written %ld/%ld in #%d to file with first %c, last %c...\n", nwritten, size, region, *buffer, *(buffer + nwritten - 1));
+  printf("Written %lld/%lld in #%d to file with first %c, last %c...\n", nwritten, size, region, *buffer, *(buffer + nwritten - 1));
 
   /* Flush to make the output available. */
 
@@ -71,7 +71,7 @@
 
   client_seek(file, 0, SEEK_END);
 
-  printf("File %s at position %ld...\n", creator ? "creator" : "follower", client_tell(file));
+  printf("File %s at position %lld...\n", creator ? "creator" : "follower", client_tell(file));
 
   /* Write initial data as the file's creator. */
 
@@ -105,11 +105,11 @@
     {
       total += nread;
 
-      printf("Read as %s %ld/%ld, total %ld, first %c, last %c, from file...\n", creator ? "creator" : "follower",
+      printf("Read as %s %lld/%lld, total %lld, first %c, last %c, from file...\n", creator ? "creator" : "follower",
              nread, size, total, *buffer, *(buffer + nread - 1));
 
       if (!(*(buffer + nread - 1)))
-        printf("Warning: length before zero region is %ld\n", strlen(buffer));
+        printf("Warning: length before zero region is %lld\n", strlen(buffer));
 
       nread = client_read(file, buffer, size);
     }
diff -r 5a1169b9d064 -r 61e336bc65e4 tests/dstest_file_remove.cc
--- a/tests/dstest_file_remove.cc	Fri Sep 16 22:08:44 2022 +0200
+++ b/tests/dstest_file_remove.cc	Fri Sep 16 22:49:39 2022 +0200
@@ -42,7 +42,7 @@
 
   nread = client_read(file, buf, 20);
 
-  printf("Read %ld bytes...\n", nread);
+  printf("Read %lld bytes...\n", nread);
   fwrite(buf, sizeof(char), nread, stdout);
   fputs("\n", stdout);
 }
@@ -57,7 +57,7 @@
 
   nwritten = client_write(file, buf, strlen(buf));
 
-  printf("Wrote %ld bytes: ", nwritten);
+  printf("Wrote %lld bytes: ", nwritten);
   fwrite(buf, sizeof(char), nwritten, stdout);
   fputs("\n", stdout);
 }
diff -r 5a1169b9d064 -r 61e336bc65e4 tests/dstest_pipe_client.cc
--- a/tests/dstest_pipe_client.cc	Fri Sep 16 22:08:44 2022 +0200
+++ b/tests/dstest_pipe_client.cc	Fri Sep 16 22:49:39 2022 +0200
@@ -64,7 +64,7 @@
 
       offset_t nwritten = client_write(writer, buffer, TO_TRANSFER);
 
-      printf("Written %ld/%ld in #%d of %d/%d to pipe #%d...\n", nwritten, TO_TRANSFER, region, loop, 2, number);
+      printf("Written %lld/%lld in #%d of %d/%d to pipe #%d...\n", nwritten, TO_TRANSFER, region, loop, 2, number);
     }
 
     sleep(1);
@@ -130,7 +130,7 @@
     {
       totals[p] += nread;
 
-      printf("Read %ld/%ld, total %ld, first %c, last %c, from pipe #%d...\n", nread, TO_TRANSFER, totals[p], *buffer, *(buffer + nread - 1), p + 1);
+      printf("Read %lld/%lld, total %lld, first %c, last %c, from pipe #%d...\n", nread, TO_TRANSFER, totals[p], *buffer, *(buffer + nread - 1), p + 1);
       nread = client_read(reader, buffer, TO_TRANSFER);
     }
 
@@ -151,7 +151,7 @@
 
   for (int p = 0; p < 2; p++)
   {
-    printf("Data received for pipe #%d: %ld\n", p, totals[p]);
+    printf("Data received for pipe #%d: %lld\n", p, totals[p]);
     printf("Data shown for pipe #%d: %s\n", p, totals[p] == TO_TRANSFER * 26 * NUMBER_OF_ITERATIONS ? "True" : "False");
   }
 }
@@ -160,6 +160,8 @@
 {
   /* Obtain pipe endpoint references. Blocking will be set up manually. */
 
+  printf("Obtaining pipes...\n");
+
   file_t *reader1, *reader2, *writer1, *writer2;
   long err = client_pipe(&reader1, &writer1, O_NONBLOCK) ||
              client_pipe(&reader2, &writer2, O_NONBLOCK);
@@ -170,6 +172,8 @@
     return 1;
   }
 
+  printf("Starting activities...\n");
+
   /* Schedule reader and writer threads. */
 
   std::thread *activities[3];