Add Thermal gathering, and the config properly

[collectd.git] / src / mic.c

diff --git a/src/mic.c b/src/mic.c
index efd7c1da559091b9a18872577d8980d741f05fcd..f299e942d3dc28231c2e940c1f5b57981e767d6a 100644 (file)
--- a/src/mic.c
+++ b/src/mic.c
@@ -26,12 +26,17 @@
 #include <MicAccessTypes.h>
 #include <MicAccessErrorTypes.h>
 #include <MicAccessApi.h>
+#include <MicThermalAPI.h>
 
 #define MAX_MICS 32
 
 static MicDeviceOnSystem mics[MAX_MICS];
 static U32 numMics = MAX_MICS;
 static HANDLE micHandle=NULL;
+#define NUM_THERMS 7
+static const int therms[NUM_THERMS] = {eMicThermalDie,eMicThermalDevMem,eMicThermalFin,eMicThermalFout,eMicThermalVccp,eMicThermalVddg,eMicThermalVddq};
+static const char *thermNames[NUM_THERMS] = {"die","devmem","fin","fout","vccp","vddg","vddq"};
+
 
 static int mic_init (void)
 {
@@ -48,7 +53,7 @@ static int mic_init (void)
        return (0);
 }
 
-static void mic_submit_memory_use(int micnumber, char *type, gauge_t val)
+static void mic_submit_memory_use(int micnumber, const char *type, gauge_t val)
 {
   value_t values[1];
   value_list_t vl = VALUE_LIST_INIT;
@@ -67,10 +72,31 @@ static void mic_submit_memory_use(int micnumber, char *type, gauge_t val)
   plugin_dispatch_values (&vl);
 } 
 
+static void mic_submit_temp(int micnumber, const char *type, gauge_t val)
+{
+  value_t values[1];
+  value_list_t vl = VALUE_LIST_INIT;
+
+  values[0].gauge = val;
+
+  vl.values=values;
+  vl.values_len=1;
+
+  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);
+  strncpy (vl.type, "temperature", sizeof (vl.type));
+  strncpy (vl.type_instance, type, sizeof (vl.type_instance));
+
+  plugin_dispatch_values (&vl);
+} 
+
+
 static int mic_read (void)
 {
-  int i;
-  U32 ret;
+  int i,j;
+  U32 ret,bufferSize;
+  U32 *tempBuffer;
   int error;
   U32 mem_total,mem_used,mem_bufs;
 
@@ -86,15 +112,32 @@ static int mic_read (void)
        /* Gather memory Utilization */
        ret = MicGetMemoryUtilization(micHandle,&mem_total,&mem_used,&mem_bufs);
        if (ret != MIC_ACCESS_API_SUCCESS) {
-         ERROR("Problem initializing MicAdapter: %s",MicGetErrorString(ret));
+         ERROR("Problem getting Memory Utilization: %s",MicGetErrorString(ret));
          error=3;
          break;
        }
-       mic_submit_memory_use(i,"total",mem_total);
-       mic_submit_memory_use(i,"used",mem_used);
-       mic_submit_memory_use(i,"bufs",mem_bufs);
+       /* API reprots KB's of memory, adjust for this */ 
+       mic_submit_memory_use(i,"total",mem_total*1024);
+       mic_submit_memory_use(i,"used",mem_used*1024);
+       mic_submit_memory_use(i,"bufs",mem_bufs*1024);
        /*INFO("Memory Read: %u %u %u",mem_total,mem_used,mem_bufs);*/
 
+       /* Gather Temperature Information */
+       bufferSize = sizeof(U32);
+       tempBuffer = malloc(bufferSize);
+       for (j=0;j<NUM_THERMS;j++) {
+         ret = MicGetTemperature(micHandle,therms[j],tempBuffer,&bufferSize);
+         if (ret != MIC_ACCESS_API_SUCCESS) {
+               ERROR("Problem getting Temperature(%d) %s",j,MicGetErrorString(ret));
+               error=4;
+               break;
+         }
+         /*INFO("Temp Read: %u: %u %s",j,tempBuffer[0],thermNames[j]);*/
+         mic_submit_temp(i,thermNames[j],tempBuffer[0]);
+       }
+       if (error)
+         break;
+
        ret = MicCloseAdapter(micHandle);
        if (ret != MIC_ACCESS_API_SUCCESS) {
          ERROR("Problem initializing MicAdapter: %s",MicGetErrorString(ret));