From bf301bb67f9ad0c9b51e8e592d9fc64c234ef3b9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 27 Oct 2016 10:20:00 -0300 Subject: [PATCH] test --- src/komodo_notary.h | 4 ++-- src/komodo_utils.h | 11 +++++++++-- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/komodo_notary.h b/src/komodo_notary.h index 62b03dfdd..45d2249c8 100644 --- a/src/komodo_notary.h +++ b/src/komodo_notary.h @@ -198,8 +198,8 @@ void komodo_init() if ( didinit == 0 ) { didinit = 1; - iguana_initQ(&DepositsQ,"Deposits"); - iguana_initQ(&PendingsQ,"Pendings"); + iguana_initQ(&DepositsQ,(char *)"Deposits"); + iguana_initQ(&PendingsQ,(char *)"Pendings"); pthread_mutex_init(&komodo_mutex,NULL); decode_hex(NOTARY_PUBKEY33,33,(char *)NOTARY_PUBKEY.c_str()); n = (int32_t)(sizeof(Notaries)/sizeof(*Notaries)); diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 460f5e8bb..08bd5ca38 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1128,6 +1128,13 @@ void myfree(void *_ptr,long allocsize) free(item); } +void free_queueitem(void *itemdata) +{ + struct queueitem *item = (void *)((long)itemdata - sizeof(struct queueitem)); + //printf("freeq item.%p itemdata.%p size.%d\n",item,itemdata,item->allocsize); + _myfree(item->type,item->allocsize,item,item->allocsize); +} + void *mycalloc(uint8_t type,int32_t n,long itemsize) { struct allocitem *item; int64_t allocsize = ((uint64_t)n * itemsize); @@ -1284,7 +1291,7 @@ void iguana_initQ(queue_t *Q,char *name) char *tst,*str = (char *)"need to init each Q when single threaded"; memset(Q,0,sizeof(*Q)); strcpy(Q->name,name); - queue_enqueue(name,Q,queueitem(str),1); - if ( (tst= queue_dequeue(Q,1)) != 0 ) + queue_enqueue(name,Q,(struct queueitem *)queueitem(str),1); + if ( (tst= (char *)queue_dequeue(Q,1)) != 0 ) free_queueitem(tst); }