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

test

etomic
jl777 8 years ago
parent
b61d1e9d66
commit
1a667898c5
2 changed files with 11 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      basilisk/basilisk_DEX.c
  2. 7
      basilisk/basilisk_swap.c

9
basilisk/basilisk_DEX.c
View File

@ -34,7 +34,7 @@ int32_t basilisk_ping_processDEX(struct supernet_info *myinfo,uint32_t senderipb
if ( relay->numrequests < relay->maxrequests ) if ( relay->numrequests < relay->maxrequests )
{ {
memcpy(serialized,&data[len],clen); memcpy(serialized,&data[len],clen);
//printf("ping processDEX\n"); printf("ping processDEX\n");
n = basilisk_rwDEXquote(0,serialized,&R); n = basilisk_rwDEXquote(0,serialized,&R);
if ( n != clen ) if ( n != clen )
printf("n.%d clen.%d\n",n,clen); printf("n.%d clen.%d\n",n,clen);
@ -126,6 +126,7 @@ int32_t basilisk_rwDEXquote(int32_t rwflag,uint8_t *serialized,struct basilisk_r
uint32_t basilisk_request_enqueue(struct supernet_info *myinfo,struct basilisk_request *rp) uint32_t basilisk_request_enqueue(struct supernet_info *myinfo,struct basilisk_request *rp)
{ {
uint8_t serialized[256]; int32_t len; struct queueitem *item; uint8_t serialized[256]; int32_t len; struct queueitem *item;
printf("basilisk_request_enqueue\n");
len = basilisk_rwDEXquote(1,serialized+1,rp); len = basilisk_rwDEXquote(1,serialized+1,rp);
if ( (item= calloc(1,sizeof(*item) + len + 1)) != 0 ) if ( (item= calloc(1,sizeof(*item) + len + 1)) != 0 )
{ {
@ -254,7 +255,7 @@ char *basilisk_start(struct supernet_info *myinfo,struct basilisk_request *_rp,u
void basilisk_requests_poll(struct supernet_info *myinfo) void basilisk_requests_poll(struct supernet_info *myinfo)
{ {
static uint32_t lastpoll; static uint32_t lastpoll;
char *retstr; uint8_t data[32768],buf[4096],key[BASILISK_KEYSIZE]; cJSON *outerarray,*retjson; uint32_t msgid,crcs[2],crc,channel; int32_t datalen,i,n,keylen,numiters; struct basilisk_request issueR; double hwm = 0.; char *retstr; uint8_t data[32768],buf[4096]; cJSON *outerarray,*retjson; uint32_t msgid,crcs[2],crc,channel; int32_t datalen,i,n,numiters; struct basilisk_request issueR; double hwm = 0.;
if ( time(NULL) < lastpoll+3 ) if ( time(NULL) < lastpoll+3 )
return; return;
lastpoll = (uint32_t)time(NULL); lastpoll = (uint32_t)time(NULL);
@ -283,12 +284,12 @@ void basilisk_requests_poll(struct supernet_info *myinfo)
// printf("%02x",((uint8_t *)&issueR)[i]); // printf("%02x",((uint8_t *)&issueR)[i]);
//printf("\n"); //printf("\n");
myinfo->DEXaccept = issueR; myinfo->DEXaccept = issueR;
issueR.quoteid = basilisk_quoteid(&issueR); /*issueR.quoteid = basilisk_quoteid(&issueR);
datalen = basilisk_rwDEXquote(1,data,&issueR); datalen = basilisk_rwDEXquote(1,data,&issueR);
msgid = (uint32_t)time(NULL); msgid = (uint32_t)time(NULL);
keylen = basilisk_messagekey(key,0,msgid,issueR.srchash,issueR.desthash); keylen = basilisk_messagekey(key,0,msgid,issueR.srchash,issueR.desthash);
if ( (retstr= basilisk_respond_addmessage(myinfo,key,keylen,data,datalen,0,BASILISK_DEXDURATION)) != 0 ) if ( (retstr= basilisk_respond_addmessage(myinfo,key,keylen,data,datalen,0,BASILISK_DEXDURATION)) != 0 )
free(retstr); free(retstr);*/
if ( bits256_cmp(myinfo->myaddr.persistent,issueR.srchash) == 0 ) // my request if ( bits256_cmp(myinfo->myaddr.persistent,issueR.srchash) == 0 ) // my request
{ {
printf("my req hwm %f\n",hwm); printf("my req hwm %f\n",hwm);

7
basilisk/basilisk_swap.c
View File

@ -1842,6 +1842,9 @@ void basilisk_swaploop(void *_swap)
struct basilisk_swap *basilisk_thread_start(struct supernet_info *myinfo,struct basilisk_request *rp,uint32_t statebits,int32_t optionduration) struct basilisk_swap *basilisk_thread_start(struct supernet_info *myinfo,struct basilisk_request *rp,uint32_t statebits,int32_t optionduration)
{ {
int32_t i,m,n; uint32_t channel,starttime; cJSON *retarray,*item,*msgobj; struct basilisk_swap *swap = 0; int32_t i,m,n; uint32_t channel,starttime; cJSON *retarray,*item,*msgobj; struct basilisk_swap *swap = 0;
for (i=0; i<sizeof(*rp); i++)
printf("%02x",((uint8_t *)rp)[i]);
printf(" thread start\n");
portable_mutex_lock(&myinfo->DEX_swapmutex); portable_mutex_lock(&myinfo->DEX_swapmutex);
for (i=0; i<myinfo->numswaps; i++) for (i=0; i<myinfo->numswaps; i++)
if ( myinfo->swaps[i]->I.req.requestid == rp->requestid ) if ( myinfo->swaps[i]->I.req.requestid == rp->requestid )
@ -1886,7 +1889,9 @@ struct basilisk_swap *basilisk_thread_start(struct supernet_info *myinfo,struct
} }
if ( statebits != 0 || m > n/2 ) if ( statebits != 0 || m > n/2 )
{ {
fprintf(stderr,"m.%d n.%d launch.%d %d\n",m,n,myinfo->numswaps,(int32_t)(sizeof(myinfo->swaps)/sizeof(*myinfo->swaps))); for (i=0; i<sizeof(swap->I.req); i++)
printf("%02x",((uint8_t *)&swap->I.req)[i]);
fprintf(stderr," m.%d n.%d launch.%d %d\n",m,n,myinfo->numswaps,(int32_t)(sizeof(myinfo->swaps)/sizeof(*myinfo->swaps)));
if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)basilisk_swaploop,(void *)swap) != 0 ) if ( OS_thread_create(malloc(sizeof(pthread_t)),NULL,(void *)basilisk_swaploop,(void *)swap) != 0 )
{ {

Write Preview
Loading…
Cancel
Save