lukechilds
/
SuperNET
mirror of https://github.com/lukechilds/SuperNET.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

test

dPoW2
jl777 8 years ago
parent
1cf7de9dd0
commit
59beb66cd4
3 changed files with 134 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 79
      iguana/iguana_blocks.c
  2. 24
      iguana/iguana_init.c
  3. 1
      includes/iguana_structs.h

79
iguana/iguana_blocks.c
View File

@ -174,7 +174,9 @@ struct iguana_block *iguana_prevblock(struct iguana_info *coin,struct iguana_blo
void _iguana_blocklink(struct iguana_info *coin,struct iguana_block *prev,struct iguana_block *block)
{
char str[65],str2[65]; struct iguana_block *next;
char str[65],str2[65]; struct iguana_block *next; struct iguana_zblock *znext,*zprev = (void *)prev,*zblock = (void *)block;
if ( coin->chain->zcash != 0 )
{
if ( memcmp(block->RO.prev_block.bytes,prev->RO.hash2.bytes,sizeof(bits256)) != 0 )
{
printf("illegal blocklink mismatched hashes\n");
@ -197,12 +199,37 @@ void _iguana_blocklink(struct iguana_info *coin,struct iguana_block *prev,struct
}
prev->hh.next = block; // could make a linked list of all at same height for multibranch
} else prev->hh.next = block;
printf("link.(%s) -> (%s)\n",bits256_str(str,prev->RO.hash2),bits256_str(str,block->RO.hash2));
}
else
{
if ( memcmp(zblock->RO.prev_block.bytes,zprev->RO.hash2.bytes,sizeof(bits256)) != 0 )
{
printf("illegal blocklink mismatched zhashes\n");
iguana_exit(0,0);
return;
}
zblock->hh.prev = zprev;
if ( (znext= zprev->hh.next) != 0 )
{
if ( znext != zblock )
{
if ( memcmp(znext->RO.prev_block.bytes,zprev->RO.hash2.bytes,sizeof(bits256)) != 0 )
{
printf("illegal blocklink next mismatched hashes\n");
return;
}
if ( memcmp(znext->RO.hash2.bytes,zblock->RO.hash2.bytes,sizeof(bits256)) != 0 )
printf("blocklink collision: %s vs %s\n",bits256_str(str,zblock->RO.hash2),bits256_str(str2,znext->RO.hash2));
else printf("blocklink corruption: identical hashes with diff ptrs %s %p %p\n",bits256_str(str,zblock->RO.hash2),zblock,znext);
}
zprev->hh.next = zblock; // could make a linked list of all at same height for multibranch
} else zprev->hh.next = zblock;
}
}
struct iguana_block *iguana_blockhashset(char *debugstr,struct iguana_info *coin,int32_t height,bits256 hash2,int32_t createflag)
{
struct iguana_block *block,*prev; int32_t size;
struct iguana_block *block=0,*prev; int32_t size; struct iguana_zblock *zblock=0,*zprev;
/*while ( coin->blockdepth > 0 )
{
usleep(100000);
@ -213,8 +240,10 @@ struct iguana_block *iguana_blockhashset(char *debugstr,struct iguana_info *coin
}*/
portable_mutex_lock(&coin->blocks_mutex);
coin->blockdepth++;
HASH_FIND(hh,coin->blocks.hash,&hash2,sizeof(hash2),block);
if ( block != 0 )
if ( coin->chain->zcash != 0 )
HASH_FIND(hh,coin->blocks.zhash,&hash2,sizeof(hash2),zblock);
else HASH_FIND(hh,coin->blocks.hash,&hash2,sizeof(hash2),block);
if ( block != 0 || zblock != 0 )
{
if ( coin->blockdepth > 0 )
coin->blockdepth--;
@ -227,11 +256,13 @@ struct iguana_block *iguana_blockhashset(char *debugstr,struct iguana_info *coin
//printf("%d\n",1/(1 - depth/depth));
}*/
portable_mutex_unlock(&coin->blocks_mutex);
return(block);
return((coin->chain->zcash != 0) ? (struct iguana_block *)zblock : block);
}
if ( createflag > 0 )
{
//portable_mutex_lock(&coin->blocks_mutex);
if ( coin->chain->zcash == 0 )
{
size = (int32_t)((coin->chain->zcash != 0) ? sizeof(struct iguana_zblock) : sizeof(struct iguana_block));
block = calloc(1,size);
block->RO.hash2 = hash2;
@ -246,6 +277,24 @@ struct iguana_block *iguana_blockhashset(char *debugstr,struct iguana_info *coin
if ( prev != 0 )
_iguana_blocklink(coin,prev,block);
}
}
else
{
size = (int32_t)((coin->chain->zcash != 0) ? sizeof(struct iguana_zblock) : sizeof(struct iguana_block));
zblock = calloc(1,size);
zblock->RO.hash2 = hash2;
zblock->RO.allocsize = size;
iguana_blocksizecheck("blockhashset",coin->chain->zcash,(void *)zblock);
zblock->hh.itemind = height, zblock->height = -1;
HASH_ADD(hh,coin->blocks.zhash,RO.hash2,sizeof(hash2),zblock);
zblock->hh.next = zblock->hh.prev = 0;
if ( bits256_nonz(zblock->RO.prev_block) > 0 )
{
HASH_FIND(hh,coin->blocks.hash,&zblock->RO.prev_block,sizeof(zblock->RO.prev_block),zprev);
if ( zprev != 0 )
_iguana_blocklink(coin,(void *)zprev,(void *)zblock);
}
}
//char str[65];
if ( coin->virtualchain != 0 )
{
@ -270,7 +319,7 @@ struct iguana_block *iguana_blockhashset(char *debugstr,struct iguana_info *coin
//fprintf(stderr,">>>>>>>>>> OK only if rare%s create blockhashset.%d depth.%d\n",debugstr,height,depth);
//printf("%d\n",1/(1 - depth/depth));
}*/
return(block);
return((coin->chain->zcash != 0) ? (struct iguana_block *)zblock : block);
}
bits256 *iguana_blockhashptr(struct iguana_info *coin,int32_t height)
@ -308,7 +357,10 @@ struct iguana_block *iguana_blockptr(char *debugstr,struct iguana_info *coin,int
int32_t iguana_blocksizecheck(char *debugstr,uint8_t zcash,struct iguana_block *block)
{
struct iguana_zblock *zblock = (void *)block;
int32_t bsize = zcash != 0 ? sizeof(struct iguana_zblock) : sizeof(struct iguana_block);
if ( zcash == 0 )
{
if ( block->RO.allocsize != bsize )
{
if ( block->RO.allocsize == 0 || block->RO.allocsize < bsize )
@ -318,6 +370,19 @@ int32_t iguana_blocksizecheck(char *debugstr,uint8_t zcash,struct iguana_block *
} else return(-1);
return(bsize);
}
}
else
{
if ( zblock->RO.allocsize != bsize )
{
if ( zblock->RO.allocsize == 0 || zblock->RO.allocsize < bsize )
{
//printf("%s block validate warning: mismatched size %d vs %d\n",debugstr,block->RO.allocsize,bsize);
zblock->RO.allocsize = bsize;
} else return(-1);
return(bsize);
}
}
return(0);
}

24
iguana/iguana_init.c
View File

@ -439,6 +439,9 @@ void iguana_bundlepurge(struct iguana_info *coin,struct iguana_bundle *bp)
}
void iguana_blockpurge(struct iguana_info *coin,struct iguana_block *block)
{
struct iguana_zblock *zblock = (void *)block;
if ( coin->chain->zcash == 0 )
{
if ( block->req != 0 )
{
@ -447,10 +450,20 @@ void iguana_blockpurge(struct iguana_info *coin,struct iguana_block *block)
}
free(block);
}
else
{
if ( zblock->req != 0 )
{
printf("purge req inside zblock\n");
myfree(zblock->req,zblock->req->allocsize);
}
free(zblock);
}
}
void iguana_blockspurge(struct iguana_info *coin)
{
struct iguana_block *block,*tmp;
struct iguana_block *block,*tmp; struct iguana_zblock *zblock,*ztmp;
if ( 1 && coin->blocks.hash != 0 )
{
HASH_ITER(hh,coin->blocks.hash,block,tmp)
@ -460,6 +473,15 @@ void iguana_blockspurge(struct iguana_info *coin)
}
coin->blocks.hash = 0;
}
if ( 1 && coin->blocks.zhash != 0 )
{
HASH_ITER(hh,coin->blocks.zhash,zblock,ztmp)
{
HASH_DEL(coin->blocks.zhash,zblock);
iguana_blockpurge(coin,(void *)zblock);
}
coin->blocks.zhash = 0;
}
/*if ( coin->blocks.RO != 0 )
{
printf("deprecated coin->blocks.RO used??\n");

1
includes/iguana_structs.h
View File

@ -254,6 +254,7 @@ struct iguana_blocks
{
char coin[8];
struct iguanakv *db;
struct iguana_zblock *zhash;
struct iguana_block *hash; //struct iguana_blockRO *RO; int32_t maxbits;
int32_t maxblocks,initblocks,hashblocks,pending,issuedblocks,recvblocks,emitblocks,parsedblocks,dirty;
struct iguana_zblock hwmchain,prev,prev2;

Write Preview
Loading…
Cancel
Save