Changeset 9119

Timestamp:

11/03/11 15:13:36 (20 months ago)

Author:

jdenton

Message:

Added #include of usrint.h to the beginning of ucache.c to include the top
level includes.

Changed ucache_close_file to call an internal remove_file routine.

Location:

branches/Orange-Branch/src/client/usrint

Files:

• iocommon.c (modified) (1 diff)
• ucache.c (modified) (19 diffs)
• ucache.h (modified) (3 diffs)

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

@@ -1060 +1060 @@
     int i; /* index used for 'for loops' */
     int req_blk_cnt = 0; /* how many blocks request encompasses */
-    int req_size; /* how many bytes request spans */
+    int req_size = 0; /* how many bytes request spans */
     uint32_t blk_size = CACHE_BLOCK_SIZE_K * 1024;
     uint64_t remainder = 0; /* used to determine if offset is byte alligned */

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

@@ -8 +8 @@
  * Currently under development...
  */
-
+#include <usrint.h> /* to get PVFS_UCACHE_ENABLE */
 #if PVFS_UCACHE_ENABLE
 #include <ucache.h>
-//#define LOCATE_MAX_ENABLED 1
-//#define FILE_SYSTEM_ENABLED 1
+
+//#define FILE_SYSTEM_ENABLED 
 
 /* Global Variables */
@@ -18 +18 @@
 
 union user_cache_u *ucache = 0;
-//static uint32_t ucache_blk_cnt = 0;
+/* static uint32_t ucache_blk_cnt = 0; */
 
 ucache_lock_t *ucache_locks = 0; /* will refer to the shmem of all ucache locks */
@@ -90 +90 @@
 
 /* File and Memory Entry Removal */
-/* static int remove_file(struct file_ent_s *fent); */
+static int remove_file(struct file_ent_s *fent);
 static int wipe_mtbl(struct mem_table_s *mtbl);
 static int remove_mem(struct file_ent_s *fent, uint64_t offset);
@@ -171 +171 @@
 struct mem_table_s *get_mtbl(uint16_t mtbl_blk, uint16_t mtbl_ent)
 {
-    return &(ucache->b[mtbl_blk].mtbl[mtbl_ent]);
+    if( mtbl_blk >= 0 && 
+        mtbl_blk < BLOCKS_IN_CACHE &&
+        mtbl_ent >= 0 && 
+        mtbl_ent < MEM_TABLE_ENTRY_COUNT)
+    {
+        return &(ucache->b[mtbl_blk].mtbl[mtbl_ent]);
+    }
+    else
+    {
+        return (struct mem_table_s *)NILP;
+    }
 }
 
@@ -479 +489 @@
     int rc = 0;
     lock_lock(ucache_lock);
-
-    struct mem_table_s *mtbl = get_mtbl(fent->mtbl_blk,
-                                       fent->mtbl_ent);
-
-    /* Flush file blocks before file removal */
-    mtbl->ref_cnt--;
-    if(mtbl->ref_cnt == 0)
-    {
-        /* Flush dirty blocks before file removal from cache */
-        rc = flush_file(fent);
-        if(rc == -1)
-        {
-            goto done;
-        }
-    }
-
-    /* Instead of removing individually, since memory entries are already 
-     * flushed, just wipe the mtbl 
-     */
-    rc = wipe_mtbl(mtbl);
-    if(rc == -1)
-    {
-        /* Couldn't remove entries */
-        goto done;
-    }
-
-    rc = put_free_mtbl(mtbl, fent);
-    if(rc == -1)
-    {
-        goto done;
-    }
-
-    put_free_fent(fent);
-    if(rc == -1)
-    {
-        goto done;
-    }
-
-    rc = 0;
-
-done:
+    rc = remove_file(fent);
     lock_unlock(ucache_lock);
     return rc;
@@ -642 +612 @@
                         current_fent = ftbl->file[current_fent].next)
     {
-        //fprintf(out, "free file entry: index = %d\n", (int16_t)current_fent);
+        fprintf(out, "free file entry: index = %d\n", (int16_t)current_fent);
     }
     fprintf(out, "End of Free File Entry List\n\n");
@@ -671 +641 @@
 
                 fprintf(out, "\tMTBL LRU List ****************\n");
-                //print_LRU(mtbl);
-                //print_Dirty(mtbl);
+                /* print_LRU(mtbl); */
+                /* print_Dirty(mtbl); */
 
                 fprintf(out, "\tMTBL INFO ********************\n");
@@ -790 +760 @@
     return sem_post(lock);
     #elif LOCK_TYPE == 1
-    //printf("lock size = %d\n", sizeof(*lock));
+    /* printf("lock size = %d\n", sizeof(*lock)); */
     return pthread_mutex_unlock(lock);
     #elif LOCK_TYPE == 2
@@ -818 +788 @@
     #elif (LOCK_TYPE == 1)
     rc = pthread_mutex_destroy(lock);
-    //printf("rc = %d\terrno = %d\n", rc, errno);
     #elif (LOCK_TYPE == 2)
     rc = pthread_spin_destroy(lock);
@@ -844 +813 @@
     #elif (LOCK_TYPE == 1)
     rc = pthread_mutex_trylock(lock);
-    //printf("rc = %d\n", rc);
     if( rc != 0)
     {
@@ -860 +828 @@
         /* Unlock before leaving if lock wasn't already set */
         rc = lock_unlock(lock);
-        //printf("OK - UNLOCKED!\n");
-    }
-    else
-    {
-        //printf("BLOCK WAS LOCKED!\n");
     }
     return rc;
@@ -1377 +1340 @@
  * Returns NIL if file is referenced or if the file could not be located.
  */
-/*
 static int remove_file(struct file_ent_s *fent)
 {
     if(DBG)fprintf(out, "trying to remove file...\n");
-
-
-    uint16_t file_mtbl_blk = NIL16;
-    uint16_t file_mtbl_ent = NIL16;
-    uint16_t file_ent_index = NIL16;
-    uint16_t file_ent_prev_index = NIL16;
-
-    struct file_table_s *ftbl = &(ucache->ftbl);
-
-    //Lookup File
-    struct mem_table_s *mtbl = lookup_file(
-        fent->tag_id,
-        fent->tag_handle,
-        &file_mtbl_blk,    //The rest can be NULL if not desired
-        &file_mtbl_ent,
-        &file_ent_index,
-        &file_ent_prev_index
-    );
- 
-    //Remove the file completely
-    //Verify we've recieved the necessary info
-    if((fent->mtbl_blk == NIL16) || (fent->mtbl_ent == NIL16))
-    {
-        if(DBG)fprintf(out, "\tremoval failure: no mtbl matching file\n");
-        return NIL;
-    }
-    //Free the mtbl
-    put_free_mtbl(mtbl, fent);
-
-    //Free the file entry
-    ftbl->file[file_ent_prev_index].next = fent->next;
+    
+    int rc = 0;
+    struct mem_table_s *mtbl = get_mtbl(fent->mtbl_blk,
+                                       fent->mtbl_ent);
+
+    if(mtbl == (struct mem_table_s *)NILP)
+    {
+        return -1;
+    }
+
+    /* Flush file blocks before file removal */
+    mtbl->ref_cnt--;
+    if(mtbl->ref_cnt == 0)
+    {
+        /* Flush dirty blocks before file removal from cache */
+        rc = flush_file(fent);
+        if(rc == -1)
+        {
+            return rc;
+        }
+    }
+
+    /* Instead of removing individually, since memory entries are already 
+     * flushed, just wipe the mtbl 
+     */
+    rc = wipe_mtbl(mtbl);
+    if(rc == -1)
+    {
+        /* Couldn't remove entries */
+        return rc;
+    }
+
+    rc = put_free_mtbl(mtbl, fent);
+    if(rc == -1)
+    {
+        return rc;
+    }
+
     put_free_fent(fent);
-
-    if(DBG)fprintf(out, "\tremoval sucessful\n");
-
-    return(1);
-}
-*/
+    if(rc == -1)
+    {
+        return rc;
+    }
+
+    /* Success */
+    rc = 0;
+    return rc;
+}
 
 /** Lookup the memory location of a block of data in cache that is identified 
@@ -1581 +1553 @@
         mtbl->lru_first = index;
     }
-    //print_LRU(mtbl);
+    /* print_LRU(mtbl); */
 }    
 
@@ -1600 +1572 @@
     for(i = 0; i < FILE_TABLE_HASH_MAX; i++)
     {
-//        if(DBG)fprintf(out, "\texamining ftbl index %hu\n", i);
+        /* if(DBG)fprintf(out, "\texamining ftbl index %hu\n", i); */
         /* Iterate over hash table chain */
         uint16_t j;
@@ -1606 +1578 @@
         {
             struct file_ent_s *current_fent = &(ftbl->file[j]);
-//            if(DBG)fprintf(out, "\t(blk, ent)=(%hu, %hu)\n", current_fent->mtbl_blk,
-//                                                            current_fent->mtbl_ent);
-            //TODO: this might can be removed: test it
+            /*
+            if(DBG)fprintf(out, "\t(blk, ent)=(%hu, %hu)\n", current_fent->mtbl_blk,
+                                                            current_fent->mtbl_ent);
+             */
             if((current_fent->mtbl_blk == NIL16) || 
                     (current_fent->mtbl_ent == NIL16))
@@ -1622 +1595 @@
             if(current_mtbl->num_blocks >= value_of_max)
             {
-//                if(DBG)fprintf(out, "\tmax updated @ %d\n", j);
+                /* if(DBG)fprintf(out, "\tmax updated @ %d\n", j); */
                 *fent = current_fent; /* Set the parameter to this mtbl */
                 index_of_max_blk = current_fent->mtbl_blk;
@@ -1711 +1684 @@
             if(DBG)fprintf(out, "\tget_free_blk returned NIL, evicting a block "
                   "from max mtbl which has %hu entries\n", max_mtbl->num_blocks);
-            //print_LRU(max_mtbl);
+            /* print_LRU(max_mtbl); */
             evict_LRU(max_fent);
             free_blk = get_free_blk();
@@ -1725 +1698 @@
             mtbl->num_blocks++;
             update_LRU(mtbl, index);
-            //print_LRU(mtbl);
+            /* print_LRU(mtbl); */
             if(DBG)fprintf(out, "\tsuccessfully inserted memory entry @ blk: "
                                                   "%hu\n", free_blk);
@@ -1783 +1756 @@
             if(DBG)fprintf(out, "\tno ment\n");
             evict_rc = evict_LRU(fent);
-            //print_LRU(mtbl);
+            /* print_LRU(mtbl); */
             assert(evict_rc != 0);
             mentIndex = get_free_ment(mtbl);

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

@@ -6 +6 @@
 
 #ifndef UCACHE_H
-#define UCACHE_H
-
-//#define UCACHE_ENABLED
-#define UCACHE_LOCKING_ENABLED
+#define UCACHE_H 1
 
 #include <stdio.h>
@@ -16 +13 @@
 #include <pthread.h>
 #include <sys/shm.h>
-#include <usrint.h>
 
 #define MEM_TABLE_ENTRY_COUNT 818
@@ -45 +41 @@
 #define NIL32 0XFFFFFFFF
 #define NIL64 0XFFFFFFFFFFFFFFFF
+#if (PVFS2_SIZEOF_VOIDP == 32)
+#define NILP NIL32
+#elif (PVFS2_SIZEOF_VOIDP == 64)
+#define NILP NIL64
+#endif
+
 
 #ifndef DBG