Skip to content
Snippets Groups Projects
Commit bed45ca8 authored by FlorealRISSO's avatar FlorealRISSO
Browse files

standardise the names of structures

parent 285d4169
Branches
Tags
4 merge requests!9fix sensor example (doc),!4Amd, Tests, Doc, CI/CD,!2build system (v0), add long options,!1build system (v0), add long options, corrections
......@@ -33,7 +33,7 @@ SENSORS:
-d|--net-dev <net_dev>
network monitoring (if network_device is X, tries to detect it automatically)
-r|--intel-rapl
RAPL
INTEL RAPL
-c|--cpu-temp
processor temperature
```
......
......@@ -20,7 +20,7 @@
// ~/mojitos/doc/$ gcc -Wall -Wextra -Wpedantic -O3 -o info_reader_ex info_reader_ex.c ./../src/util.c && ./info_reader_ex
#include "./../src/info_reader.h"
#include "./../lib/info_reader.h"
#define MAX_PROCS 64
......
......@@ -60,9 +60,10 @@ gcc -std=gnu99 -Wall -Wpedantic -I./lib -I./doc -I./src -g -Og obj/util.o obj/mo
#define NB_SENSOR 3
struct accumulator_t {
struct Accumulator {
int v[NB_SENSOR];
};
typedef struct Accumulator Accumulator;
void _get_acc(int v[NB_SENSOR])
{
......@@ -77,7 +78,7 @@ unsigned int init_acc(char *none, void **ptr)
/* there is none in this case, so this parameter is not used */
UNUSED(none);
struct accumulator_t *state = malloc(sizeof(struct accumulator_t));
Accumulator *state = malloc(sizeof(Accumulator));
for (int i = 0; i < NB_SENSOR; i++) {
state->v[i] = -1;
......@@ -91,7 +92,7 @@ unsigned int init_acc(char *none, void **ptr)
unsigned int get_acc(uint64_t *results, void *ptr)
{
struct accumulator_t *state = (struct accumulator_t *)ptr;
Accumulator *state = (Accumulator *)ptr;
_get_acc(state->v);
......@@ -113,7 +114,7 @@ void label_acc(char **labels, void *none)
void clean_acc(void *ptr)
{
struct accumulator_t *state = (struct accumulator_t *)ptr;
Accumulator *state = (Accumulator *)ptr;
if (state == NULL) {
return;
......
......@@ -41,7 +41,7 @@ static const uint64_t energy_core_msr = 0xC001029A;
// ------------------------------FILE_PATHS
static const char *base_str = "/dev/cpu/%d/msr";
struct cpu_sensor_t {
struct CpuSensor {
unsigned int cpu_id;
unsigned int package_id;
unsigned int core_id;
......@@ -52,13 +52,13 @@ struct cpu_sensor_t {
unsigned int energy_units;
uint64_t core_energy;
};
typedef struct cpu_sensor_t cpu_sensor_t;
typedef struct CpuSensor CpuSensor;
struct _amd_rapl_t {
cpu_sensor_t *sensors;
struct AmdRapl {
CpuSensor *sensors;
unsigned int sensor_count;
};
typedef struct _amd_rapl_t _amd_rapl_t;
typedef struct AmdRapl AmdRapl;
// -----------------------------INFO_READER
......@@ -75,19 +75,19 @@ static GenericPointer uint_allocator(char *s)
static void _set_cpu_id(GenericPointer storage, GenericPointer data)
{
cpu_sensor_t *cpu = (cpu_sensor_t *) storage;
CpuSensor *cpu = (CpuSensor *) storage;
cpu->cpu_id = (unsigned int) data;
}
static void _set_package_id(GenericPointer storage, GenericPointer data)
{
cpu_sensor_t *cpu = (cpu_sensor_t *) storage;
CpuSensor *cpu = (CpuSensor *) storage;
cpu->package_id = (unsigned int) data;
}
static void _set_core_id(GenericPointer storage, GenericPointer data)
{
cpu_sensor_t *cpu = (cpu_sensor_t *) storage;
CpuSensor *cpu = (CpuSensor *) storage;
cpu->core_id = (unsigned int) data;
}
......@@ -98,13 +98,13 @@ static KeyFinder keys[NB_KEYS] = {
};
static unsigned int parse_cpuinfo(cpu_sensor_t *storage, unsigned int capacity)
static unsigned int parse_cpuinfo(CpuSensor *storage, unsigned int capacity)
{
Parser parser = {
.storage = (GenericPointer) storage,
.nb_stored = 0,
.capacity = capacity,
.storage_struct_size = sizeof(cpu_sensor_t),
.storage_struct_size = sizeof(CpuSensor),
.keys = keys,
.nb_keys = NB_KEYS,
.file = fopen(cpuinfo, "r")
......@@ -171,9 +171,9 @@ uint64_t raw_to_joule(uint64_t raw, uint64_t unit)
// -----------------------------------DEBUG
#ifdef DEBUG
void debug_print_sensor(cpu_sensor_t *sensor)
void debug_print_sensor(CpuSensor *sensor)
{
//CASSERT(sizeof(cpu_sensor_t) == 56, amd_rapl_c);
//CASSERT(sizeof(CpuSensor) == 56, amd_rapl_c);
printf("cpu_id : %d, package_id : %d, core_id : %d, name : %s, fd: %d, energy_units : %d, core_energy: %ld\n",
sensor->cpu_id,
sensor->package_id,
......@@ -185,7 +185,7 @@ void debug_print_sensor(cpu_sensor_t *sensor)
);
}
void debug_print_amd_rapl(_amd_rapl_t *rapl)
void debug_print_amd_rapl(AmdRapl *rapl)
{
for (unsigned int i = 0; i < rapl->sensor_count; i++) {
debug_print_sensor(&rapl->sensors[i]);
......@@ -213,7 +213,7 @@ unsigned int get_nb_cpu()
return n_cpu;
}
void get_arch(unsigned int *ret_nb_package, unsigned int *ret_nb_core, cpu_sensor_t *sensors, unsigned int nb_sensor)
void get_arch(unsigned int *ret_nb_package, unsigned int *ret_nb_core, CpuSensor *sensors, unsigned int nb_sensor)
{
unsigned int nb_package = 0;
unsigned int nb_core = 0;
......@@ -238,7 +238,7 @@ char *get_name(unsigned int cpu_id)
return name;
}
void update_cpu_sensor(cpu_sensor_t *sensor, uint64_t *energy_consumed)
void update_cpu_sensor(CpuSensor *sensor, uint64_t *energy_consumed)
{
sensor->energy_units = read_unit(sensor->fd);
uint64_t raw_core_energy = read_raw_core_energy(sensor->fd);
......@@ -248,7 +248,7 @@ void update_cpu_sensor(cpu_sensor_t *sensor, uint64_t *energy_consumed)
sensor->core_energy = core_energy;
}
unsigned int is_duplicate(cpu_sensor_t *sensor,unsigned int nb_core, unsigned int nb_package, unsigned char map[nb_core][nb_package])
unsigned int is_duplicate(CpuSensor *sensor,unsigned int nb_core, unsigned int nb_package, unsigned char map[nb_core][nb_package])
{
if (map[sensor->core_id][sensor->package_id] == 1) {
return 0;
......@@ -257,7 +257,7 @@ unsigned int is_duplicate(cpu_sensor_t *sensor,unsigned int nb_core, unsigned in
return 1;
}
void init_cpu_sensor(cpu_sensor_t *sensor, cpu_sensor_t *cpu_info)
void init_cpu_sensor(CpuSensor *sensor, CpuSensor *cpu_info)
{
static char filename[BUFFER_SIZE];
snprintf(filename,BUFFER_SIZE, base_str, cpu_info->cpu_id);
......@@ -269,18 +269,18 @@ void init_cpu_sensor(cpu_sensor_t *sensor, cpu_sensor_t *cpu_info)
exit(127);
}
memcpy(sensor, cpu_info, sizeof(cpu_sensor_t));
memcpy(sensor, cpu_info, sizeof(CpuSensor));
sensor->name = get_name(sensor->cpu_id);
sensor->fd = fd;
}
void clean_cpu_sensor(cpu_sensor_t *sensor)
void clean_cpu_sensor(CpuSensor *sensor)
{
close(sensor->fd);
free(sensor->name);
}
void free_amd_rapl(_amd_rapl_t *rapl)
void free_amd_rapl(AmdRapl *rapl)
{
free(rapl->sensors);
free(rapl);
......@@ -299,7 +299,7 @@ unsigned int init_amd_rapl(char *none, void **ptr)
exit(127);
}
cpu_sensor_t *cpu_information = (cpu_sensor_t *) calloc(max_cpus, sizeof(cpu_sensor_t));
CpuSensor *cpu_information = (CpuSensor *) calloc(max_cpus, sizeof(CpuSensor));
if (parse_cpuinfo(cpu_information, max_cpus)) {
free(cpu_information);
PANIC(1, "cpuinfo");
......@@ -311,7 +311,7 @@ unsigned int init_amd_rapl(char *none, void **ptr)
unsigned char cpu_map[nb_core][nb_package];
memset(cpu_map, 0, sizeof(cpu_map));
cpu_sensor_t *sensors = (cpu_sensor_t *) calloc(max_cpus, sizeof(cpu_sensor_t));
CpuSensor *sensors = (CpuSensor *) calloc(max_cpus, sizeof(CpuSensor));
unsigned int sensor_count = 0;
for (unsigned int i = 0; i < max_cpus; i++) {
......@@ -322,7 +322,7 @@ unsigned int init_amd_rapl(char *none, void **ptr)
}
free(cpu_information);
_amd_rapl_t *rapl = (_amd_rapl_t *) calloc(1, sizeof(_amd_rapl_t));
AmdRapl *rapl = (AmdRapl *) calloc(1, sizeof(AmdRapl));
rapl->sensors = sensors;
rapl->sensor_count = sensor_count;
*ptr = (void *) rapl;
......@@ -332,7 +332,7 @@ unsigned int init_amd_rapl(char *none, void **ptr)
unsigned int get_amd_rapl(uint64_t *results, void *ptr)
{
_amd_rapl_t *rapl = (_amd_rapl_t *) ptr;
AmdRapl *rapl = (AmdRapl *) ptr;
for (unsigned int i = 0; i < rapl->sensor_count; i++) {
update_cpu_sensor(&rapl->sensors[i], &results[i]);
}
......@@ -341,7 +341,7 @@ unsigned int get_amd_rapl(uint64_t *results, void *ptr)
void label_amd_rapl(char **labels, void *ptr)
{
_amd_rapl_t *rapl = (_amd_rapl_t *) ptr;
AmdRapl *rapl = (AmdRapl *) ptr;
for (unsigned int i = 0; i < rapl->sensor_count; i++) {
labels[i] = rapl->sensors[i].name;
}
......@@ -349,7 +349,7 @@ void label_amd_rapl(char **labels, void *ptr)
void clean_amd_rapl(void *ptr)
{
_amd_rapl_t *rapl = (_amd_rapl_t *) ptr;
AmdRapl *rapl = (AmdRapl *) ptr;
for (unsigned int i = 0; i < rapl->sensor_count; ++i) {
clean_cpu_sensor(&rapl->sensors[i]);
......
......@@ -30,7 +30,7 @@
#include "util.h"
struct _counter_t {
struct Counter {
int nbcores;
int nbperf;
int **counters;
......@@ -40,7 +40,7 @@ struct _counter_t {
int *perf_indexes;
};
typedef struct _counter_t *counter_t;
typedef struct Counter Counter;
#include "counters_option.h"
......@@ -105,7 +105,7 @@ static long perf_event_open(struct perf_event_attr *hw_event, pid_t pid,
return res;
}
counter_t _init_counters(const int nb_perf, const __u32 *types, const __u64 *names)
Counter *_init_counters(const int nb_perf, const __u32 *types, const __u64 *names)
{
struct perf_event_attr pe;
unsigned int nbcores = sysconf(_SC_NPROCESSORS_ONLN);
......@@ -113,7 +113,7 @@ counter_t _init_counters(const int nb_perf, const __u32 *types, const __u64 *nam
pe.size = sizeof(struct perf_event_attr);
pe.disabled = 1;
counter_t counters = malloc(sizeof(struct _counter_t));
Counter *counters = malloc(sizeof(struct Counter));
counters->nbperf = nb_perf;
counters->nbcores = nbcores;
counters->counters = malloc(nb_perf * sizeof(int *));
......@@ -133,7 +133,7 @@ counter_t _init_counters(const int nb_perf, const __u32 *types, const __u64 *nam
void clean_counters(void *ptr)
{
counter_t counters = (counter_t) ptr;
Counter *counters = (Counter *) ptr;
for (int counter = 0; counter < counters->nbperf; counter++) {
for (int core = 0; core < counters->nbcores; core++) {
......@@ -151,7 +151,7 @@ void clean_counters(void *ptr)
free(counters);
}
void start_counters(counter_t counters)
void start_counters(Counter *counters)
{
for (int counter = 0; counter < counters->nbperf; counter++) {
for (int core = 0; core < counters->nbcores; core++) {
......@@ -160,7 +160,7 @@ void start_counters(counter_t counters)
}
}
void reset_counters(counter_t counters)
void reset_counters(Counter *counters)
{
for (int counter = 0; counter < counters->nbperf; counter++) {
for (int core = 0; core < counters->nbcores; core++) {
......@@ -169,7 +169,7 @@ void reset_counters(counter_t counters)
}
}
void _get_counters(counter_t counters, uint64_t *values)
void _get_counters(Counter *counters, uint64_t *values)
{
for (int i = 0; i < counters->nbperf; i++) {
uint64_t accu = 0;
......@@ -202,7 +202,7 @@ unsigned int init_counters(char *args, void **state)
__u32 *perf_type;
__u64 *perf_key;
perf_type_key(&perf_type, &perf_key, perf_indexes, nb_perf);
counter_t fd = _init_counters(nb_perf, perf_type, perf_key);
Counter *fd = _init_counters(nb_perf, perf_type, perf_key);
free(perf_type);
free(perf_key);
......@@ -218,7 +218,7 @@ unsigned int init_counters(char *args, void **state)
unsigned int get_counters(uint64_t *results, void *ptr)
{
counter_t state = (counter_t) ptr;
Counter *state = (Counter *) ptr;
_get_counters(state, state->tmp_counters_values);
......@@ -232,7 +232,7 @@ unsigned int get_counters(uint64_t *results, void *ptr)
void label_counters(char **labels, void *ptr)
{
counter_t state = (counter_t) ptr;
Counter *state = (Counter *) ptr;
for (int i = 0; i < state->nbperf; i++) {
labels[i] = perf_static_info[state->perf_indexes[i]].name;
......
......@@ -6,13 +6,13 @@
linux_include=/usr/include/linux/perf_event.h
echo '
typedef struct counter_option {
typedef struct CounterOption{
char *name;
__u32 perf_type;
__u64 perf_key;
} counter_option;
} CounterOption;
static counter_option perf_static_info[] = {'
static CounterOption perf_static_info[] = {'
nb=0
......
......@@ -27,11 +27,13 @@
#define NB_SENSOR 4
struct network_t {
struct Network {
uint64_t values[NB_SENSOR];
uint64_t tmp_values[NB_SENSOR];
int sources[NB_SENSOR];
};
typedef struct Network Network;
unsigned int _get_network(uint64_t *results, int *sources);
......@@ -60,7 +62,7 @@ unsigned int init_infiniband(char *infi_path, void **ptr)
"%s/port_xmit_data"
};
struct network_t *state = malloc(sizeof(struct network_t));
Network *state = malloc(sizeof(Network));
char buffer[1024];
for (int i = 0; i < NB_SENSOR; i++) {
......
......@@ -28,11 +28,12 @@
#define NB_SENSOR 4
static char *route = "/proc/net/route";
struct network_t {
struct Network {
uint64_t values[NB_SENSOR];
uint64_t tmp_values[NB_SENSOR];
int sources[NB_SENSOR];
};
typedef struct Network Network;
unsigned int _get_network(uint64_t *results, int *sources)
{
......@@ -92,7 +93,7 @@ unsigned int init_network(char *dev, void **ptr)
"/sys/class/net/%s/statistics/tx_bytes"
};
struct network_t *state = malloc(sizeof(struct network_t));
Network *state = malloc(sizeof(Network));
char buffer2[256];
for (int i = 0; i < NB_SENSOR; i++) {
......@@ -108,7 +109,7 @@ unsigned int init_network(char *dev, void **ptr)
unsigned int get_network(uint64_t *results, void *ptr)
{
struct network_t *state = (struct network_t *) ptr;
Network *state = (Network *) ptr;
_get_network(state->tmp_values, state->sources);
for (int i = 0; i < NB_SENSOR; i++) {
......@@ -121,7 +122,7 @@ unsigned int get_network(uint64_t *results, void *ptr)
void clean_network(void *ptr)
{
struct network_t *state = (struct network_t *) ptr;
Network *state = (Network *) ptr;
if (state == NULL) {
return;
......
......@@ -52,7 +52,7 @@ void test_append(char *name, int i)
}
struct _rapl_t {
struct IntelRapl {
unsigned int nb;
char **names;
int *fids;
......@@ -60,10 +60,10 @@ struct _rapl_t {
uint64_t *tmp_values;
};
typedef struct _rapl_t _rapl_t;
typedef struct IntelRapl IntelRapl;
void add_rapl_source(_rapl_t *rapl, char *name, char *energy_uj)
void add_rapl_source(IntelRapl *rapl, char *name, char *energy_uj)
{
rapl->nb += 1;
rapl->names = realloc(rapl->names, sizeof(char **)*rapl->nb);
......@@ -85,7 +85,7 @@ void add_rapl_source(_rapl_t *rapl, char *name, char *energy_uj)
}
void _get_rapl(uint64_t *values, _rapl_t *rapl)
void _get_rapl(uint64_t *values, IntelRapl *rapl)
{
static char buffer[512];
......@@ -104,7 +104,7 @@ void _get_rapl(uint64_t *values, _rapl_t *rapl)
unsigned int init_rapl(char *none, void **ptr)
{
UNUSED(none);
_rapl_t *rapl = malloc(sizeof(_rapl_t));
IntelRapl *rapl = malloc(sizeof(IntelRapl));
rapl->nb = 0;
rapl->names = NULL;
rapl->fids = NULL;
......@@ -161,7 +161,7 @@ unsigned int init_rapl(char *none, void **ptr)
unsigned int get_rapl(uint64_t *results, void *ptr)
{
_rapl_t *state = (_rapl_t *) ptr;
IntelRapl *state = (IntelRapl *) ptr;
_get_rapl(state->tmp_values, state);
for (unsigned int i = 0; i < state->nb; i++) {
......@@ -174,7 +174,7 @@ unsigned int get_rapl(uint64_t *results, void *ptr)
void clean_rapl(void *ptr)
{
_rapl_t *rapl = (_rapl_t *) ptr;
IntelRapl *rapl = (IntelRapl *) ptr;
for (unsigned int i = 0; i < rapl->nb; i++) {
free(rapl->names[i]);
......@@ -191,7 +191,7 @@ void clean_rapl(void *ptr)
void label_rapl(char **labels, void *ptr)
{
_rapl_t *rapl = (_rapl_t *) ptr;
IntelRapl *rapl = (IntelRapl *) ptr;
for (unsigned int i = 0; i < rapl->nb; i++) {
labels[i] = rapl->names[i];
......
......@@ -26,11 +26,12 @@
#include <stdint.h>
#include "util.h"
struct temperature_t {
struct Temperature {
char **label_list;
int *fid_list;
int nb_elem;
};
typedef struct Temperature Temperature;
int get_string(char *filename, char *buffer, int max_size)
{
......@@ -61,7 +62,7 @@ void add_to_list(char ***list_name, char *source, int nb_elem)
}
void add_temperature_sensor(int id_rep, struct temperature_t *state)
void add_temperature_sensor(int id_rep, Temperature *state)
{
static int key = 0;
static char buffer_filename[512];
......@@ -109,7 +110,7 @@ void add_temperature_sensor(int id_rep, struct temperature_t *state)
unsigned int init_temperature(char *args, void **ptr)
{
UNUSED(args);
struct temperature_t *state = malloc(sizeof(struct temperature_t));
Temperature *state = malloc(sizeof(Temperature));
state->nb_elem = 0;
state->label_list = NULL;
state->fid_list = NULL;
......@@ -136,7 +137,7 @@ unsigned int init_temperature(char *args, void **ptr)
unsigned int get_temperature(uint64_t *results, void *ptr)
{
struct temperature_t *state = (struct temperature_t *)ptr;
Temperature *state = (Temperature *)ptr;
static char buffer[512];
for (int i = 0; i < state->nb_elem; i++) {
......@@ -152,7 +153,7 @@ unsigned int get_temperature(uint64_t *results, void *ptr)
void clean_temperature(void *ptr)
{
struct temperature_t *state = (struct temperature_t *)ptr;
Temperature *state = (Temperature *)ptr;
for (int i = 0; i < state->nb_elem; i++) {
free(state->label_list[i]);
......@@ -166,7 +167,7 @@ void clean_temperature(void *ptr)
void label_temperature(char **labels, void *ptr)
{
struct temperature_t *state = (struct temperature_t *)ptr;
Temperature *state = (Temperature *)ptr;
for (int i = 0; i < state->nb_elem; i++) {
labels[i] = state->label_list[i];
......
......@@ -107,7 +107,7 @@ TFUNCTION(test_get_name, {
#define NONE 0
#define DUMMY_SENSOR(__sensor, __cpu_id, __name) \
do { \
__sensor = (cpu_sensor_t) { \
__sensor = (CpuSensor) { \
.cpu_id = __cpu_id, \
.package_id = NONE, \
.core_id = NONE, \
......@@ -120,15 +120,15 @@ do { \
#define DUMMY_RAPL(__rapl, __sensors, __sensors_count) \
do { \
__rapl = (_amd_rapl_t) { \
__rapl = (AmdRapl) { \
.sensors = __sensors, \
.sensor_count = __sensors_count \
}; \
} while(0);
TFUNCTION(test_label_amd_rapl, {
cpu_sensor_t sensors[100];
_amd_rapl_t rapl;
CpuSensor sensors[100];
AmdRapl rapl;
char *results[100];
char expecteds[10][100];
uint64_t nb = 0;
......@@ -190,7 +190,7 @@ TFUNCTION(test_label_amd_rapl, {
#define DUMMY_CPUINFO(__sensor, __cpu_id, __package_id, __core_id) \
do { \
__sensor = (cpu_sensor_t) { \
__sensor = (CpuSensor) { \
.cpu_id = __cpu_id, \
.package_id = __package_id, \
.core_id = __core_id, \
......@@ -207,13 +207,13 @@ TFUNCTION(test_is_duplicate, {
static const unsigned int max_cpu = 10;
unsigned char map[nb_core][nb_package];
cpu_sensor_t cpu_information[max_cpu];
CpuSensor cpu_information[max_cpu];
unsigned int results[max_cpu];
unsigned int expecteds[max_cpu];
// -- Setup
memset(map, NONE, sizeof(map));
memset(cpu_information,NONE, sizeof(cpu_sensor_t) * max_cpu);
memset(cpu_information,NONE, sizeof(CpuSensor) * max_cpu);
DUMMY_CPUINFO(cpu_information[0], 0, 1, 1);
expecteds[0] = 1;
expecteds[1] = 0;
......@@ -226,7 +226,7 @@ TFUNCTION(test_is_duplicate, {
// -- Setup
memset(map, NONE, sizeof(map));
memset(cpu_information,NONE, sizeof(cpu_sensor_t) * max_cpu);
memset(cpu_information,NONE, sizeof(CpuSensor) * max_cpu);
DUMMY_CPUINFO(cpu_information[0], 0, 1, 1);
DUMMY_CPUINFO(cpu_information[1], 0, 1, 1);
expecteds[0] = 1;
......@@ -240,7 +240,7 @@ TFUNCTION(test_is_duplicate, {
// -- Setup
memset(map, NONE, sizeof(map));
memset(cpu_information,NONE, sizeof(cpu_sensor_t) * max_cpu);
memset(cpu_information,NONE, sizeof(CpuSensor) * max_cpu);
DUMMY_CPUINFO(cpu_information[0], 0, 1, 1);
DUMMY_CPUINFO(cpu_information[1], 0, 0, 0);
expecteds[0] = 1;
......@@ -254,7 +254,7 @@ TFUNCTION(test_is_duplicate, {
// -- Setup
memset(map, NONE, sizeof(map));
memset(cpu_information,NONE, sizeof(cpu_sensor_t) * max_cpu);
memset(cpu_information,NONE, sizeof(CpuSensor) * max_cpu);
DUMMY_CPUINFO(cpu_information[0], 0, 1, 1);
DUMMY_CPUINFO(cpu_information[1], 0, 1, 0);
expecteds[0] = 1;
......@@ -268,7 +268,7 @@ TFUNCTION(test_is_duplicate, {
// -- Setup
memset(map, NONE, sizeof(map));
memset(cpu_information,NONE, sizeof(cpu_sensor_t) * max_cpu);
memset(cpu_information,NONE, sizeof(CpuSensor) * max_cpu);
DUMMY_CPUINFO(cpu_information[0], 0, 1, 1);
DUMMY_CPUINFO(cpu_information[1], 0, 0, 1);
expecteds[0] = 1;
......@@ -282,7 +282,7 @@ TFUNCTION(test_is_duplicate, {
// -- Setup
memset(map, NONE, sizeof(map));
memset(cpu_information,NONE, sizeof(cpu_sensor_t) * max_cpu);
memset(cpu_information,NONE, sizeof(CpuSensor) * max_cpu);
DUMMY_CPUINFO(cpu_information[0], 0, 0, 0);
DUMMY_CPUINFO(cpu_information[1], 0, 0, 1);
DUMMY_CPUINFO(cpu_information[2], 0, 1, 0);
......@@ -317,7 +317,7 @@ TFILE_ENTRY_POINT(test_amd_rapl, {
int main()
{
static const unsigned int time = 10;
_amd_rapl_t *rapl = NULL;
AmdRapl *rapl = NULL;
unsigned int count_cpu = init_amd_rapl(NULL, (void **) &rapl);
uint64_t results[count_cpu];
char *labels[count_cpu];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment