Changeset 186 for trunk

Timestamp:

04/19/10 17:55:26 (14 years ago)

Author:

tim

Message:

minor changes based on suggestions from Michael Cohen

Location:

trunk

Files:

• include/regfi.h (modified) (3 diffs)
• lib/regfi.c (modified) (55 diffs)
• src/common.c (modified) (1 diff)

trunk/include/regfi.h

@@ -716 +716 @@
    * the file offset while another thread is in the middle of a multi-read
    * parsing transaction */
-  pthread_mutex_t* cb_lock;
+  pthread_mutex_t cb_lock;
 
   /* For sanity checking (not part of the registry header) */
@@ -725 +725 @@
 
   /* Multiple read access allowed, write access is exclusive */
-  pthread_rwlock_t* hbins_lock;
+  pthread_rwlock_t hbins_lock;
 
   /* SK record cached since they're repeatedly reused */
@@ -731 +731 @@
 
   /* Need exclusive access for LRUs, since lookups make changes */
-  pthread_mutex_t* sk_lock;
+  pthread_mutex_t sk_lock;
 
   /* Data parsed from file header */

trunk/lib/regfi.c

@@ -806 +806 @@
   bool recursive_type;
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_subkeylist"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_subkeylist"))
      goto fail;
 
@@ -882 +882 @@
     goto fail_locked;
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_subkeylist"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_subkeylist"))
      goto fail;
 
@@ -906 +906 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_subkeylist");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_subkeylist");
  fail:
   if(elements != NULL)
@@ -982 +982 @@
   bool unalloc = false;
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_sk"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_sk"))
      goto fail;
 
@@ -1060 +1060 @@
   }
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_sk"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_sk"))
      goto fail;
 
@@ -1076 +1076 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_sk");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_sk");
  fail:
   if(sec_desc_buf != NULL)
@@ -1092 +1092 @@
   bool unalloc;
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_valuelist"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_valuelist"))
      goto fail;
 
@@ -1140 +1140 @@
   }
   
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_valuelist"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_valuelist"))
      goto fail;
 
@@ -1167 +1167 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_valuelist");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_valuelist");
  fail:
   talloc_free(ret_val);
@@ -1423 +1423 @@
     return regfi_parse_sk(file, offset, max_size, strict);
 
-  if(!regfi_lock(file, file->sk_lock, "regfi_load_sk"))
+  if(!regfi_lock(file, &file->sk_lock, "regfi_load_sk"))
     return NULL;
 
@@ -1450 +1450 @@
   }
 
-  if(!regfi_unlock(file, file->sk_lock, "regfi_load_sk"))
+  if(!regfi_unlock(file, &file->sk_lock, "regfi_load_sk"))
   {
     talloc_unlink(NULL, ret_val);
@@ -1475 +1475 @@
   {
 
-    if(!regfi_lock(file, file->cb_lock, "regfi_find_root_nk"))
+    if(!regfi_lock(file, &file->cb_lock, "regfi_find_root_nk"))
       return NULL;
 
@@ -1485 +1485 @@
     }
 
-    if(!regfi_unlock(file, file->cb_lock, "regfi_find_root_nk"))
+    if(!regfi_unlock(file, &file->cb_lock, "regfi_find_root_nk"))
       return NULL;
 
@@ -1539 +1539 @@
 
 
-
+/******************************************************************************
+ ******************************************************************************/
+int regfi_free_cb(void* f)
+{
+  REGFI_FILE* file = (REGFI_FILE*)f;
+
+  pthread_mutex_destroy(&file->cb_lock);
+  pthread_rwlock_destroy(&file->hbins_lock);
+  pthread_mutex_destroy(&file->sk_lock);
+
+  return 0;
+}
+
+
+/******************************************************************************
+ ******************************************************************************/
 REGFI_FILE* regfi_alloc_cb(REGFI_RAW_FILE* file_cb)
 {
@@ -1568 +1583 @@
   rb->file_length = file_length;  
   rb->cb = file_cb;
-  rb->cb_lock = NULL;
-  rb->hbins_lock = NULL;
-  rb->sk_lock = NULL;
-
-  rb->cb_lock = talloc(rb, pthread_mutex_t);
-  if(rb->cb_lock == NULL || pthread_mutex_init(rb->cb_lock, NULL) != 0)
+
+  if(pthread_mutex_init(&rb->cb_lock, NULL) != 0)
   {
     regfi_log_add(REGFI_LOG_ERROR, "Failed to create cb_lock mutex.");
@@ -1579 +1590 @@
   }
 
-  rb->hbins_lock = talloc(rb, pthread_rwlock_t);
-  if(rb->hbins_lock == NULL || pthread_rwlock_init(rb->hbins_lock, NULL) != 0)
+  if(pthread_rwlock_init(&rb->hbins_lock, NULL) != 0)
   {
     regfi_log_add(REGFI_LOG_ERROR, "Failed to create hbins_lock rwlock.");
@@ -1586 +1596 @@
   }
 
-  rb->sk_lock = talloc(rb, pthread_mutex_t);
-  if(rb->sk_lock == NULL || pthread_mutex_init(rb->sk_lock, NULL) != 0)
+  if(pthread_mutex_init(&rb->sk_lock, NULL) != 0)
   {
     regfi_log_add(REGFI_LOG_ERROR, "Failed to create sk_lock mutex.");
@@ -1626 +1635 @@
 
   /* success */
+  talloc_set_destructor(rb, regfi_free_cb);
   return rb;
 
  fail:
-  if(rb->cb_lock != NULL)
-    pthread_mutex_destroy(rb->cb_lock);
-  if(rb->hbins_lock != NULL)
-    pthread_rwlock_destroy(rb->hbins_lock);
-  if(rb->sk_lock != NULL)
-    pthread_mutex_destroy(rb->sk_lock);
+  pthread_mutex_destroy(&rb->cb_lock);
+  pthread_rwlock_destroy(&rb->hbins_lock);
+  pthread_mutex_destroy(&rb->sk_lock);
 
   range_list_free(rb->hbins);
-  talloc_free(rb->cb_lock);
-  talloc_free(rb->hbins_lock);
   talloc_free(rb);
   return NULL;
@@ -1646 +1651 @@
 /******************************************************************************
  ******************************************************************************/
-void regfi_free(REGFI_FILE *file)
-{
-  pthread_mutex_destroy(file->cb_lock);
-  pthread_rwlock_destroy(file->hbins_lock);
-  pthread_mutex_destroy(file->sk_lock);
+void regfi_free(REGFI_FILE* file)
+{
+  /* Callback handles cleanup side effects */
   talloc_free(file);
 }
@@ -1684 +1687 @@
    */
   
-  if(!regfi_read_lock(file, file->hbins_lock, "regfi_rootkey"))
+  if(!regfi_read_lock(file, &file->hbins_lock, "regfi_rootkey"))
     return NULL;
 
@@ -1694 +1697 @@
   }
 
-  if(!regfi_rw_unlock(file, file->hbins_lock, "regfi_rootkey"))
+  if(!regfi_rw_unlock(file, &file->hbins_lock, "regfi_rootkey"))
     return NULL;
 
@@ -2498 +2501 @@
     goto fail;
   
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_hbin"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_hbin"))
     goto fail;
 
@@ -2517 +2520 @@
   }
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_hbin"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_hbin"))
     goto fail;
 
@@ -2562 +2565 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_hbin");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_hbin");
  fail:
   talloc_free(hbin);
@@ -2587 +2590 @@
   }
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_nk"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_nk"))
     goto fail;
 
@@ -2700 +2703 @@
   }
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_nk"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_nk"))
     goto fail;
 
@@ -2706 +2709 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_nk");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_nk");
  fail:
   talloc_free(ret_val);
@@ -2725 +2728 @@
   { goto fail; }
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_classname"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_classname"))
     goto fail;
 
@@ -2775 +2778 @@
   }
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_classname"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_classname"))
     goto fail;
 
@@ -2781 +2784 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_classname");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_classname");
  fail:
   talloc_free(ret_val);
@@ -2802 +2805 @@
     goto fail;
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_nk"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_nk"))
     goto fail;
 
@@ -2887 +2890 @@
     cell_length = REGFI_VK_MIN_LENGTH + 4;
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_nk"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_nk"))
     goto fail;
 
@@ -2900 +2903 @@
   
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_vk");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_vk");
  fail:
   talloc_free(ret_val);
@@ -2952 +2955 @@
     }
     
-    if(!regfi_lock(file, file->cb_lock, "regfi_load_data"))
+    if(!regfi_lock(file, &file->cb_lock, "regfi_load_data"))
       goto fail;
 
@@ -2963 +2966 @@
     }
 
-    if(!regfi_unlock(file, file->cb_lock, "regfi_load_data"))
+    if(!regfi_unlock(file, &file->cb_lock, "regfi_load_data"))
       goto fail;
 
@@ -3013 +3016 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_load_data");
+  regfi_unlock(file, &file->cb_lock, "regfi_load_data");
  fail:
   ret_val.buf = NULL;
@@ -3037 +3040 @@
   ret_val.len = length;
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_data"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_data"))
     goto fail;
 
@@ -3056 +3059 @@
   }
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_data"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_data"))
     goto fail;
 
@@ -3062 +3065 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_data");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_data");
  fail:
   talloc_free(ret_val.buf);
@@ -3123 +3126 @@
   }
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_big_data_header"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_big_data_header"))
     goto fail;
 
@@ -3135 +3138 @@
   }
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_big_data_header"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_big_data_header"))
     goto fail;
 
@@ -3151 +3154 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_big_data_header");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_big_data_header");
  fail:
   talloc_free(ret_val.buf);
@@ -3183 +3186 @@
     goto fail;
 
-  if(!regfi_lock(file, file->cb_lock, "regfi_parse_big_data_indirect"))
+  if(!regfi_lock(file, &file->cb_lock, "regfi_parse_big_data_indirect"))
     goto fail;
 
@@ -3196 +3199 @@
   }
 
-  if(!regfi_unlock(file, file->cb_lock, "regfi_parse_big_data_indirect"))
+  if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_big_data_indirect"))
     goto fail;
 
@@ -3210 +3213 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_big_data_indirect");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_big_data_indirect");
  fail:
   talloc_free(ret_val);
@@ -3244 +3247 @@
   for(i=0; i<num_chunks; i++)
   {
-    if(!regfi_lock(file, file->cb_lock, "regfi_parse_big_data_cells"))
+    if(!regfi_lock(file, &file->cb_lock, "regfi_parse_big_data_cells"))
       goto fail;
 
@@ -3257 +3260 @@
     }
 
-    if(!regfi_unlock(file, file->cb_lock, "regfi_parse_big_data_cells"))
+    if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_big_data_cells"))
       goto fail;
 
@@ -3267 +3270 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_parse_big_data_cells");
+  regfi_unlock(file, &file->cb_lock, "regfi_parse_big_data_cells");
  fail:
   if(ret_val != NULL)
@@ -3361 +3364 @@
     }
 
-    if(!regfi_lock(file, file->cb_lock, "regfi_load_big_data"))
+    if(!regfi_lock(file, &file->cb_lock, "regfi_load_big_data"))
       goto fail;
 
@@ -3382 +3385 @@
     }
 
-    if(!regfi_unlock(file, file->cb_lock, "regfi_load_big_data"))
+    if(!regfi_unlock(file, &file->cb_lock, "regfi_load_big_data"))
       goto fail;
 
@@ -3397 +3400 @@
 
  fail_locked:
-  regfi_unlock(file, file->cb_lock, "regfi_load_big_data");
+  regfi_unlock(file, &file->cb_lock, "regfi_load_big_data");
  fail:
   talloc_free(ret_val.buf);
@@ -3421 +3424 @@
     return NULL;
 
-  if(!regfi_read_lock(file, file->hbins_lock, "regfi_parse_unalloc_cells"))
+  if(!regfi_read_lock(file, &file->hbins_lock, "regfi_parse_unalloc_cells"))
   {
     range_list_free(ret_val);
@@ -3438 +3441 @@
     while(curr_off < hbin->block_size)
     {
-      if(!regfi_lock(file, file->cb_lock, "regfi_parse_unalloc_cells"))
+      if(!regfi_lock(file, &file->cb_lock, "regfi_parse_unalloc_cells"))
         break;
 
@@ -3444 +3447 @@
                            &cell_len, &is_unalloc))
       {
-        regfi_unlock(file, file->cb_lock, "regfi_parse_unalloc_cells");
+        regfi_unlock(file, &file->cb_lock, "regfi_parse_unalloc_cells");
         break;
       }
 
-      if(!regfi_unlock(file, file->cb_lock, "regfi_parse_unalloc_cells"))
+      if(!regfi_unlock(file, &file->cb_lock, "regfi_parse_unalloc_cells"))
         break;
 
@@ -3474 +3477 @@
   }
 
-  if(!regfi_rw_unlock(file, file->hbins_lock, "regfi_parse_unalloc_cells"))
+  if(!regfi_rw_unlock(file, &file->hbins_lock, "regfi_parse_unalloc_cells"))
   {
     range_list_free(ret_val);

trunk/src/common.c

@@ -48 +48 @@
 void bailOut(int code, char* message)
 {
-  fprintf(stderr, message);
+  fprintf(stderr, "%s", message);
   exit(code);
 }