Changeset 7fbea6436b3d271e41e913291bb1bd2f606358e3

Timestamp:

12/21/10 22:39:59 (2 years ago)

Author:

Theo Schlossnagle <jesus@omniti.com>

git-committer:

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

git-parent:

[92a48807012238729af2563033f6753ce03b460e]

git-author:

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

Message:

correct refcnt tracking and add some console introspection, refs #333

Files:

• src/modules/snmp.c (modified) (9 diffs)

src/modules/snmp.c

@@ -129 +129 @@
-  int in_table;
-  int refcnt;
+  struct timeval last_open;
-};
-
@@ -149 +150 @@
-  noit_module_t *self;
-  noit_check_t *check;
+  struct target_session *ts;
-};
-
@@ -340 +342 @@
-  struct check_info *info = closure;
-  info->timedout = 1;
+  if(info->ts) {
+    info->ts->refcnt--;
+    noit_snmp_session_cleanse(info->ts);
+    info->ts = NULL;
+  }
-  remove_check(info);
-  /* Log our findings */
@@ -739 +746 @@
-  current.available = NP_AVAILABLE;
-
+  /* Rate limit */
+  if(((current.whence.tv_sec * 1000 +
+       current.whence.tv_usec / 1000) -
+      (check->last_fire_time.tv_sec * 1000 +
+       check->last_fire_time.tv_usec / 1000)) < check->period) goto cleanup;
+
+  /* update the last fire time... */
+  gettimeofday(&check->last_fire_time, NULL);
+
-  for(; var != NULL; var = var->next_variable)
-    if(noit_snmp_trapvars_to_stats(&current, var) == 0) success++;
@@ -762 +778 @@
-                                     void *magic) {
-  struct check_info *info;
-  struct target_session *ts = magic;
-
-  /* We don't deal with refcnt hitting zero here.  We could only be hit from
-   * the snmp read/timeout stuff.  Handle it there.
-   */
-  ts->refcnt--; 
-
-  info = get_check(reqid);
-  if(!info) return 1;
+  if(info->ts) {
+    info->ts->refcnt--;
+    info->ts = NULL;
+  }
-  remove_check(info);
-  if(info->timeoutevent) {
@@ -800 +817 @@
-  sess.callback_magic = ts;
-  ts->sess_handle = snmp_sess_open(&sess);
+  gettimeofday(&ts->last_open, NULL);
-}
-
@@ -909 +927 @@
-     (info->reqid = snmp_sess_send(ts->sess_handle, req)) != 0) {
-    struct timeval when, to;
+    info->ts = ts;
-    info->timeoutevent = eventer_alloc();
-    info->timeoutevent->callback = noit_snmp_check_timeout;
@@ -987 +1006 @@
-}
-
+static void
+nc_printf_snmpts_brief(noit_console_closure_t ncct,
+                       struct target_session *ts) {
+  struct timeval now, diff;
+  gettimeofday(&now, NULL);
+  sub_timeval(now, ts->last_open, &diff);
+  nc_printf(ncct, "[%s]\n\topened: %0.3fs ago\n\tFD: %d\n\trefcnt: %d\n",
+            ts->target, diff.tv_sec + (float)diff.tv_usec/1000000,
+            ts->fd, ts->refcnt);
+}
+
+static int
+noit_console_show_snmp(noit_console_closure_t ncct,
+                       int argc, char **argv,
+                       noit_console_state_t *dstate,
+                       void *closure) {
+  noit_hash_iter iter = NOIT_HASH_ITER_ZERO;
+  uuid_t key_id;
+  int klen;
+  void *vts;
+  snmp_mod_config_t *conf = closure;
+
+  while(noit_hash_next(&conf->target_sessions, &iter,
+                       (const char **)key_id, &klen,
+                       &vts)) {
+    struct target_session *ts = vts;
+    nc_printf_snmpts_brief(ncct, ts);
+  }
+  return 0;
+}
+
+static void
+register_console_snmp_commands(snmp_mod_config_t *conf) {
+  noit_console_state_t *tl;
+  cmd_info_t *showcmd;
+
+  tl = noit_console_state_initial();
+  showcmd = noit_console_state_get_cmd(tl, "show");
+  assert(showcmd && showcmd->dstate);
+  noit_console_state_add_cmd(showcmd->dstate,
+    NCSCMD("snmp", noit_console_show_snmp, NULL, NULL, conf));
+}
+
-static int noit_snmp_init(noit_module_t *self) {
-  const char *opt;
@@ -999 +1061 @@
-    init_snmp("noitd");
-    __snmp_initialize_once = 1;
+  }
+  if(strcmp(self->hdr.name, "snmp") == 0) {
+    register_console_snmp_commands(conf);
-  }
-