Changeset 182 for trunk/include

Timestamp:

03/17/10 02:41:17 (15 years ago)

Author:

tim

Message:

redesigned regfi logging API to utilize thread-local storage

File:

• trunk/include/regfi.h (modified) (6 diffs)

trunk/include/regfi.h

@@ -81 +81 @@
 
 /* regfi library error message types */
-#define REGFI_MSG_INFO  0x0001
-#define REGFI_MSG_WARN  0x0004
-#define REGFI_MSG_ERROR 0x0010
+#define REGFI_LOG_INFO  0x0001
+#define REGFI_LOG_WARN  0x0004
+#define REGFI_LOG_ERROR 0x0010
+
+/* For internal use */
+pthread_key_t REGFI_LOG_KEY;
 
 typedef uint8_t REGFI_ENCODING;
@@ -240 +243 @@
 
 
+typedef struct _regfi_log
+{
+  /* Error/warning/info messages returned by lower layer functions */
+  char* messages;
+
+  /* Mask for error message types that will be stored. */
+  uint16_t msg_mask;
+
+} REGFI_LOG;
+
+
 /** HBIN block information
  * @ingroup regfiMiddleLayer
@@ -695 +709 @@
   pthread_mutex_t* sk_lock;
 
-  /* Error/warning/info messages returned by lower layer functions */
-  char* last_message;
-
-  /* Mask for error message types that will be stored. */
-  uint16_t msg_mask;
-
-
   /* Data parsed from file header */
   /********************************/
@@ -849 +856 @@
 
 
+/** Enables regfi library logging for the current thread.
+ *
+ * XXX: finish documenting
+ *
+ * @ingroup regfiBase
+ */
+void regfi_log_start(uint16_t mask);
+
+
 /** Get errors, warnings, and/or verbose information relating to processing of
  *  the given registry file.
  *
- * @param file the structure for the registry file
- *
  * @return A newly allocated char* which must be free()d by the caller.
  *
  * @ingroup regfiBase
  */
-char*                 regfi_get_messages(REGFI_FILE* file);
+char* regfi_log_get_str();
 
 
@@ -865 +879 @@
  *
  * This may be called at any time and will take effect immediately.
- *
- * @param file   the structure for the registry file
  *
  * @param mask   an integer representing the types of messages desired.
@@ -883 +895 @@
  * @ingroup regfiBase
  */
-void                  regfi_set_message_mask(REGFI_FILE* file, uint16_t mask);
+void regfi_log_set_mask(uint16_t mask);
+
+
+/** Disables regfi library logging for the current thread.
+ *
+ * XXX: finish documenting
+ *
+ * @ingroup regfiBase
+ */
+void regfi_log_stop();