I think I found a very small bug in rrd graph PDF output : the is_stream member of

[rrdtool.git] / src / rrd_open.c

diff --git a/src/rrd_open.c b/src/rrd_open.c
index c0e6545..f345e28 100644 (file)
--- a/src/rrd_open.c
+++ b/src/rrd_open.c
@@ -5,6 +5,24 @@
  *****************************************************************************
  * $Id$
  * $Log$
+ * Revision 1.7  2003/03/31 21:22:12  oetiker
+ * enables RRDtool updates with microsecond or in case of windows millisecond
+ * precision. This is needed to reduce time measurement error when archive step
+ * is small. (<30s) --  Sasha Mikheev <sasha@avalon-net.co.il>
+ *
+ * Revision 1.6  2003/02/13 07:05:27  oetiker
+ * Find attached the patch I promised to send to you. Please note that there
+ * are three new source files (src/rrd_is_thread_safe.h, src/rrd_thread_safe.c
+ * and src/rrd_not_thread_safe.c) and the introduction of librrd_th. This
+ * library is identical to librrd, but it contains support code for per-thread
+ * global variables currently used for error information only. This is similar
+ * to how errno per-thread variables are implemented.  librrd_th must be linked
+ * alongside of libpthred
+ *
+ * There is also a new file "THREADS", holding some documentation.
+ *
+ * -- Peter Stamfest <peter@stamfest.at>
+ *
  * Revision 1.5  2002/06/20 00:21:03  jake
  * More Win32 build changes; thanks to Kerry Calvert.
  *
@@ -39,6 +57,8 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
 
     
     char *mode = NULL;
+    int version;
+    
     rrd_init(rrd);
     if (rdwr == RRD_READONLY) {
 #ifndef WIN32
@@ -55,7 +75,7 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
     }
     
     if (((*in_file) = fopen(file_name,mode)) == NULL ){
-       rrd_set_error("opening '%s': %s",file_name, strerror(errno));
+       rrd_set_error("opening '%s': %s",file_name, rrd_strerror(errno));
        return (-1);
     }
 /*
@@ -77,7 +97,8 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
 
 
     MYFREAD(rrd->stat_head, stat_head_t,  1)
-    
+    version = atoi(rrd->stat_head->version);
+
        /* lets do some test if we are on track ... */
        if (strncmp(rrd->stat_head->cookie,RRD_COOKIE,4) != 0){
            rrd_set_error("'%s' is not an RRD file",file_name);
@@ -85,7 +106,7 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
            fclose(*in_file);
            return(-1);}
 
-        if (atoi(rrd->stat_head->version) > atoi(RRD_VERSION)){
+        if (version > atoi(RRD_VERSION)){
            rrd_set_error("can't handle RRD file version %s",
                        rrd->stat_head->version);
            free(rrd->stat_head);
@@ -100,7 +121,19 @@ rrd_open(char *file_name, FILE **in_file, rrd_t *rrd, int rdwr)
 
     MYFREAD(rrd->ds_def,    ds_def_t,     rrd->stat_head->ds_cnt)
     MYFREAD(rrd->rra_def,   rra_def_t,    rrd->stat_head->rra_cnt)
-    MYFREAD(rrd->live_head,   live_head_t,  1)
+    /* handle different format for the live_head */
+    if(version < 3) {
+           rrd->live_head = (live_head_t *)malloc(sizeof(live_head_t));
+           if(rrd->live_head == NULL) {
+               rrd_set_error("live_head_t malloc");
+               fclose(*in_file); 
+               return (-1);
+           }
+            fread(&rrd->live_head->last_up, sizeof(long), 1, *in_file); 
+    }
+    else {
+           MYFREAD(rrd->live_head, live_head_t, 1)
+    }
     MYFREAD(rrd->pdp_prep,  pdp_prep_t,   rrd->stat_head->ds_cnt)
     MYFREAD(rrd->cdp_prep,  cdp_prep_t,   (rrd->stat_head->rra_cnt
                                             * rrd->stat_head->ds_cnt))
@@ -124,14 +157,14 @@ void rrd_init(rrd_t *rrd)
 
 void rrd_free(rrd_t *rrd)
 {
-    free(rrd->stat_head);
-    free(rrd->ds_def);
-    free(rrd->rra_def);
-    free(rrd->live_head);
-    free(rrd->rra_ptr);
-    free(rrd->pdp_prep);
-    free(rrd->cdp_prep);
-    free(rrd->rrd_value);
+    if (rrd->stat_head) free(rrd->stat_head);
+    if (rrd->ds_def) free(rrd->ds_def);
+    if (rrd->rra_def) free(rrd->rra_def);
+    if (rrd->live_head) free(rrd->live_head);
+    if (rrd->rra_ptr) free(rrd->rra_ptr);
+    if (rrd->pdp_prep) free(rrd->pdp_prep);
+    if (rrd->cdp_prep) free(rrd->cdp_prep);
+    if (rrd->rrd_value) free(rrd->rrd_value);
 }
 
 /* routine used by external libraries to free memory allocated by
@@ -139,7 +172,7 @@ void rrd_free(rrd_t *rrd)
 void rrd_freemem(void *mem)
 {
 
-    free(mem);
+    if (mem) free(mem);
 }
 
 int readfile(char *file_name, char **buffer, int skipfirst){
@@ -149,7 +182,7 @@ int readfile(char *file_name, char **buffer, int skipfirst){
     if ((strcmp("-",file_name) == 0)) { input = stdin; }
     else {
       if ((input = fopen(file_name,"rb")) == NULL ){
-       rrd_set_error("opening '%s': %s",file_name,strerror(errno));
+       rrd_set_error("opening '%s': %s",file_name,rrd_strerror(errno));
        return (-1);
       }
     }