* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Authors:
- * Evan Felix <evan.felix@pnnl.gov>
+ * Evan Felix <evan.felix at pnnl.gov>
**/
#include "collectd.h"
#define MAX_CORES 256
static MicDeviceOnSystem mics[MAX_MICS];
-static U32 num_mics = MAX_MICS;
+static U32 num_mics = 0;
static HANDLE mic_handle = NULL;
-#define NUM_THERMS 7
-static const int therms[NUM_THERMS] = {eMicThermalDie,eMicThermalDevMem,eMicThermalFin,eMicThermalFout,eMicThermalVccp,eMicThermalVddg,eMicThermalVddq};
-static const char *therm_names[NUM_THERMS] = {"die","devmem","fin","fout","vccp","vddg","vddq"};
+
+static int const therm_ids[] = {
+ eMicThermalDie, eMicThermalDevMem, eMicThermalFin, eMicThermalFout,
+ eMicThermalVccp, eMicThermalVddg, eMicThermalVddq };
+static char const * const therm_names[] = {
+ "die", "devmem", "fin", "fout",
+ "vccp", "vddg", "vddq" };
static const char *config_keys[] =
{
static int mic_init (void)
{
U32 ret;
+ U32 mic_count;
if (mic_handle)
return (0);
- ret = MicInitAPI(&mic_handle, eTARGET_SCIF_DRIVER, mics, &num_mics);
+ mic_count = (U32) STATIC_ARRAY_SIZE(mics);
+ ret = MicInitAPI(&mic_handle, eTARGET_SCIF_DRIVER, mics, &mic_count);
if (ret != MIC_ACCESS_API_SUCCESS) {
- ERROR("Problem initializing MicAccessAPI: %s",MicGetErrorString(ret));
+ ERROR("mic plugin: Problem initializing MicAccessAPI: %s",
+ MicGetErrorString(ret));
}
- DEBUG("MICs found: %d",num_mics);
+ DEBUG("mic plugin: found: %"PRIu32" MIC(s)",mic_count);
- if (num_mics<0 || num_mics>=MAX_MICS) {
- ERROR("No Intel MICs in system");
+ if (mic_count<0 || mic_count>=MAX_MICS) {
+ ERROR("mic plugin: No Intel MICs in system");
return (1);
}
- else
+ else {
+ num_mics = mic_count;
return (0);
+ }
}
static int mic_config (const char *key, const char *value) {
return (0);
}
-static void mic_submit_memory_use(int micnumber, const char *type_instance, gauge_t val)
+static void mic_submit_memory_use(int micnumber, const char *type_instance, U32 val)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
- values[0].gauge = val;
+ /* MicAccessAPI reports KB's of memory, adjust for this */
+ DEBUG("mic plugin: Memory Value Report; %u %lf",val,((gauge_t)val)*1024.0);
+ values[0].gauge = ((gauge_t)val)*1024.0;
vl.values=values;
vl.values_len=1;
static int mic_read_memory(int mic)
{
U32 ret;
- U32 mem_total,mem_used,mem_bufs;
+ U32 mem_total,mem_free,mem_bufs;
- ret = MicGetMemoryUtilization(mic_handle,&mem_total,&mem_used,&mem_bufs);
+ ret = MicGetMemoryUtilization(mic_handle,&mem_total,&mem_free,&mem_bufs);
if (ret != MIC_ACCESS_API_SUCCESS) {
- ERROR("Problem getting Memory Utilization: %s",MicGetErrorString(ret));
+ ERROR("mic plugin: Problem getting Memory Utilization: %s",
+ MicGetErrorString(ret));
return (1);
}
- /* API reprots KB's of memory, adjust for this */
- mic_submit_memory_use(mic,"free",(mem_total-mem_used-mem_bufs)*1024);
- mic_submit_memory_use(mic,"used",mem_used*1024);
- mic_submit_memory_use(mic,"buffered",mem_bufs*1024);
- /*INFO("Memory Read: %u %u %u",mem_total,mem_used,mem_bufs);*/
+ mic_submit_memory_use(mic,"free",mem_free);
+ mic_submit_memory_use(mic,"used",mem_total-mem_free-mem_bufs);
+ mic_submit_memory_use(mic,"buffered",mem_bufs);
+ DEBUG("mic plugin: Memory Read: %u %u %u",mem_total,mem_free,mem_bufs);
return (0);
}
strncpy (vl.host, hostname_g, sizeof (vl.host));
strncpy (vl.plugin, "mic", sizeof (vl.plugin));
- ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance), "%i", micnumber);
+ ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
+ "%i", micnumber);
strncpy (vl.type, "temperature", sizeof (vl.type));
strncpy (vl.type_instance, type, sizeof (vl.type_instance));
/* Gather Temperature Information */
static int mic_read_temps(int mic)
{
- int j;
- U32 ret;
- U32 temp_buffer;
- U32 buffer_size = (U32)sizeof(temp_buffer);
+ size_t num_therms = STATIC_ARRAY_SIZE(therm_ids);
+ size_t j;
- for (j=0;j<NUM_THERMS;j++) {
- if (ignorelist_match(temp_ignore,therm_names[j])!=0)
+ for (j = 0; j < num_therms; j++) {
+ U32 status;
+ U32 temp_buffer;
+ U32 buffer_size = (U32)sizeof(temp_buffer);
+ char const *name = therm_names[j];
+
+ if (ignorelist_match(temp_ignore, name) != 0)
continue;
- ret = MicGetTemperature(mic_handle,therms[j],&temp_buffer,&buffer_size);
- if (ret != MIC_ACCESS_API_SUCCESS) {
- ERROR("Problem getting Temperature(%d) %s",j,MicGetErrorString(ret));
+
+ status = MicGetTemperature(mic_handle, therm_ids[j],
+ &temp_buffer, &buffer_size);
+ if (status != MIC_ACCESS_API_SUCCESS) {
+ ERROR("mic plugin: Error reading temperature \"%s\": "
+ "%s", name, MicGetErrorString(status));
return (1);
}
- mic_submit_temp(mic,therm_names[j],temp_buffer);
+ mic_submit_temp(mic, name, temp_buffer);
}
return (0);
}
-static void mic_submit_cpu(int micnumber, const char *type_instance, int core, derive_t val)
+static void mic_submit_cpu(int micnumber, const char *type_instance,
+ int core, derive_t val)
{
value_t values[1];
value_list_t vl = VALUE_LIST_INIT;
strncpy (vl.host, hostname_g, sizeof (vl.host));
strncpy (vl.plugin, "mic", sizeof (vl.plugin));
- ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance), "%i", micnumber);
+ if (core < 0) /* global aggregation */
+ ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
+ "%i", micnumber);
+ else /* per-core statistics */
+ ssnprintf (vl.plugin_instance, sizeof (vl.plugin_instance),
+ "%i-cpu-%i", micnumber, core);
strncpy (vl.type, "cpu", sizeof (vl.type));
- if (core < 0)
- strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
- else
- ssnprintf (vl.type_instance, sizeof (vl.type_instance), "%i-%s", core, type_instance);
+ strncpy (vl.type_instance, type_instance, sizeof (vl.type_instance));
plugin_dispatch_values (&vl);
}
/*Gather CPU Utilization Information */
static int mic_read_cpu(int mic)
{
- U32 ret;
- U32 buffer_size;
- int j;
MicCoreUtil core_util;
MicCoreJiff core_jiffs[MAX_CORES];
-
- buffer_size=MAX_CORES*sizeof(MicCoreJiff);
- ret = MicGetCoreUtilization(mic_handle,&core_util,core_jiffs,&buffer_size);
- if (ret != MIC_ACCESS_API_SUCCESS) {
- ERROR("Problem getting CPU utilization: %s",MicGetErrorString(ret));
- return(0);
+ U32 core_jiffs_size;
+ U32 status;
+
+ core_jiffs_size = MAX_CORES * sizeof(MicCoreJiff);
+ status = MicGetCoreUtilization(mic_handle, &core_util,
+ core_jiffs, &core_jiffs_size);
+ if (status != MIC_ACCESS_API_SUCCESS) {
+ ERROR("mic plugin: Problem getting CPU utilization: %s",
+ MicGetErrorString(status));
+ return(-1);
}
+
if (show_total_cpu) {
- mic_submit_cpu(mic,"user",-1,core_util.sum.user);
- mic_submit_cpu(mic,"sys",-1,core_util.sum.sys);
- mic_submit_cpu(mic,"nice",-1,core_util.sum.nice);
- mic_submit_cpu(mic,"idle",-1,core_util.sum.idle);
+ mic_submit_cpu(mic, "user", -1, core_util.sum.user);
+ mic_submit_cpu(mic, "sys", -1, core_util.sum.sys);
+ mic_submit_cpu(mic, "nice", -1, core_util.sum.nice);
+ mic_submit_cpu(mic, "idle", -1, core_util.sum.idle);
}
+
if (show_per_cpu) {
- for (j=0;j<core_util.core;j++) {
- mic_submit_cpu(mic,"user",j,core_jiffs[j].user);
- mic_submit_cpu(mic,"sys",j,core_jiffs[j].sys);
- mic_submit_cpu(mic,"nice",j,core_jiffs[j].nice);
- mic_submit_cpu(mic,"idle",j,core_jiffs[j].idle);
+ int j;
+ for (j = 0; j < core_util.core; j++) {
+ mic_submit_cpu(mic, "user", j, core_jiffs[j].user);
+ mic_submit_cpu(mic, "sys", j, core_jiffs[j].sys);
+ mic_submit_cpu(mic, "nice", j, core_jiffs[j].nice);
+ mic_submit_cpu(mic, "idle", j, core_jiffs[j].idle);
}
}
return (0);
for (i=0;i<num_mics;i++) {
ret = MicInitAdapter(&mic_handle,&mics[i]);
if (ret != MIC_ACCESS_API_SUCCESS) {
- ERROR("Problem initializing MicAdapter: %s",MicGetErrorString(ret));
+ ERROR("mic plugin: Problem initializing MicAdapter: %s",
+ MicGetErrorString(ret));
error=1;
}
ret = MicCloseAdapter(mic_handle);
if (ret != MIC_ACCESS_API_SUCCESS) {
- ERROR("Problem closing MicAdapter: %s",MicGetErrorString(ret));
+ ERROR("mic plugin: Problem closing MicAdapter: %s",
+ MicGetErrorString(ret));
error=2;
break;
}
} /* void module_register */
/*
- * vim: shiftwidth=2:softtabstop=2:textwidth=78
+ * vim: set shiftwidth=8 softtabstop=8 noet textwidth=78 :
*/
projects / collectd.git / blobdiff