DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

+print

Browse Source
This commit is contained in:
jl777
2019-04-11 23:20:08 -11:00
parent 73ce7cda24
commit 6d134de514
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/komodo_gateway.h
View File

@@ -2628,7 +2628,7 @@ void komodo_pricesinit()
void komodo_pricesupdate(int32_t height,CBlock *pblock) void komodo_pricesupdate(int32_t height,CBlock *pblock)
{ {
static int numprices; static uint32_t *ptr32; static int64_t *ptr64,*tmpbuf; static int numprices; static uint32_t *ptr32; static int64_t *ptr64,*tmpbuf;
int32_t ind,offset,width; int64_t correlated,smoothed; uint64_t seed,rngval; uint32_t rawprices[KOMODO_MAXPRICES],buf[4]; int32_t ind,offset,width; int64_t correlated,smoothed; uint64_t seed,rngval; uint32_t rawprices[KOMODO_MAXPRICES],buf[PRICES_MAXDATAPOINTS*2];
width = PRICES_DAYWINDOW;//(2*PRICES_DAYWINDOW + PRICES_SMOOTHWIDTH); width = PRICES_DAYWINDOW;//(2*PRICES_DAYWINDOW + PRICES_SMOOTHWIDTH);
if ( numprices == 0 ) if ( numprices == 0 )
{ {
@@ -2662,6 +2662,7 @@ void komodo_pricesupdate(int32_t height,CBlock *pblock)
if ( (correlated= komodo_pricecorrelated(rngval,ind,&ptr32[offset],-numprices,0,PRICES_SMOOTHWIDTH)) > 0 ) if ( (correlated= komodo_pricecorrelated(rngval,ind,&ptr32[offset],-numprices,0,PRICES_SMOOTHWIDTH)) > 0 )
{ {
fseek(PRICES[ind].fp,height * sizeof(int64_t) * PRICES_MAXDATAPOINTS,SEEK_SET); fseek(PRICES[ind].fp,height * sizeof(int64_t) * PRICES_MAXDATAPOINTS,SEEK_SET);
memset(buf,0,sizeof(buf));
buf[0] = rawprices[ind]; buf[0] = rawprices[ind];
buf[1] = rawprices[0]; // timestamp buf[1] = rawprices[0]; // timestamp
memcpy(&buf[2],&correlated,sizeof(correlated)); memcpy(&buf[2],&correlated,sizeof(correlated));
@@ -2670,7 +2671,7 @@ void komodo_pricesupdate(int32_t height,CBlock *pblock)
else if ( height > PRICES_DAYWINDOW*2 ) else if ( height > PRICES_DAYWINDOW*2 )
{ {
fseek(PRICES[ind].fp,(height-PRICES_DAYWINDOW+1) * PRICES_MAXDATAPOINTS * sizeof(int64_t),SEEK_SET); fseek(PRICES[ind].fp,(height-PRICES_DAYWINDOW+1) * PRICES_MAXDATAPOINTS * sizeof(int64_t),SEEK_SET);
if ( fread(ptr64,sizeof(int64_t),(PRICES_DAYWINDOW-1)*PRICES_MAXDATAPOINTS+2,PRICES[ind].fp) == (PRICES_DAYWINDOW-1)*PRICES_MAXDATAPOINTS+2 ) if ( fread(ptr64,sizeof(int64_t),PRICES_DAYWINDOW*PRICES_MAXDATAPOINTS,PRICES[ind].fp) == PRICES_DAYWINDOW*PRICES_MAXDATAPOINTS )
{ {
if ( (smoothed= komodo_priceave(tmpbuf,&ptr64[(PRICES_DAYWINDOW-1)*PRICES_MAXDATAPOINTS+1],-PRICES_MAXDATAPOINTS)) > 0 ) if ( (smoothed= komodo_priceave(tmpbuf,&ptr64[(PRICES_DAYWINDOW-1)*PRICES_MAXDATAPOINTS+1],-PRICES_MAXDATAPOINTS)) > 0 )
{ {
@@ -2687,7 +2688,7 @@ void komodo_pricesupdate(int32_t height,CBlock *pblock)
} else fprintf(stderr,"error reading rawprices for ht.%d\n",height); } else fprintf(stderr,"error reading rawprices for ht.%d\n",height);
} else fprintf(stderr,"height.%d <= width.%d\n",height,width); } else fprintf(stderr,"height.%d <= width.%d\n",height,width);
} else fprintf(stderr,"null PRICES[0].fp\n"); } else fprintf(stderr,"null PRICES[0].fp\n");
} else fprintf(stderr,"numprices mismatch\n"); } else fprintf(stderr,"numprices mismatch, height.%d\n",height);
} }

11
src/scheduler.cpp
View File

@@ -31,6 +31,17 @@ CScheduler::CScheduler() : nThreadsServicingQueue(0), stopRequested(false), stop
CScheduler::~CScheduler() CScheduler::~CScheduler()
{ {
int32_t i;
if ( nThreadsServicingQueue != 0 )
{
for (i=0; i<10; i++)
{
MilliSleep(1000);
fprintf(stderr,"CScheduler nThreadsServicingQueue.%d\n",(int32_t)nThreadsServicingQueue);
if ( nThreadsServicingQueue == 0 )
break;
}
}
assert(nThreadsServicingQueue == 0); assert(nThreadsServicingQueue == 0);
} }