Changeset 49

Timestamp:

Dec 3, 2010, 12:30:12 PM (15 years ago)

Author:

markus

Message:

sped up writing (larger buffer)

File:

• trunk/src/lbatest/lbatest.c (modified) (14 diffs)

trunk/src/lbatest/lbatest.c

@@ -1 +1 @@
 /******************************************************************************
 
-  lbatest.c - simple test program for os2ahci
+  lbatest.c - simple (dumb) test program for os2ahci
 
   Writes the actual LBA to each sector on a hard disk. The purpose is to
@@ -41 +41 @@
 #include <stdio.h>
 #include <stddef.h>
+#include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-
-#define SECTOR_SIZE   512
+#include <signal.h>
+
+#define SECTOR_SIZE        512
+#define SECTORS_PER_WRITE  200
+
 
 /*--- function prototypes ---------------------------------------------------*/
@@ -54 +58 @@
 int           read_test        (char *drv);
 
+void          signal_handler   (int sig_no);
+
+/*--- global data -----------------------------------------------------------*/
+
+unsigned long lba_pos;
+unsigned long first_wrong_sector = 0xffffffff;
+char mode;
 
 /*--- start of code ---------------------------------------------------------*/
@@ -63 +74 @@
 {
   char *drv;
-  char mode;
   HFILE hf;
 
@@ -105 +115 @@
   unsigned long action;
   unsigned long cb_written;
-  char buf[SECTOR_SIZE];
   int rc = 0;
   float gbf = 1024.0 * 1024.0 * 1024.0 / 512.0;
+  unsigned long i;
+  unsigned char *wbuf;
+  char buf[100];
 
   /* ask for confirmation, we destroy the drive's contents */
@@ -120 +132 @@
                 OPEN_FLAGS_DASD | OPEN_FLAGS_FAIL_ON_ERROR |
                 OPEN_FLAGS_WRITE_THROUGH | OPEN_FLAGS_NO_CACHE |
-                OPEN_FLAGS_SEQUENTIAL | OPEN_SHARE_DENYREADWRITE |
-                OPEN_ACCESS_WRITEONLY,
+                OPEN_SHARE_DENYREADWRITE | OPEN_ACCESS_WRITEONLY,
                 NULL);
   if (ret != NO_ERROR) {
@@ -137 +148 @@
   }
 
+  /* allocate big write buffer */
+  wbuf = calloc(SECTOR_SIZE, SECTORS_PER_WRITE);
+
   /* go... */
-  memset(buf, 0x00, sizeof(buf));
-  for (lba = 0; ; lba++) {
-    memcpy(buf, &lba, sizeof(lba));
-    ret = DosWrite(hf_disk, buf, SECTOR_SIZE, &cb_written);
+  for (lba = 0; ; lba += SECTORS_PER_WRITE) {
+
+    /* prepare buffer; set the first 4 bytes of each sector
+     * to its LBA */
+      for (i = 0; i < SECTORS_PER_WRITE; i++) {
+        *((unsigned long *)(wbuf + i * SECTOR_SIZE)) = lba + i;
+      }
+
+    /* write buffer to disk */
+    ret = DosWrite(hf_disk, wbuf, SECTOR_SIZE * SECTORS_PER_WRITE, &cb_written);
+    if (cb_written < SECTOR_SIZE * SECTORS_PER_WRITE) {
+      /* done?! */
+      goto cleanup;
+    }
     if (ret != NO_ERROR) {
       fprintf(stderr, "\nFailed to write to disk %s, code %d\n", drv, ret);
@@ -149 +173 @@
 
     /* write progress */
-    if (lba % 100 == 0) {
-      printf("\r%dk sectors written (%0.02f GB)", lba / 1000, (float)lba / gbf);
-    }
+    printf("\r%dk sectors written (%0.02f GB)", lba / 1000, (float)lba / gbf);
+    
   }
 
@@ -158 +181 @@
   DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_UNLOCKDRIVE, NULL, 0, &action,
               NULL, 0, &cb_written);
-
   DosClose(hf_disk);
+  free(wbuf);
   return rc;
 
@@ -169 +192 @@
 int read_test(char *drv)
 {
-  unsigned long lba;
   unsigned long ret;
   HFILE hf_disk;
@@ -200 +222 @@
   }
 
+  /* catch Ctrl+C */
+  signal(SIGINT, signal_handler);
+
   /* go... */
   memset(buf, 0x00, sizeof(buf));
-  for (lba = 0; ; lba++) {
+  for (lba_pos = 0; ; lba_pos++) {
     ret = DosRead(hf_disk, buf, SECTOR_SIZE, &cb_read);
     if (ret != NO_ERROR) {
@@ -210 +235 @@
     }
 
-    if (*((unsigned long*)buf) != lba) {
-      fprintf(stderr, "\nFailure: read %d from sector %d\n",
-              *((unsigned long*)buf), lba);
+    if (*((unsigned long*) buf) != lba_pos) {
+      printf("\nWrong sector number: read %d from sector %d\n",
+              *((unsigned long*) buf), lba_pos);
       err_cnt++;
+      if (first_wrong_sector == 0xffffffff) {
+        first_wrong_sector = lba_pos;
+      }
     }
 
     /* progress */
-    if (lba % 100 == 0) {
-      printf("\r%dk sectors read (%0.02f GB)", lba / 1000, (float)lba / gbf);
+    if (lba_pos % 100 == 0) {
+      printf("\r%dk sectors read (%0.02f GB)", lba_pos / 1000, 
+             (float) lba_pos / gbf);
     }
   }
@@ -226 +255 @@
   DosDevIOCtl(hf_disk, IOCTL_DISK, DSK_UNLOCKDRIVE, NULL, 0, &action,
               NULL, 0, &cb_read);
-
   DosClose(hf_disk);
 
-  printf("Found %d logical errors.\n", err_cnt);
+  /* print summary */
+  printf("Found %d logical errors\n", err_cnt);
+  if (first_wrong_sector != 0xffffffff) {
+    printf("First wrong sector was %u.\n", err_cnt, first_wrong_sector);
+  }
+
   return rc;
 }
@@ -243 +276 @@
          "where mode is either W for writing or R for reading.\n\n"
          "In write mode, this program COMPLETELY DESTROYS ALL DATA on the specified\n"
-         "disc. It writes the address of each sector to the sector itself.\n\n"
+         "partition/disc. It writes the address of each sector to the sector itself.\n\n"
          "In read mode, each sector is read and its address verified.\n");
 }
 
+
+/******************************************************************************
+ * signal_handler for SIGINT - prints summary to STDOUT
+ */
+void signal_handler(int sig_no)
+{
+
+  if (sig_no == SIGINT && mode == 'R') {
+    /* read mode interrupted; show summary */
+    printf("\n\nLast block read:    %u\n", lba_pos);
+    if (first_wrong_sector != 0xffffffff) {
+      printf("First wrong sector: %u\n", first_wrong_sector);
+    } else {
+      printf("All sectors read ok\n");
+    }
+  }
+
+  exit(0);
+
+}