Changeset 1104 in MondoRescue

Timestamp:

Feb 7, 2007, 8:00:23 PM (18 years ago)

Author:

Bruno Cornec

Message:

Improvement of the low level library (Usage of LINE and FILE and simplified interfaces using macros)

Location:

branches/stable/mondo/src

Files:

• include/mr_err.h (modified) (1 diff)
• include/mr_mem.h (modified) (1 diff)
• include/mr_msg.h (modified) (1 diff)
• lib/mr_err.c (modified) (2 diffs)
• lib/mr_mem.c (modified) (6 diffs)
• lib/mr_msg.c (modified) (2 diffs)
• test/mktest (modified) (3 diffs)

branches/stable/mondo/src/include/mr_err.h

@@ -9 +9 @@
 #define MR_ERR_H
 
+#include "mr_msg.h"
+
 /* functions (public methods) */
 
 extern inline void mr_exit(int errorcode, const char *message);
-extern inline void mr_log_exit(int errorcode, const char *message);
+#define mr_log_exit(x,y) {mr_msg(0,y); mr_exit(x, y);}
 
 #endif                          /* MR_ERR_H */

branches/stable/mondo/src/include/mr_mem.h

@@ -17 +17 @@
 /* functions (public methods) */
 
-extern inline void mr_free(char *allocated);
-extern inline void mr_allocstr(char *alloc, const char *orig);
-extern inline void mr_asprintf(char **alloc, const char *fmt, ...);
-extern inline void mr_getline(char **lineptr, size_t *n, FILE *stream);
-extern inline void *mr_malloc(size_t size);
+#define mr_free(x) mr_free_int((void **)&x,__LINE__,__FILE__)
+#define mr_allocstr(x,y) mr_allocstr_int(x, y,__LINE__,__FILE__)
+#define mr_asprintf(x,y,args...) mr_asprintf_int(x,__LINE__,__FILE__, y, ## args)
+#define mr_getline(x,y,z) mr_getline_int(x, y,z,__LINE__,__FILE__)
+#define mr_malloc(x) mr_malloc_int((size_t)x,__LINE__,__FILE__)
+
+/* Internal function bringing debuging info 
+ * called indirectly through macros */
+extern inline void mr_free_int(void **allocated, int line, char *file);
+extern inline void mr_allocstr_int(char *alloc, const char *orig, int line, char *file);
+extern inline void mr_asprintf_int(char **alloc, int line, char *file, const char *fmt, ...);
+extern inline void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, char *file);
+extern inline void *mr_malloc_int(size_t size, int line, char *file);
 
 #endif                          /* MR_MEM_H */

branches/stable/mondo/src/include/mr_msg.h

@@ -16 +16 @@
 /* functions (public methods) */
 
-extern inline void mr_msg(int debug, const char *fmt, ...);
+#define mr_msg(x,y,args...) {mr_msg_int(x,__LINE__,__FILE__,y,## args);}
 extern void mr_msg_init(const char *configfile, int loglevel);
 extern void mr_msg_close(void);
 
+/* Internal function bringing debuging info 
+ * called indirectly through macros */
+extern inline void mr_msg_int(int debug,int line, const char *file, const char *fmt, ...);
+
 #endif                          /* MR_MSG_H */

branches/stable/mondo/src/lib/mr_err.c

@@ -27 +27 @@
         /* We have to properly end newt */
         /* We have to remind people of log files */
+        mr_msg_close();
 }
 
@@ -38 +39 @@
     exit(errorcode);
 }
-
-void mr_log_exit(int errorcode, const char *message) {
-    mr_msg(0, message);
-    mr_exit(errorcode, message);
-}

branches/stable/mondo/src/lib/mr_mem.c

@@ -22 +22 @@
 /*
  * Function that frees memory if necessary
+ * A pointer to the memory pointed is passed to it.
+ * *allocated variable points then to the original content 
+ * pointed to by the caller
  */
-void mr_free(void *allocated) {
+void mr_free_int(void **allocated, int line, const char *file) {
 
     /* free man pages says that if allocated is NULL 
      * nothing happens 
      */
-    free(allocated);
-    allocated = NULL;
+    if (*allocated != NULL) {
+        free(*allocated);
+        *allocated = NULL;
+    } else {
+        mr_msg_int(0,line,file,"Attempt to reference NULL pointer\nExiting...");
+        mr_exit(-1,"Attempt to reference NULL pointer");
+    }
 }
 
 /* encapsulation function for malloc */
-void *mr_malloc(size_t size) {
+void *mr_malloc_int(size_t size, int line, const char *file) {
     
     void *ret;
@@ -39 +47 @@
     ret = malloc(size);
     if (ret == NULL) {
-        mr_log_exit(-1,"Unable to alloc memory in mr_malloc\nExiting...");
+        mr_msg_int(0,line,file,"Unable to alloc memory in mr_malloc\nExiting...");
+        mr_exit(-1,"Unable to alloc memory in mr_malloc");
     }
     return(ret);
@@ -45 +54 @@
 
 /* encapsulation function for getline */
-void mr_getline(char **lineptr, size_t *n, FILE *stream) {
+void mr_getline_int(char **lineptr, size_t *n, FILE *stream, int line, const char *file) {
     
     ssize_t ret;
@@ -51 +60 @@
     ret = getline(lineptr,n,stream);
     if (ret == -1) {
-        mr_log_exit(-1,"Unable to alloc memory in mr_getline\nExiting...");
+        mr_msg_int(0,line,file,"Unable to alloc memory in mr_getline\nExiting...",line,file);
+        mr_exit(-1,"Unable to alloc memory in mr_getline");
     }
 }
 
 /* encapsulation function for asprintf */
-void mr_asprintf(char **strp, const char *fmt, ...) {
+void mr_asprintf_int(char **strp, int line, const char *file, const char *fmt, ...) {
 
     int res = 0;
@@ -64 +74 @@
     res = vasprintf(strp, fmt, args);
     if (res == -1) {
-        mr_log_exit(-1,"Unable to alloc memory in mr_asprintf\nExiting...");
+        mr_msg_int(0,line,file,"Unable to alloc memory in mr_asprintf\nExiting...",line,file);
+        mr_exit(-1,"Unable to alloc memory in mr_asprintf");
     }
     va_end(args);
@@ -73 +84 @@
  * freeing it before in any case
  */
-void mr_allocstr(char *alloc, const char *orig) {
+void mr_allocstr_int(char *alloc, const char *orig, int line, const char *file) {
 
-    mr_free((void *)alloc); 
-    mr_asprintf(&alloc, orig);
+    mr_free_int((void **)&alloc, line, file); 
+    mr_asprintf_int(&alloc, line, file, orig);
 }

branches/stable/mondo/src/lib/mr_msg.c

@@ -52 +52 @@
  * Function that log a message. Not called directly 
  * but through other functions
+ * fmt needs to be just before ...
  */
-void mr_msg(int debug, const char *fmt, ...) {
+void mr_msg_int(int debug, int line, const char *file, const char *fmt, ...) {
 
     int i = 0;
@@ -74 +75 @@
             for (i = 1; i < debug; i++)
                 fprintf(fout, "  ");
-            fprintf(fout, "%s->%s#%d: ", __FILE__, __FUNCTION__, __LINE__);
+            fprintf(fout, "%s #%d: ", file, line);
         }
         va_start(args,fmt);

branches/stable/mondo/src/test/mktest

@@ -7 +7 @@
 
 lib="../lib/mr_conf.c ../lib/mr_msg.c ../lib/mr_err.c ../lib/mr_mem.c"
-OPT="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_REENTRANT -Wstrict-prototypes -Wshadow -funsigned-char -Wunused -Winit-self -Wcast-align -O2 -g -I../common -I../include"
+OPT="-Wall -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_REENTRANT -Wstrict-prototypes -Wshadow -funsigned-char -Wunused -Winit-self -Wcast-align -fno-strict-aliasing -O2 -g -I../common -I../include"
 
 echo "Generating test-msg"
@@ -15 +15 @@
 echo "Generating test-conf"
 gcc $OPT test-conf.c $lib -o test-conf
+echo "Generating test-mem"
+gcc $OPT test-mem.c $lib -o test-mem
 
 echo "Testing against previous run"
-for f in test-conf test-string test-msg; do
+for f in test-conf test-string test-msg test-mem; do
     chmod 755 $f
     ./$f > /tmp/$f.res
@@ -23 +25 @@
     if [ $? -ne 0 ]; then
         echo "$f test KO !!"
+    else
+        echo "$f test OK"
     fi
     valgrind -q --error-exitcode=1 --leak-check=yes ./$f 2>&1 > /tmp/valgrind-$f.res