seg_yinzy
/
HashMap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Signed-off-by: icesky <icesky1stm@sina.com>

git-as-svn/v1/master
icesky 2016-07-28 21:18:45 +08:00
parent 124295a653
commit 20337057b6
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
kmaplib/HashMap.c
View File

@ -60,8 +60,6 @@ static void AppLog(char *file, long line, char *level, char *fmtstr, ...)
{ {
va_list ap; va_list ap;
char tmpstr[501]; char tmpstr[501];
char loglevel[11];
FILE *fp;
memset(tmpstr, 0x0, sizeof(tmpstr)); memset(tmpstr, 0x0, sizeof(tmpstr));
@ -70,7 +68,7 @@ static void AppLog(char *file, long line, char *level, char *fmtstr, ...)
vsprintf(tmpstr, fmtstr, ap); vsprintf(tmpstr, fmtstr, ap);
va_end(ap); va_end(ap);
printf("[%s][%s][%03d]", level, file, line); printf("[%s][%s][%03ld]", level, file, line);
printf("[%s]\n", tmpstr); printf("[%s]\n", tmpstr);
return ; return ;
@ -96,9 +94,7 @@ static unsigned int XipHash(char * key);
int XipHashmapPrint( void * hashmap) int XipHashmapPrint( void * hashmap)
{ {
TxipHashmap * map = ( TxipHashmap *)hashmap; TxipHashmap * map = ( TxipHashmap *)hashmap;
HMAPLOG("I", "HashMap:length[%d],size[%d],threshold[%d];分布情况如下:", map->length, map->size, map->threshold);
int i = 0;
int idx = 0; int idx = 0;
TxipHashmapNode * e = NULL; TxipHashmapNode * e = NULL;
@ -107,6 +103,7 @@ int XipHashmapPrint( void * hashmap)
/** 打印日志 **/ /** 打印日志 **/
if( map != NULL) if( map != NULL)
{ {
HMAPLOG("I", "HashMap:length(%d),size(%d),threshold(%d)", map->length, map->size, map->threshold);
for ( idx = 0; idx < map->length; idx++) for ( idx = 0; idx < map->length; idx++)
{ {
for( e = map->table[idx]; e != NULL; ) for( e = map->table[idx]; e != NULL; )
@ -119,6 +116,7 @@ int XipHashmapPrint( void * hashmap)
} }
/** 打印分布情况图 **/ /** 打印分布情况图 **/
int i = 0;
if( map != NULL) if( map != NULL)
{ {
for( idx = 0; idx < map->length; idx++) for( idx = 0; idx < map->length; idx++)
@ -171,11 +169,15 @@ void * XipHashmapInit( int opacity, float factor)
if( opacity <= 1) if( opacity <= 1)
{ {
HMAPLOG("E","初始容量必须大于1!!!"); HMAPLOG("E","初始容量必须大于1!!!");
HMAPFREE(map);
map = NULL;
return NULL; return NULL;
} }
if( factor < 0.00 || factor > 1.00) if( factor < 0.00 || factor > 1.00)
{ {
HMAPLOG("E","加载因子取值区间为[0.00-1.00],但本次加载因子为[%.2f]", factor); HMAPLOG("E","加载因子取值区间为[0.00-1.00],但本次加载因子为[%.2f]", factor);
HMAPFREE(map);
map = NULL;
return NULL; return NULL;
} }
@ -183,6 +185,8 @@ void * XipHashmapInit( int opacity, float factor)
if( map->table == NULL) if( map->table == NULL)
{ {
HMAPLOG("E","创建hash值的T表失败!!!"); HMAPLOG("E","创建hash值的T表失败!!!");
HMAPFREE(map);
map = NULL;
return NULL; return NULL;
} }
@ -205,9 +209,9 @@ void * XipHashmapInit( int opacity, float factor)
int XipHashmapDestory( void * hashmap) int XipHashmapDestory( void * hashmap)
{ {
TxipHashmap * map = (TxipHashmap *) hashmap; TxipHashmap * map = (TxipHashmap *) hashmap;
register unsigned int idx;
TxipHashmapNode * e = NULL; TxipHashmapNode * e = NULL;
TxipHashmapNode * next = NULL; TxipHashmapNode * next = NULL;
register unsigned int idx;
/** 释放hashmap node 内存 **/ /** 释放hashmap node 内存 **/
if( map != NULL) if( map != NULL)
@ -221,11 +225,13 @@ int XipHashmapDestory( void * hashmap)
e = next; e = next;
} }
} }
}
/** 释放hashmap的T表 **/ /** 释放hashmap的T表 **/
HMAPFREE( map->table); HMAPFREE( map->table);
map->table = NULL; map->table = NULL;
}
return 0; return 0;
} }