#define BUFSIZE 256
-static data_source_t state_dsrc[1] =
-{
- {"value", DS_TYPE_GAUGE, 0.0, 65535.0}
-};
-
-static data_set_t state_ds =
-{
- "ps_state", 1, state_dsrc
-};
-
-static data_source_t rss_dsrc[1] =
-{
- /* max = 2^63 - 1 */
- {"value", DS_TYPE_GAUGE, 0.0, 9223372036854775807.0}
-};
-
-static data_set_t rss_ds =
-{
- "ps_rss", 1, rss_dsrc
-};
-
-static data_source_t time_dsrc[2] =
-{
- /* 1 second in user-mode per second ought to be enough.. */
- {"user", DS_TYPE_COUNTER, 0.0, 1000000.0},
- {"syst", DS_TYPE_COUNTER, 0.0, 1000000.0}
-};
-
-static data_set_t time_ds =
-{
- "ps_cputime", 2, time_dsrc
-};
-
-static data_source_t count_dsrc[2] =
-{
- /* 1 second in user-mode per second ought to be enough.. */
- {"processes", DS_TYPE_GAUGE, 0.0, 1000000.0},
- {"threads", DS_TYPE_GAUGE, 0.0, 1000000.0}
-};
-
-static data_set_t count_ds =
-{
- "ps_count", 2, count_dsrc
-};
-
-static data_source_t pagefaults_dsrc[2] =
-{
- /* max = 2^63 - 1 */
- {"minflt", DS_TYPE_COUNTER, 0.0, 9223372036854775807.0},
- {"majflt", DS_TYPE_COUNTER, 0.0, 9223372036854775807.0}
-};
-
-static data_set_t pagefaults_ds =
-{
- "ps_pagefaults", 2, pagefaults_dsrc
-};
-
#if PROCESSES_HAVE_READ
#if HAVE_THREAD_INFO | KERNEL_LINUX
static const char *config_keys[] =
ppid = atoi (fields[3]);
- if ((tasks = ps_read_tasks (pid)) == NULL)
+ *state = fields[2][0];
+
+ if (*state == 'Z')
{
- /* This happends for zombied, e.g. */
- DEBUG ("ps_read_tasks (%i) failed.", pid);
- *state = 'Z';
ps->num_lwp = 0;
ps->num_proc = 0;
}
+ else if ((tasks = ps_read_tasks (pid)) == NULL)
+ {
+ /* Kernel 2.4 or so */
+ ps->num_lwp = 1;
+ ps->num_proc = 1;
+ }
else
{
- *state = '\0';
ps->num_lwp = 0;
ps->num_proc = 1;
for (i = 0; tasks[i] != 0; i++)
tasks = NULL;
}
- /* Leave the rest at zero if this is only an LWP */
+ /* Leave the rest at zero if this is only a zombi */
if (ps->num_proc == 0)
{
- DEBUG ("This is only an LWP: pid = %i; name = %s;",
+ DEBUG ("This is only a zombi: pid = %i; name = %s;",
pid, ps->name);
return (0);
}
ps->cpu_system_counter = (unsigned long) cpu_system_counter;
ps->vmem_rss = (unsigned long) vmem_rss;
- *state = fields[2][0];
-
/* success */
return (0);
} /* int ps_read_process (...) */
} /* int ps_read */
#endif /* PROCESSES_HAVE_READ */
-void module_register (modreg_e load)
+void module_register (void)
{
- if (load & MR_DATASETS)
- {
- plugin_register_data_set (&state_ds);
- plugin_register_data_set (&rss_ds);
- plugin_register_data_set (&time_ds);
- plugin_register_data_set (&count_ds);
- plugin_register_data_set (&pagefaults_ds);
- }
-
#if PROCESSES_HAVE_READ
- if (load & MR_READ)
- {
#if HAVE_THREAD_INFO | KERNEL_LINUX
- plugin_register_config ("processes", ps_config,
- config_keys, config_keys_num);
+ plugin_register_config ("processes", ps_config,
+ config_keys, config_keys_num);
#endif
- plugin_register_init ("processes", ps_init);
- plugin_register_read ("processes", ps_read);
- }
+ plugin_register_init ("processes", ps_init);
+ plugin_register_read ("processes", ps_read);
#endif /* PROCESSES_HAVE_READ */
} /* void module_register */