/*
* Defines
*/
-#define UPDATE_INTERVAL 10
+#define UPDATE_INTERVAL 900
/*
* Global variables
static graph_config_t **gl_staging = NULL;
static size_t gl_staging_num = 0;
+/* Graphs created on-the-fly for files which don't match any existing graph
+ * definition. */
+static graph_config_t **gl_dynamic = NULL;
+static size_t gl_dynamic_num = 0;
+
static char **host_list = NULL;
static size_t host_list_len = 0;
/*
* Private functions
*/
-int gl_add_graph_internal (graph_config_t *cfg, /* {{{ */
+static int gl_add_graph_internal (graph_config_t *cfg, /* {{{ */
graph_config_t ***gl_array, size_t *gl_array_num)
{
graph_config_t **tmp;
return (0);
} /* }}} int gl_add_graph_internal */
+static void gl_destroy (graph_config_t ***gl_array, /* {{{ */
+ size_t *gl_array_num)
+{
+ size_t i;
+
+ if ((gl_array == NULL) || (gl_array_num == NULL))
+ return;
+
+#define ARRAY_PTR (*gl_array)
+#define ARRAY_SIZE (*gl_array_num)
+
+ for (i = 0; i < ARRAY_SIZE; i++)
+ {
+ graph_destroy (ARRAY_PTR[i]);
+ ARRAY_PTR[i] = NULL;
+ }
+ free (ARRAY_PTR);
+ ARRAY_PTR = NULL;
+ ARRAY_SIZE = 0;
+
+#undef ARRAY_SIZE
+#undef ARRAY_PTR
+} /* }}} void gl_destroy */
+
static int gl_register_host (const char *host) /* {{{ */
{
char **tmp;
static int gl_compare_hosts (const void *v0, const void *v1) /* {{{ */
{
- return (strcmp (v0, v1));
+ return (strcmp (*(char * const *) v0, *(char * const *) v1));
} /* }}} int gl_compare_hosts */
static int gl_register_file (const graph_ident_t *file, /* {{{ */
graph_config_t *cfg = gl_active[i];
int status;
- if (!graph_matches_ident (cfg, file))
+ if (!graph_ident_matches (cfg, file))
continue;
status = graph_add_file (cfg, file);
if (num_graphs == 0)
{
cfg = graph_create (file);
- gl_add_graph_internal (cfg, &gl_active, &gl_active_num);
+ gl_add_graph_internal (cfg, &gl_dynamic, &gl_dynamic_num);
graph_add_file (cfg, file);
}
return (0);
} /* }}} int gl_clear_instances */
-
/*
* Global functions
*/
{
graph_config_t **old;
size_t old_num;
- size_t i;
old = gl_active;
old_num = gl_active_num;
gl_staging = NULL;
gl_staging_num = 0;
- for (i = 0; i < old_num; i++)
- {
- graph_destroy (old[i]);
- old[i] = NULL;
- }
- free (old);
+ gl_destroy (&old, &old_num);
return (0);
} /* }}} int graph_config_submit */
return (status);
}
+ for (i = 0; i < gl_dynamic_num; i++)
+ {
+ int status;
+
+ status = (*callback) (gl_dynamic[i], user_data);
+ if (status != 0)
+ return (status);
+ }
+
return (0);
} /* }}} int gl_graph_get_all */
return (gl_active[i]);
}
+ for (i = 0; i < gl_dynamic_num; i++)
+ {
+ if (graph_compare (gl_dynamic[i], ident) != 0)
+ continue;
+
+ ident_destroy (ident);
+ return (gl_dynamic[i]);
+ }
+
ident_destroy (ident);
return (NULL);
} /* }}} graph_config_t *gl_graph_get_selected */
return (status);
}
+ for (i = 0; i < gl_dynamic_num; i++)
+ {
+ int status;
+
+ status = gl_graph_instance_get_all (gl_dynamic[i], callback, user_data);
+ if (status != 0)
+ return (status);
+ }
+
return (0);
} /* }}} int gl_instance_get_all */
/* }}} gl_instance_get_all, gl_graph_instance_get_all */
-int gl_search (const char *term, graph_inst_callback_t callback, /* {{{ */
+int gl_search_string (const char *term, graph_inst_callback_t callback, /* {{{ */
void *user_data)
{
size_t i;
{
int status;
- status = graph_inst_search (gl_active[i], term,
+ status = graph_search_inst_string (gl_active[i], term,
+ /* callback = */ callback,
+ /* user data = */ user_data);
+ if (status != 0)
+ return (status);
+ }
+
+ for (i = 0; i < gl_dynamic_num; i++)
+ {
+ int status;
+
+ status = graph_search_inst_string (gl_dynamic[i], term,
/* callback = */ callback,
/* user data = */ user_data);
if (status != 0)
}
return (0);
-} /* }}} int gl_search */
+} /* }}} int gl_search_string */
int gl_search_field (graph_ident_field_t field, /* {{{ */
const char *field_value,
return (status);
}
+ for (i = 0; i < gl_dynamic_num; i++)
+ {
+ int status;
+
+ status = graph_inst_search_field (gl_dynamic[i],
+ field, field_value,
+ /* callback = */ callback,
+ /* user data = */ user_data);
+ if (status != 0)
+ return (status);
+ }
+
return (0);
} /* }}} int gl_search_field */
{
time_t now;
int status;
+ size_t i;
/*
printf ("Content-Type: text/plain\n\n");
if ((gl_last_update + UPDATE_INTERVAL) >= now)
return (0);
- graph_read_config ();
-
+ /* Clear state */
gl_clear_instances ();
gl_clear_hosts ();
+ gl_destroy (&gl_dynamic, &gl_dynamic_num);
+
+ graph_read_config ();
+
status = fs_scan (/* callback = */ gl_register_file, /* user data = */ NULL);
if (host_list_len > 0)
gl_last_update = now;
+ for (i = 0; i < gl_active_num; i++)
+ graph_sort_instances (gl_active[i]);
+
return (status);
} /* }}} int gl_update */