Skip to content

Commit faac42e

Browse files
committed
Change print style
Use make format
1 parent bf252e5 commit faac42e

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

analyzer.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
#include "analyzer.h"
22
#include "cputracker.h"
3-
#include <stdlib.h>
4-
#include <unistd.h>
53

6-
unsigned long average_cpu_usage(struct proc_stat prev, struct proc_stat current) {
4+
unsigned long average_cpu_usage(struct proc_stat prev,
5+
struct proc_stat current) {
76
unsigned long prevIdle = prev.idle + prev.iowait;
87
unsigned long idle = current.idle + current.iowait;
98

109
unsigned long prevNonIdle = prev.user + prev.nice + prev.system + prev.irq +
11-
prev.softirq + prev.steal;
12-
unsigned long nonIdle = current.user + current.nice + current.system + current.irq +
13-
current.softirq + current.steal;
10+
prev.softirq + prev.steal;
11+
unsigned long nonIdle = current.user + current.nice + current.system +
12+
current.irq + current.softirq + current.steal;
1413

1514
unsigned long prevTotal = prevIdle + prevNonIdle;
1615
unsigned long total = idle + nonIdle;
@@ -47,7 +46,7 @@ void *analyzer() {
4746
pthread_mutex_lock(&g_printBufferMutex);
4847

4948
unsigned long *bufforAvg = get_item_from_print_buffer();
50-
memcpy(bufforAvg, avg, g_nproc*sizeof(unsigned long));
49+
memcpy(bufforAvg, avg, g_nproc * sizeof(unsigned long));
5150

5251
pthread_mutex_unlock(&g_printBufferMutex);
5352

cputracker.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
#include "cputracker.h"
22
#include "analyzer.h"
3-
#include "reader.h"
43
#include "printer.h"
4+
#include "reader.h"
55

66
int g_nproc = 0;
77
struct proc_stat *g_dataBuffer[BUFFER_SIZE];
88
pthread_mutex_t g_dataBufferMutex = PTHREAD_MUTEX_INITIALIZER;
99
sem_t g_dataFilledSpaceSemaphore;
1010
sem_t g_dataLeftSpaceSemaphore;
1111

12-
1312
unsigned long *g_printBuffer[BUFFER_SIZE];
1413
pthread_mutex_t g_printBufferMutex = PTHREAD_MUTEX_INITIALIZER;
1514
sem_t g_printFilledSpaceSemaphore;

cputracker.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ extern pthread_mutex_t g_dataBufferMutex;
3939
extern sem_t g_dataFilledSpaceSemaphore;
4040
extern sem_t g_dataLeftSpaceSemaphore;
4141

42-
4342
extern unsigned long *g_printBuffer[BUFFER_SIZE];
4443
extern pthread_mutex_t g_printBufferMutex;
4544
extern sem_t g_printFilledSpaceSemaphore;

printer.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ void *printer() {
88
pthread_mutex_lock(&g_printBufferMutex);
99

1010
system("clear");
11+
1112
avg = get_item_from_print_buffer();
13+
14+
printf("CORE\t%%\n");
1215
for (int i = 0; i < g_nproc; i++) {
13-
printf("[%d]: \033[38;2;%lu;%lu;0m%lu\033[0m\n", i,avg[i]*5/2,255-avg[i]*5/2, avg[i]);
16+
printf("[%2d]: \033[38;2;%lu;%lu;0m%3lu\033[0m\n", i, avg[i] * 5 / 2,
17+
255 - avg[i] * 5 / 2, avg[i]);
1418
}
1519

1620
pthread_mutex_unlock(&g_printBufferMutex);

0 commit comments

Comments
 (0)