Changeset 01dbb0d0a665cdb6625e6290da3405ee89ddc80b

Timestamp:

04/27/08 01:17:08 (5 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

Theo Schlossnagle <jesus@omniti.com> 1209259028 +0000

git-parent:

[4c05448ea043aaf96b94270f68092553c96ccd9d]

git-author:

Theo Schlossnagle <jesus@omniti.com> 1209259028 +0000

Message:

various valgrind noted leaks

Files:

• configure.in (modified) (3 diffs)
• src/modules/http.c (modified) (7 diffs)
• src/modules/snmp.c (modified) (1 diff)
• src/noit_check.c (modified) (3 diffs)
• src/noit_conf.c (modified) (8 diffs)
• src/noit_listener.c (modified) (1 diff)
• src/noit_module.c (modified) (2 diffs)

configure.in

@@ -56 +56 @@
-        ;;
-*-*-linux*)
-
+
+
-        PICFLAGS="-fpic"
-        MODULELD="$CC -shared"
@@ -228 +229 @@
-                 sys/ioctl_compat.h util.h sys/time.h sys/mman.h)
-
+AC_CACHE_CHECK([for epoll support], ac_cv_have_epoll, [
+        AC_TRY_LINK(
+                [ #include <sys/types.h> ],
+                [ u_int a; a = epoll_create(); ],
+                [ ac_cv_have_epoll="yes" ],
+                [ ac_cv_have_epoll="no" ]
+        )
+])
+if test "x$ac_cv_have_epoll" = "xyes" ; then
+        AC_DEFINE(HAVE_EPOLL)
+        EVENTER_OBJS="$EVENTER_OBJS eventer_epoll_impl.o"
+        AC_DEFINE_UNQUOTED(DEFAULT_EVENTER, "epoll")
+        have_epoll=1
+fi
+
-AC_CACHE_CHECK([for kqueue support], ac_cv_have_kqueue, [
-        AC_TRY_LINK(
@@ -239 +255 @@
-        AC_DEFINE(HAVE_KQUEUE)
-        EVENTER_OBJS="$EVENTER_OBJS eventer_kqueue_impl.o"
+        AC_DEFINE_UNQUOTED(DEFAULT_EVENTER, "kqueue")
-        have_kqueue=1
-fi

src/modules/http.c

@@ -118 +118 @@
-  conf->results = serf_log_results;
-  noit_module_set_userdata(self, conf);
-0
+1
-}
-static int resmon_config(noit_module_t *self, noit_hash_table *options) {
@@ -137 +137 @@
-  conf->results = resmon_log_results;
-  noit_module_set_userdata(self, conf);
-0
+1
-}
-static void generic_log_results(noit_module_t *self, noit_check_t *check) {
@@ -224 +224 @@
-            current.state = strcmp(value,"OK") ? NP_BAD : NP_GOOD;
-          }
+          xmlFree(value);
-        }
+        xmlXPathFreeObject(pobj);
-      }
-      xmlXPathFreeContext(xpath_ctxt);
@@ -234 +236 @@
-        rci->resmod, rci->resserv, current.status);
-  noit_check_set_stats(self, check, &current);
+  free(current.status);
-}
-static void resmon_part_log_results(noit_module_t *self, noit_check_t *check,
@@ -309 +312 @@
-        xpath_ctxt->node = node;
-        sobj = xmlXPathEval((xmlChar *)"@module", xpath_ctxt);
-
+
+
+
+
-        sobj = xmlXPathEval((xmlChar *)"@service", xpath_ctxt);
-
+
+
+
+
-        if(!resmod && !resserv) continue;
-
@@ -319 +328 @@
-          attrnode = xmlXPathNodeSetItem(sobj->nodesetval, 0);
-          value = (char *)xmlXPathCastNodeToString(attrnode);
+          xmlXPathFreeObject(sobj);
-          snprintf(attr, sizeof(attr), "%s`%s`%s",
-                   resmod, resserv, (char *)attrnode->name);
@@ -334 +344 @@
-              break;
-          }
+          xmlFree(value);
-        }
+        if(resmod) xmlFree(resmod);
+        if(resserv) xmlFree(resserv);
-      }
-    }

src/modules/snmp.c

@@ -266 +266 @@
-  fd_set fdset;
-  int fds, block = 0;
-
+ = { 0, 0 }
-  struct target_session *ts = closure;
-  FD_ZERO(&fdset);

src/noit_check.c

@@ -187 +187 @@
-      noitL(noit_debug, "loaded uuid: %s\n", uuid_str);
-    }
-
+
+
+
+
+
-}
-
@@ -491 +495 @@
-  free(m->metric_name);
-  if(m->metric_value.i) free(m->metric_value.i);
+  free(m);
-}
-
@@ -541 +546 @@
-  if(cp > s && *cp == '%') *cp-- = '\0'; /* chop a last % is there is one */
-
-
+ = '\0'
-
-  /* string was       '  -1.23e-01%  inodes used  ' */

src/noit_conf.c

@@ -134 +134 @@
-                      strdup((char *)node->name), strlen((char *)node->name),
-                      strdup(value), free, free);
+    xmlFree(value);
-  }
- out:
@@ -255 +256 @@
-                          const char *path, char **value) {
-  char *str;
-
-
+, rv = 1
+ = NULL
-  xmlXPathContextPtr current_ctxt;
-  xmlNodePtr current_node = (xmlNodePtr)section;
@@ -284 +285 @@
-  if(noit_hash_retrieve(&_compiled_fallback,
-                        path, strlen(path), (void **)&str)) {
-str
+(char *)xmlStrdup((xmlChar *)str)
-    goto found;
-  }
+  rv = 0;
+ found:
+  if(pobj) xmlXPathFreeObject(pobj);
-  if(current_ctxt && current_ctxt != xpath_ctxt)
-    xmlXPathFreeContext(current_ctxt);
-
-
-
-
-
+
-}
-int noit_conf_get_uuid(noit_conf_section_t section,
@@ -309 +309 @@
-  if(_noit_conf_get_string(section,NULL,path,&str)) {
-    *value = strdup(str);
+    xmlFree(str);
-    return 1;
-  }
@@ -318 +319 @@
-  if(_noit_conf_get_string(section,NULL,path,&str)) {
-    strlcpy(buf, str, len);
+    xmlFree(str);
-    return 1;
-  }
@@ -340 +342 @@
-    }
-    longval = strtol(str, NULL, base);
+    xmlFree(str);
-    *value = (int)longval;
-    return 1;
@@ -356 +359 @@
-  if(_noit_conf_get_string(section,NULL,path,&str)) {
-    *value = atof(str);
+    xmlFree(str);
-    return 1;
-  }
@@ -373 +377 @@
-       !strcasecmp(str, "on")) *value = noit_true;
-    else *value = noit_false;
+    xmlFree(str);
-    return 1;
-  }

src/noit_listener.c

@@ -322 +322 @@
-     ssl = noit_false;
-
-
+
+
+
-    config = noit_conf_get_hash(listener_configs[i], "config");
-
-    noit_listener(address, port, SOCK_STREAM, backlog,
- ? sslconfig : NULL
+config
-  }
-}

src/noit_module.c

@@ -106 +106 @@
-    config = noit_conf_get_hash(sections[i], "config");
-    module = noit_module_lookup(module_name);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    if(module->init && module->init(module)) {
@@ -119 +130 @@
-          module_file, module_name);
-  }
+  free(sections);
-}
-