Changeset 9135

Timestamp:

12/01/11 17:19:35 (19 months ago)

Author:

jdenton

Message:

Fixed bug that was causing inserted files to not be chained in hash table. Chaining works now.
Corrected some compilation warnings.

Location:

branches/Orange-Branch/src/client/usrint

Files:

• ucache.c (modified) (7 diffs)
• ucache.h (modified) (1 diff)

branches/Orange-Branch/src/client/usrint/ucache.c

@@ -181 +181 @@
 inline struct mem_table_s *get_mtbl(uint16_t mtbl_blk, uint16_t mtbl_ent)
 {
-    if( mtbl_blk >= 0 && 
-        mtbl_blk < BLOCKS_IN_CACHE &&
-        mtbl_ent >= 0 && 
+    if( mtbl_blk < BLOCKS_IN_CACHE &&
         mtbl_ent < MEM_TABLE_ENTRY_COUNT)
     {
@@ -206 +204 @@
 int ucache_init_file_table(char forceCreation)
 {
-    printf("file table initialized!\n");
     int i;
 
@@ -285 +282 @@
     {
         uint16_t fentIndex  = insert_file((uint32_t)*fs_id, (uint64_t)*handle);
-        if(fentIndex < 0 || fentIndex > FILE_TABLE_ENTRY_COUNT)
+        if(fentIndex > FILE_TABLE_ENTRY_COUNT)
         {
             rc = -1;
@@ -297 +294 @@
         }
 
+        /*
         printf("%hu\t%hu\n", (*fent)->mtbl_blk, (*fent)->mtbl_ent);
         fflush(stdout);
+        */
 
         mtbl = get_mtbl((*fent)->mtbl_blk, (*fent)->mtbl_ent);
@@ -762 +761 @@
     #elif LOCK_TYPE == 1
     rc = pthread_mutex_init(lock, NULL);
-    rc = pthread_mutex_unlock(lock);
     if(rc != 0)
     {
@@ -949 +947 @@
 static inline int init_memory_entry(struct mem_table_s *mtbl, int16_t index)
 {
-        if(index > MEM_TABLE_ENTRY_COUNT || index == NIL16)
+        if(index > MEM_TABLE_ENTRY_COUNT)
         {
             return -1;
@@ -1298 +1296 @@
     current = &(ftbl->file[index]);
 
-    unsigned char indexOccupied = (current->tag_handle == 0 && current->tag_id == 0);
+    unsigned char indexOccupied = (current->tag_handle != NIL64 && current->tag_id != NIL32);
     //printf("indexOccupied? %c\n", indexOccupied);
 

branches/Orange-Branch/src/client/usrint/ucache.h

@@ -188 +188 @@
 
 /* Lock Routines */
-ucache_lock_t *get_lock(uint16_t block_index);
+inline ucache_lock_t *get_lock(uint16_t block_index);
 int lock_init(ucache_lock_t * lock);
 inline int lock_lock(ucache_lock_t * lock);