[xiph-commits] r15200 - trunk/cdparanoia

[xiphmont at svn.xiph.org]

Author: xiphmont
Date: 2008-08-25 13:39:42 -0700 (Mon, 25 Aug 2008)
New Revision: 15200

Modified:
   trunk/cdparanoia/cachetest.c
   trunk/cdparanoia/main.c
Log:
Moving ongoing work into SVN; don't try to use this version.



Modified: trunk/cdparanoia/cachetest.c
===================================================================
--- trunk/cdparanoia/cachetest.c	2008-08-25 02:31:54 UTC (rev 15199)
+++ trunk/cdparanoia/cachetest.c	2008-08-25 20:39:42 UTC (rev 15200)
@@ -97,31 +97,21 @@
     return -1;
   }
 
-  /* initial timing data collection of 100 sequential sectors; we need a median, verify an initial seek */
-  {
+  /* Dump some initial timing data to give a little context for human
+     eyes.  This isn't actually used in timing anywhere. */
+  if(verbose){
     int x;
-    int current=100;
-    int histogram[10000];
-    int latency[current];
-    int retry;
-    offset = (lastsector - firstsector - current)*2/3 + firstsector;
+    int current=300;
+    int acc=0;
+    int prev=0;
 
-    for(retry=0;retry<max_retries;retry++){
-      int acc=0;
-      int prev=0;
+    offset = firstsector;
 
-      if(retry){
-	offset-=current+1;
-	offset-=offset/32;
-      }
-      if(offset<firstsector)break;
-      
-      memset(histogram,0,sizeof(histogram));
-      if((ret=cdda_read(d,NULL,offset+current+1,1))<0){
-	/* media error! grr!  retry elsewhere */
-	reportC("\n\tWARNING: media error; picking new location and trying again.");
-	continue;
-      }
+    if((ret=cdda_read(d,NULL,offset+current+1,1))<0){
+      /* media error! grr!  retry elsewhere */
+      reportC("\n\tWARNING: media error; picking new location and trying again.");
+      continue;
+    }
 
       reportC("\n\tSector timings (ms):\n\t");
 
@@ -280,3 +270,4 @@
   return 0;
 }
 
+

Modified: trunk/cdparanoia/main.c
===================================================================
--- trunk/cdparanoia/main.c	2008-08-25 02:31:54 UTC (rev 15199)
+++ trunk/cdparanoia/main.c	2008-08-25 20:39:42 UTC (rev 15200)
@@ -773,6 +773,7 @@
       break;
     case 'U':
       run_cache_test=1;
+      query_only=1;
       break;
     case 'z':
       if (optarg) {