test

iguana/iguana_unspents.c

@@ -592,7 +592,7 @@ struct iguana_txid *iguana_txidfind(struct iguana_info *coin,int32_t *heightp,st
             {
                 if ( (TXbits= ramchain->txbits) == 0 )
                 {
-                    if ( coin->PREFETCHLAG >= 0 )
+                    if ( coin->PREFETCHLAG >= 0 && coin->fastfind == 0 )
                         iguana_alloctxbits(coin,ramchain);
                     if ( (TXbits= ramchain->txbits) == 0 )
                     {
@@ -602,7 +602,7 @@ struct iguana_txid *iguana_txidfind(struct iguana_info *coin,int32_t *heightp,st
                 }
                 if ( (T= ramchain->cacheT) == 0 )
                 {
-                    if ( coin->PREFETCHLAG >= 0 )
+                    if ( coin->PREFETCHLAG >= 0 && coin->fastfind == 0 )
                         iguana_alloccacheT(coin,ramchain);
                     if ( (T= ramchain->cacheT) == 0 )
                         T = (void *)(long)((long)ramchain->H.data + ramchain->H.data->Toffset);
@@ -761,7 +761,7 @@ int32_t iguana_txidfastfind(struct iguana_info *coin,int32_t *heightp,bits256 tx
                     {
                         memcpy(&firstvout,&item[sizeof(uint64_t)],sizeof(firstvout));
                         memcpy(heightp,&item[sizeof(uint64_t) + sizeof(firstvout)],sizeof(*heightp));
-                        //printf("i.%d val.%d height.%d firstvout.%d j.%d\n",i,val,*heightp,firstvout,j);
+                        printf("i.%d val.%d height.%d firstvout.%d j.%d\n",i,val,*heightp,firstvout,j);
                         return(firstvout);
                     }
                     else if ( 0 )
@@ -822,25 +822,45 @@ static int _bits256_cmp(const void *a,const void *b)
 
 uint32_t iguana_fastfindinit(struct iguana_info *coin)
 {
-    int32_t i,j,iter; char fname[1024];
+    int32_t i,j,iter,num,tablesize,*hashtable; uint8_t *sorted; char fname[1024];
-    for (iter=0; iter<2; iter++)
+    for (iter=1; iter<2; iter++)
     {
         for (i=0; i<0x100; i++)
         {
             sprintf(fname,"DB/%s%s/fastfind/%02x.all",iter==0?"ro/":"",coin->symbol,i), OS_compatible_path(fname);
             if ( (coin->fast[i]= OS_mapfile(fname,&coin->fastsizes[i],0)) == 0 )
+                break;
+            else
             {
-                for (j=0; j<i; j++)
+                sorted = coin->fast[i];
-                    munmap(coin->fast[i],coin->fastsizes[i]);
+                memcpy(&num,sorted,sizeof(num));
+                memcpy(&tablesize,&sorted[sizeof(num)],sizeof(tablesize));
+                if ( (num+1)*16 + tablesize*sizeof(*hashtable) == coin->fastsizes[i] )
+                {
+                    hashtable = (int32_t *)((long)sorted + (1 + num)*16);
+                }
+                else
+                {
+                    printf("size error num.%d tablesize.%d -> %lu vs %ld\n",num,tablesize,(num+1)*16 + tablesize*sizeof(*hashtable),coin->fastsizes[i]);
                     break;
                 }
             }
+        }
         if ( i == 0x100 )
         {
             coin->fastfind = (uint32_t)time(NULL);
             printf("initialized fastfind.%s iter.%d\n",coin->symbol,iter);
             return(coin->fastfind);
         }
+        else
+        {
+            for (j=0; j<i; j++)
+            {
+                munmap(coin->fast[i],coin->fastsizes[i]);
+                coin->fast[i] = 0;
+                coin->fastsizes[i] = 0;
+            }
+        }
     }
     return(0);
 }

iguana/main.c

@@ -434,7 +434,7 @@ void mainloop(struct supernet_info *myinfo)
                             n = coin->bundlescount-1;
                             if ( iguana_emitfinished(coin,1) >= n )
                             {
-                                if ( coin->PREFETCHLAG >= 0 )
+                                if ( coin->PREFETCHLAG >= 0 && coin->fastfind == 0 )
                                 {
                                     for (j=0; j<n; j++)
                                         iguana_alloctxbits(coin,&coin->bundles[j]->ramchain);