libbpf-tools: trace_helpers: add str_loadavg() and str_timestamp()

There are many tools read /proc/loadavg and timestamp, this commit add two
common function str_loadavg() and str_timestamp().

And fix bashreadline timestamp's wrong format, %m is month, should be %M (min).

Signed-off-by: Rong Tao <[email protected]>

Author: Rtoax

libbpf-tools/bashreadline.c

@@ -74,13 +74,9 @@ static int libbpf_print_fn(enum libbpf_print_level level, const char *format, va
 static void handle_event(void *ctx, int cpu, void *data, __u32 data_size)
 {
 	struct str_t *e = data;
-	struct tm *tm;
 	char ts[16];
-	time_t t;
 
-	time(&t);
-	tm = localtime(&t);
-	strftime(ts, sizeof(ts), "%H:%m:%S", tm);
+	str_timestamp("%H:%M:%S", ts, sizeof(ts));
 
 	printf("%-9s %-7d %s\n", ts, e->pid, e->str);
 }

libbpf-tools/bindsnoop.c

@@ -142,17 +142,13 @@ static void sig_int(int signo)
 static void handle_event(void *ctx, int cpu, void *data, __u32 data_sz)
 {
 	struct bind_event *e = data;
-	time_t t;
-	struct tm *tm;
 	char ts[32], addr[48];
 	char opts[] = {'F', 'T', 'N', 'R', 'r', '\0'};
 	const char *proto;
 	int i = 0;
 
 	if (emit_timestamp) {
-		time(&t);
-		tm = localtime(&t);
-		strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+		str_timestamp("%H:%M:%S", ts, sizeof(ts));
 		printf("%8s ", ts);
 	}
 	if (e->proto == IPPROTO_TCP)

libbpf-tools/biolatency.c

@@ -277,9 +277,7 @@ int main(int argc, char **argv)
 		.doc = argp_program_doc,
 	};
 	struct biolatency_bpf *obj;
-	struct tm *tm;
 	char ts[32];
-	time_t t;
 	int err;
 	int idx, cg_map_fd;
 	int cgfd = -1;
@@ -370,9 +368,7 @@ int main(int argc, char **argv)
 		printf("\n");
 
 		if (env.timestamp) {
-			time(&t);
-			tm = localtime(&t);
-			strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+			str_timestamp("%H:%M:%S", ts, sizeof(ts));
 			printf("%-8s\n", ts);
 		}
 

libbpf-tools/biopattern.c

@@ -116,9 +116,7 @@ static int print_map(struct bpf_map *counters, struct partitions *partitions)
 	int err, fd = bpf_map__fd(counters);
 	const struct partition *partition;
 	struct counter counter;
-	struct tm *tm;
 	char ts[32];
-	time_t t;
 
 	while (!bpf_map_get_next_key(fd, &lookup_key, &next_key)) {
 		err = bpf_map_lookup_elem(fd, &next_key, &counter);
@@ -131,9 +129,7 @@ static int print_map(struct bpf_map *counters, struct partitions *partitions)
 		if (!total)
 			continue;
 		if (env.timestamp) {
-			time(&t);
-			tm = localtime(&t);
-			strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+			str_timestamp("%H:%M:%S", ts, sizeof(ts));
 			printf("%-9s ", ts);
 		}
 		partition = partitions__get_by_dev(partitions, next_key);

libbpf-tools/biosnoop.c

@@ -180,7 +180,6 @@ void handle_event(void *ctx, int cpu, void *data, __u32 data_sz)
 	struct event e;
 	char rwbs[RWBS_LEN];
 	struct timespec ct;
-	struct tm *tm;
 	char ts[32];
 
         if (data_sz < sizeof(e)) {
@@ -194,8 +193,7 @@ void handle_event(void *ctx, int cpu, void *data, __u32 data_sz)
 		/* Since `bpf_ktime_get_boot_ns` requires at least 5.8 kernel,
 		 * so get time from usespace instead */
 		clock_gettime(CLOCK_REALTIME, &ct);
-		tm = localtime(&ct.tv_sec);
-		strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+		str_timestamp("%H:%M:%S", ts, sizeof(ts));
 		printf("%-8s.%03ld ", ts, ct.tv_nsec / 1000000);
 	} else {
 		if (!start_ts) {

libbpf-tools/biotop.c

@@ -301,24 +301,15 @@ static int read_stat(struct biotop_bpf *obj, struct data_t *datas, __u32 *count)
 
 static int print_stat(struct biotop_bpf *obj)
 {
-	FILE *f;
-	time_t t;
-	struct tm *tm;
-	char ts[16], buf[256];
+	char loadavg[256], ts[64];
 	static struct data_t datas[OUTPUT_ROWS_LIMIT];
-	int n, i, err = 0, rows = OUTPUT_ROWS_LIMIT;
-
-	f = fopen("/proc/loadavg", "r");
-	if (f) {
-		time(&t);
-		tm = localtime(&t);
-		strftime(ts, sizeof(ts), "%H:%M:%S", tm);
-		memset(buf, 0, sizeof(buf));
-		n = fread(buf, 1, sizeof(buf), f);
-		if (n)
-			printf("%8s loadavg: %s\n", ts, buf);
-		fclose(f);
-	}
+	int i, err = 0, rows = OUTPUT_ROWS_LIMIT;
+
+	err = str_loadavg(loadavg, sizeof(loadavg)) <= 0;
+	err = err ?: (str_timestamp("%H:%M:%S", ts, sizeof(ts)) <= 0);
+	if (!err)
+		printf("%8s %s\n", ts, loadavg);
+
 	printf("%-7s %-16s %1s %-3s %-3s %-8s %5s %7s %6s\n",
 	       "PID", "COMM", "D", "MAJ", "MIN", "DISK", "I/O", "Kbytes", "AVGms");
 

libbpf-tools/bitesize.c

@@ -158,10 +158,8 @@ int main(int argc, char **argv)
 		.doc = argp_program_doc,
 	};
 	struct bitesize_bpf *obj;
-	struct tm *tm;
 	char ts[32];
 	int fd, err;
-	time_t t;
 
 	err = argp_parse(&argp, argc, argv, 0, NULL, NULL);
 	if (err)
@@ -218,9 +216,7 @@ int main(int argc, char **argv)
 		printf("\n");
 
 		if (env.timestamp) {
-			time(&t);
-			tm = localtime(&t);
-			strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+			str_timestamp("%H:%M:%S", ts, sizeof(ts));
 			printf("%-8s\n", ts);
 		}
 

libbpf-tools/cachestat.c

@@ -132,10 +132,8 @@ int main(int argc, char **argv)
 	__u64 buffers, cached, mbd;
 	struct cachestat_bpf *obj;
 	__s64 total, misses, hits;
-	struct tm *tm;
 	float ratio;
 	char ts[32];
-	time_t t;
 	int err;
 
 	err = argp_parse(&argp, argc, argv, 0, NULL, NULL);
@@ -262,9 +260,7 @@ int main(int argc, char **argv)
 			goto cleanup;
 		}
 		if (env.timestamp) {
-			time(&t);
-			tm = localtime(&t);
-			strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+			str_timestamp("%H:%M:%S", ts, sizeof(ts));
 			printf("%-8s ", ts);
 		}
 		printf("%8lld %8lld %8llu %7.2f%% %12llu %10llu\n",

libbpf-tools/capable.c

@@ -278,13 +278,9 @@ static void print_map(struct ksyms *ksyms, struct syms_cache *syms_cache)
 static void handle_event(void *ctx, int cpu, void *data, __u32 data_sz)
 {
 	const struct cap_event *e = data;
-	struct tm *tm;
 	char ts[32];
-	time_t t;
 
-	time(&t);
-	tm = localtime(&t);
-	strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+	str_timestamp("%H:%M:%S", ts, sizeof(ts));
 
 	char *verdict = "deny";
 	if (!e->ret)

libbpf-tools/cpudist.c

@@ -198,9 +198,7 @@ int main(int argc, char **argv)
 	};
 	struct cpudist_bpf *obj;
 	int pid_max, fd, err;
-	struct tm *tm;
 	char ts[32];
-	time_t t;
 	int idx, cg_map_fd;
 	int cgfd = -1;
 
@@ -280,9 +278,7 @@ int main(int argc, char **argv)
 		printf("\n");
 
 		if (env.timestamp) {
-			time(&t);
-			tm = localtime(&t);
-			strftime(ts, sizeof(ts), "%H:%M:%S", tm);
+			str_timestamp("%H:%M:%S", ts, sizeof(ts));
 			printf("%-8s\n", ts);
 		}