Initialize hash, change init function name so it doesn't collide with fprobe-ulog's

hash.

git-svn-id: http://svn.planet-lab.org/svn/fprobe-ulog/trunk@16580 8c455092-636d-4788-adf5-e71def0336e8

diff --git a/src/fprobe-ulog.c b/src/fprobe-ulog.c
index c8b5c25..80ff15f 100644 (file)
--- a/src/fprobe-ulog.c
+++ b/src/fprobe-ulog.c
@@ -1627,6 +1627,7 @@ bad_collector:
 
        /* Initialization */
 
+    init_slice_id_hash();
        hash_init(); /* Actually for crc16 only */
        mem_init(sizeof(struct Flow), bulk_quantity, memory_limit);
        for (i = 0; i < 1 << HASH_BITS; i++) pthread_mutex_init(&flows_mutex[i], 0);

diff --git a/src/vserver.h b/src/vserver.h
index 6f59356..79a5704 100644 (file)
--- a/src/vserver.h
+++ b/src/vserver.h
@@ -31,7 +31,7 @@ struct hash_entry {
 
 struct hash_entry slice_id_hash[HASH_SIZE];
 
-void init_hash() {
+void init_slice_id_hash() {
     memset(slice_id_hash, 0, HASH_SIZE);
 }
 void set_hash_entry(unsigned int xid, uint32_t slice_id) {