missed api _list convention, cpu_infos -> cpu_info_list

This commit is contained in:
Doug MacEachern committed 2004-07-10 04:44:45 +00:00
1 parent ca3ecc05f5
commit ddc6f4c55c
16 files changed
+72 -68

No files matched your search

+4 -4
View File
@@ -1183,20 +1183,20 @@ static int sigar_get_cpu_mhz(sigar_t *sigar)
return sigar->cpu_mhz;
}
int sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
int i;
int ncpu = _system_configuration.ncpus; /* this can change */
/*XXX should only do this once*/
sigar_cpu_infos_create(cpu_infos);
sigar_cpu_info_list_create(cpu_infos);
for (i=0; i<ncpu; i++) {
sigar_cpu_info_t *info;
char *arch, *model=NULL;
SIGAR_CPU_INFOS_GROW(cpu_infos);
SIGAR_CPU_INFO_LIST_GROW(cpu_infos);
info = &cpu_infos->data[cpu_infos->number++];
+4 -4
View File
@@ -593,17 +593,17 @@ int sigar_file_system_usage_get(sigar_t *sigar,
return SIGAR_OK;
}
int sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
int i;
sigar_cpu_infos_create(cpu_infos);
sigar_cpu_info_list_create(cpu_infos);
for (i=0; i<sigar->ncpu; i++) {
sigar_cpu_info_t *info;
SIGAR_CPU_INFOS_GROW(cpu_infos);
SIGAR_CPU_INFO_LIST_GROW(cpu_infos);
info = &cpu_infos->data[cpu_infos->number++];
+4 -4
View File
@@ -538,8 +538,8 @@ int sigar_file_system_usage_get(sigar_t *sigar,
return SIGAR_OK;
}
int sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
int i;
struct pst_dynamic stats;
@@ -547,7 +547,7 @@ int sigar_cpu_infos_get(sigar_t *sigar,
pstat_getdynamic(&stats, sizeof(stats), 1, 0);
sigar->ncpu = stats.psd_proc_cnt;
sigar_cpu_infos_create(cpu_infos);
sigar_cpu_info_list_create(cpu_infos);
for (i=0; i<sigar->ncpu; i++) {
sigar_cpu_info_t *info;
@@ -558,7 +558,7 @@ int sigar_cpu_infos_get(sigar_t *sigar,
continue;
}
SIGAR_CPU_INFOS_GROW(cpu_infos);
SIGAR_CPU_INFO_LIST_GROW(cpu_infos);
info = &cpu_infos->data[cpu_infos->number++];
+7 -7
View File
@@ -141,13 +141,13 @@ static int is_ht_enabled(sigar_t *sigar)
{
if (sigar->ht_enabled == -1) {
/* only check once */
sigar_cpu_infos_t cpuinfos;
sigar_cpu_info_list_t cpuinfos;
if (sigar_cpu_infos_get(sigar, &cpuinfos) != SIGAR_OK) {
if (sigar_cpu_info_list_get(sigar, &cpuinfos) != SIGAR_OK) {
sigar->ht_enabled = 0; /* chances we reach here: slim..none */
}
sigar_cpu_infos_destroy(sigar, &cpuinfos);
sigar_cpu_info_list_destroy(sigar, &cpuinfos);
}
return sigar->ht_enabled;
@@ -1075,8 +1075,8 @@ static int get_cpu_info(sigar_t *sigar, sigar_cpu_info_t *info,
return found;
}
int sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
FILE *fp;
int id;
@@ -1090,7 +1090,7 @@ int sigar_cpu_infos_get(sigar_t *sigar,
sigar->ht_enabled = 0; /* figure out below */
sigar_cpu_infos_create(cpu_infos);
sigar_cpu_info_list_create(cpu_infos);
memset(&cpu_id[0], -1, sizeof(cpu_id));
while (get_cpu_info(sigar, &cpu_infos->data[cpu_infos->number], fp, &id)) {
@@ -1118,7 +1118,7 @@ int sigar_cpu_infos_get(sigar_t *sigar,
}
++cpu_infos->number;
SIGAR_CPU_INFOS_GROW(cpu_infos);
SIGAR_CPU_INFO_LIST_GROW(cpu_infos);
}
fclose(fp);
+5 -5
View File
@@ -952,8 +952,8 @@ int sigar_file_system_usage_get(sigar_t *sigar,
return SIGAR_OK;
}
int sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
processor_info_t stats;
unsigned int i;
@@ -982,12 +982,12 @@ int sigar_cpu_infos_get(sigar_t *sigar,
return ENOENT;
}
sigar_cpu_infos_create(cpu_infos);
sigar_cpu_info_list_create(cpu_infos);
for (i=0; i<sigar->ncpu; i++) {
sigar_cpu_info_t *info;
SIGAR_CPU_INFOS_GROW(cpu_infos);
SIGAR_CPU_INFO_LIST_GROW(cpu_infos);
info = &cpu_infos->data[cpu_infos->number++];
@@ -1360,4 +1360,4 @@ int sigar_net_interface_stat_get(sigar_t *sigar, const char *name,
int sigar_net_connection_list_get(sigar_t *sigar,
sigar_net_connection_list_t *connlist,
int flags
int flags
+3 -3
View File
@@ -198,12 +198,12 @@ int sigar_file_system_usage_get(sigar_t *sigar,
return SIGAR_OK;
}
int sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
sigar_cpu_info_t *info;
sigar_cpu_infos_create(cpu_infos);
sigar_cpu_info_list_create(cpu_infos);
info = &cpu_infos->data[cpu_infos->number++];
+4 -4
View File
@@ -1360,15 +1360,15 @@ sigar_file_system_usage_get(sigar_t *sigar,
return SIGAR_OK;
}
SIGAR_DECLARE(int) sigar_cpu_infos_get(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
SIGAR_DECLARE(int) sigar_cpu_info_list_get(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
int i, status;
sigar_cpu_info_t *info;
sigar_cpu_count(sigar);
sigar_cpu_infos_create(cpu_infos);
sigar_cpu_info_list_create(cpu_infos);
info = &cpu_infos->data[cpu_infos->number++];
@@ -1380,7 +1380,7 @@ SIGAR_DECLARE(int) sigar_cpu_infos_get(sigar_t *sigar,
if (sigar->ncpu > 1) {
for (i=1; i<sigar->ncpu; i++) {
SIGAR_CPU_INFOS_GROW(cpu_infos);
SIGAR_CPU_INFO_LIST_GROW(cpu_infos);
memcpy(&cpu_infos->data[cpu_infos->number++],
info, sizeof(*info));
+5 -4
View File
@@ -486,7 +486,7 @@ sigar_file_system_list_destroy(sigar_t *sigar,
return SIGAR_OK;
}
int sigar_cpu_infos_create(sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_create(sigar_cpu_info_list_t *cpu_infos)
{
cpu_infos->number = 0;
cpu_infos->size = SIGAR_CPU_INFO_MAX;
@@ -495,7 +495,7 @@ int sigar_cpu_infos_create(sigar_cpu_infos_t *cpu_infos)
return SIGAR_OK;
}
int sigar_cpu_infos_grow(sigar_cpu_infos_t *cpu_infos)
int sigar_cpu_info_list_grow(sigar_cpu_info_list_t *cpu_infos)
{
cpu_infos->data = realloc(cpu_infos->data,
sizeof(*(cpu_infos->data)) *
@@ -505,8 +505,9 @@ int sigar_cpu_infos_grow(sigar_cpu_infos_t *cpu_infos)
return SIGAR_OK;
}
SIGAR_DECLARE(int) sigar_cpu_infos_destroy(sigar_t *sigar,
sigar_cpu_infos_t *cpu_infos)
SIGAR_DECLARE(int)
sigar_cpu_info_list_destroy(sigar_t *sigar,
sigar_cpu_info_list_t *cpu_infos)
{
if (cpu_infos->size) {
free(cpu_infos->data);