Skip to content

Commit

Permalink
make the code better part1
Browse files Browse the repository at this point in the history
  • Loading branch information
@npyl
npyl committed Jan 10, 2018
1 parent 03c9591 commit 367a19d
Showing 1 changed file with 20 additions and 163 deletions.
183 changes: 20 additions & 163 deletions src/darwin.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
#include <mach/mach_types.h>
#include <mach/mach_init.h>
#include <mach/mach_host.h>
#include <mach/machine.h>

#include <mach/mach.h> // update_total_processes

Expand Down Expand Up @@ -571,23 +572,7 @@ void get_cpu_count(void)
*
* XXX will be merged into cpusample probably
*/
#define CPU_SAMPLE_COUNT 15
struct cpu_info {
/* linux compatibility */
unsigned long long cpu_user;
unsigned long long cpu_system;
unsigned long long cpu_nice;
unsigned long long cpu_idle;
unsigned long long cpu_iowait;
unsigned long long cpu_irq;
unsigned long long cpu_softirq;
unsigned long long cpu_steal;
unsigned long long cpu_total;
unsigned long long cpu_active_total;
unsigned long long cpu_last_total;
unsigned long long cpu_last_active_total;
double cpu_val[CPU_SAMPLE_COUNT];

/* freebsd compatibility */
long oldtotal;
long oldused;
Expand All @@ -598,93 +583,13 @@ int update_cpu_usage(void)
static bool
cpu_setup = 0;

// int i, j = 0;
long used, total;
long *cp_time = NULL;
size_t cp_len;
static struct cpu_info *cpu = NULL;
unsigned int malloc_cpu_size = 0;
extern void* global_cpu;

/* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */
if ((cpu_setup == 0) || (!info.cpu_usage))
{
get_cpu_count();
cpu_setup = 1;
}

if (!global_cpu)
{
/*
* Allocate ncpus+1 slots because cpu_usage[0] is overall usage.
*/
malloc_cpu_size = (info.cpu_count + 1) * sizeof(struct cpu_info);
cpu = (cpu_info *) malloc(malloc_cpu_size);
memset(cpu, 0, malloc_cpu_size);
global_cpu = cpu;
}

// XXX for now
#define CPUSTATES 4
#define CP_IDLE 0

/* cpu[0] is overall stats, get it from separate sysctl */
cp_len = CPUSTATES * sizeof(long);
cp_time = (long int *) malloc(cp_len);
//
//if (sysctlbyname("kern.cp_time", cp_time, &cp_len, NULL, 0) < 0) {
// fprintf(stderr, "Cannot get kern.cp_time\n");
//}

//total = 0;
//for (j = 0; j < CPUSTATES; j++)
// total += cp_time[j];

struct cpusample sample;
get_cpu_sample(&sample);
total = sample.totalUserTime + sample.totalIdleTime + sample.totalSystemTime;
cp_time[CP_IDLE] = sample.totalIdleTime;

used = total - cp_time[CP_IDLE];

if ((total - cpu[0].oldtotal) != 0) {
info.cpu_usage[0] = ((double) (used - cpu[0].oldused)) /
(double) (total - cpu[0].oldtotal);
} else {
info.cpu_usage[0] = 0;
}

cpu[0].oldused = used;
cpu[0].oldtotal = total;

free(cp_time);

/*
* I cut the per-cpu stats from here...
*/

return 0;
}

int update_cpu_usage2(void)
{
/* OPENMP support: NO */

static bool
cpu_setup = false;

int i;
unsigned int idx;
double curtmp;

static struct cpu_info*
cpu = NULL;
unsigned int
malloc_cpu_size = 0;
extern void*
global_cpu;


static pthread_mutex_t last_stat_update_mutex = PTHREAD_MUTEX_INITIALIZER;
static double last_stat_update = 0.0;

Expand All @@ -699,88 +604,40 @@ int update_cpu_usage2(void)
last_stat_update = current_update_time;
pthread_mutex_unlock(&last_stat_update_mutex);


/*
* add check for !info.cpu_usage since that mem is freed on a SIGUSR1
*/
if (!cpu_setup || !info.cpu_usage) {

/*
* call get_cpu_count() to calculate number of cpus (ofcourse) and
* allocate the info.cpu_usage variable
*/
/* add check for !info.cpu_usage since that mem is freed on a SIGUSR1 */
if ((cpu_setup == 0) || (!info.cpu_usage))
{
get_cpu_count();

/*
* don't come into here again unless SIGUSR1
*/
cpu_setup = true;
cpu_setup = 1;
}

if (!global_cpu) {
if (!global_cpu)
{
/*
* Allocate ncpus+1 slots because cpu_usage[0] is overall usage.
*/
malloc_cpu_size = (info.cpu_count + 1) * sizeof(struct cpu_info);
cpu = (struct cpu_info *)malloc(malloc_cpu_size);
cpu = (cpu_info *) malloc(malloc_cpu_size);
memset(cpu, 0, malloc_cpu_size);
global_cpu = cpu;
}

double delta;

/*
if (isdigit(buf[3])) {
idx = atoi(&buf[3]) + 1;
} else {
idx = 0;
} */

/*
* get current iteration sample
*/
struct cpusample sample;
get_cpu_sample(&sample);

cpu[idx].cpu_system = sample.totalSystemTime;
cpu[idx].cpu_user = sample.totalUserTime;
cpu[idx].cpu_idle = sample.totalIdleTime;

// XXX check for the NICE problem

cpu[idx].cpu_total = cpu[idx].cpu_user + cpu[idx].cpu_nice +
cpu[idx].cpu_system + cpu[idx].cpu_idle +
cpu[idx].cpu_iowait + cpu[idx].cpu_irq +
cpu[idx].cpu_softirq + cpu[idx].cpu_steal;

cpu[idx].cpu_active_total = cpu[idx].cpu_total - (cpu[idx].cpu_idle + cpu[idx].cpu_iowait);

delta = current_update_time - last_update_time;

if (delta <= 0.001) {
return 0;
}

cpu[idx].cpu_val[0] = (cpu[idx].cpu_active_total - cpu[idx].cpu_last_active_total) / (float) (cpu[idx].cpu_total - cpu[idx].cpu_last_total);
curtmp = 0;
total = sample.totalUserTime + sample.totalIdleTime + sample.totalSystemTime;
used = total - sample.totalIdleTime;

int samples = cpu_avg_samples.get(*state);
#ifdef HAVE_OPENMP
#pragma omp parallel for reduction(+:curtmp) schedule(dynamic,10)
#endif /* HAVE_OPENMP */
for (i = 0; i < samples; i++)
if ((total - cpu[0].oldtotal) != 0)
{
curtmp = curtmp + cpu[idx].cpu_val[i];
info.cpu_usage[0] = ((double) (used - cpu[0].oldused)) / (double) (total - cpu[0].oldtotal);
}
info.cpu_usage[idx] = curtmp / samples;

cpu[idx].cpu_last_total = cpu[idx].cpu_total;
cpu[idx].cpu_last_active_total = cpu[idx].cpu_active_total;
#ifdef HAVE_OPENMP
#pragma omp parallel for schedule(dynamic,10)
#endif /* HAVE_OPENMP */
for (i = samples - 1; i > 0; i--)
else
{
cpu[idx].cpu_val[i] = cpu[idx].cpu_val[i - 1];
info.cpu_usage[0] = 0;
}

cpu[0].oldused = used;
cpu[0].oldtotal = total;

return 0;
}

Expand Down

0 comments on commit 367a19d

Please sign in to comment.