8bee2ba9e · cryptotaxi247/netdata-1

src/apps_plugin.c

+1 -1

@@ -2173,7 +2173,7 @@ unsigned long long send_resource_usage_to_netdata() {

2173 gettimeofday(&now, NULL);

2174 getrusage(RUSAGE_SELF, &me);

2175

2176 - usec = usec_dt(&now, &last);

2176 + usec = dt_usec(&now, &last);

2177 cpuuser = me.ru_utime.tv_sec * 1000000ULL + me.ru_utime.tv_usec;

2178 cpusyst = me.ru_stime.tv_sec * 1000000ULL + me.ru_stime.tv_usec;

2179

src/common.c

-6

@@ -207,12 +207,6 @@ inline unsigned long long time_usec(void) {

207 return timeval_usec(&now);

208 }

209

210 -inline unsigned long long usec_dt(struct timeval *now, struct timeval *old) {

211 - unsigned long long tv1 = timeval_usec(now);

212 - unsigned long long tv2 = timeval_usec(old);

213 - return (tv1 > tv2) ? (tv1 - tv2) : (tv2 - tv1);

214 -}

215 -

210 int sleep_usec(unsigned long long usec) {

211

212 #ifndef NETDATA_WITH_USLEEP

src/common.h

-4

@@ -146,10 +146,6 @@

146 #endif

147 #define abs(x) ((x < 0)? -x : x)

148

149 -extern unsigned long long usec_dt(struct timeval *now, struct timeval *old);

150 -

151 -// #define usec_dt(now, last) (((((now)->tv_sec * 1000000ULL) + (now)->tv_usec) - (((last)->tv_sec * 1000000ULL) + (last)->tv_usec)))

152 -

149 extern void netdata_fix_chart_id(char *s);

150 extern void netdata_fix_chart_name(char *s);

151

src/plugin_checks.c

+4 -4

@@ -36,7 +36,7 @@ void *checks_main(void *ptr)

36

37 // find the time to sleep in order to wait exactly update_every seconds

38 gettimeofday(&now, NULL);

39 - loop_usec = usec_dt(&now, &last);

39 + loop_usec = dt_usec(&now, &last);

40 usec = loop_usec - susec;

41 debug(D_PROCNETDEV_LOOP, "CHECK: last loop took %llu usec (worked for %llu, sleeped for %llu).", loop_usec, usec, susec);

42

@@ -72,9 +72,9 @@ void *checks_main(void *ptr)

72 if(!apps_cpu) apps_cpu = rrdset_find("apps.cpu");

73 if(check3->counter_done) rrdset_next_usec(check3, loop_usec);

74 gettimeofday(&loop, NULL);

75 - rrddim_set(check3, "caller", (long long) usec_dt(&loop, &check1->last_collected_time));

76 - rrddim_set(check3, "netdata", (long long) usec_dt(&loop, &check2->last_collected_time));

77 - if(apps_cpu) rrddim_set(check3, "apps.plugin", (long long) usec_dt(&loop, &apps_cpu->last_collected_time));

75 + rrddim_set(check3, "caller", (long long) dt_usec(&loop, &check1->last_collected_time));

76 + rrddim_set(check3, "netdata", (long long) dt_usec(&loop, &check2->last_collected_time));

77 + if(apps_cpu) rrddim_set(check3, "apps.plugin", (long long) dt_usec(&loop, &apps_cpu->last_collected_time));

78 rrdset_done(check3);

79 }

80

src/plugin_idlejitter.c

+1 -1

@@ -38,7 +38,7 @@ void *cpuidlejitter_main(void *ptr)

38 gettimeofday(&after, NULL);

39

40 // calculate the time it took for a full loop

41 - usec = usec_dt(&after, &before);

41 + usec = dt_usec(&after, &before);

42 susec += usec;

43 }

44 usec -= (sleep_ms * 1000);

src/plugin_nfacct.c

+1 -1

@@ -132,7 +132,7 @@ void *nfacct_main(void *ptr) {

132 // --------------------------------------------------------------------

133

134 gettimeofday(&now, NULL);

135 - usec = usec_dt(&now, &last) - susec;

135 + usec = dt_usec(&now, &last) - susec;

136 debug(D_NFACCT_LOOP, "nfacct.plugin: last loop took %llu usec (worked for %llu, sleeped for %llu).", usec + susec, usec, susec);

137

138 if(usec < (rrd_update_every * 1000000ULL / 2ULL)) susec = (rrd_update_every * 1000000ULL) - usec;

src/plugins_d.c

+1 -1

@@ -348,7 +348,7 @@ void *pluginsd_worker_thread(void *arg)

348 }

349 else {

350 // second+ run

351 - usec = usec_dt(&now, &last) - susec;

351 + usec = dt_usec(&now, &last) - susec;

352 error("PLUGINSD: %s last loop took %llu usec (worked for %llu, sleeped for %llu).\n", cd->fullfilename, usec + susec, usec, susec);

353 if(unlikely(usec < (rrd_update_every * 1000000ULL / 2ULL))) susec = (rrd_update_every * 1000000ULL) - usec;

354 else susec = rrd_update_every * 1000000ULL / 2ULL;

src/rrd.c

+4 -4

@@ -685,7 +685,7 @@ RRDDIM *rrddim_add(RRDSET *st, const char *id, const char *name, long multiplier

685 error("File %s does not have the same refresh frequency. Clearing it.", fullfilename);

686 memset(rd, 0, size);

687 }

688 - else if(usec_dt(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * 1000000ULL)) {

688 + else if(dt_usec(&now, &rd->last_collected_time) > (rd->entries * rd->update_every * 1000000ULL)) {

689 errno = 0;

690 error("File %s is too old. Clearing it.", fullfilename);

691 memset(rd, 0, size);

@@ -1018,13 +1018,13 @@ void rrdset_next_usec(RRDSET *st, unsigned long long microseconds)

1018 }

1019 else if(unlikely(!microseconds)) {

1020 // no dt given by the plugin

1021 - microseconds = usec_dt(&now, &st->last_collected_time);

1021 + microseconds = dt_usec(&now, &st->last_collected_time);

1022 }

1023 else {

1024 // microseconds has the time since the last collection

1025 unsigned long long now_usec = timeval_usec(&now);

1026 unsigned long long last_usec = timeval_usec(&st->last_collected_time);

1027 - unsigned long long since_last_usec = usec_dt(&now, &st->last_collected_time);

1027 + unsigned long long since_last_usec = dt_usec(&now, &st->last_collected_time);

1028

1029 // verify the microseconds given is good

1030 if(unlikely(microseconds > since_last_usec)) {

@@ -1139,7 +1139,7 @@ unsigned long long rrdset_done(RRDSET *st)

1139 }

1140

1141 // check if we will re-write the entire data set

1142 - if(unlikely(usec_dt(&st->last_collected_time, &st->last_updated) > st->entries * update_every_ut)) {

1142 + if(unlikely(dt_usec(&st->last_collected_time, &st->last_updated) > st->entries * update_every_ut)) {

1143 info("%s: too old data (last updated at %ld.%ld, last collected at %ld.%ld). Reseting it. Will not store the next entry.", st->name, st->last_updated.tv_sec, st->last_updated.tv_usec, st->last_collected_time.tv_sec, st->last_collected_time.tv_usec);

1144 rrdset_reset(st);

1145

src/web_client.c

+4 -4

@@ -136,7 +136,7 @@ void web_client_reset(struct web_client *w) {

136 // --------------------------------------------------------------------

137 // global statistics

138

139 - finished_web_request_statistics(usec_dt(&tv, &w->tv_in),

139 + finished_web_request_statistics(dt_usec(&tv, &w->tv_in),

140 w->stats_received_bytes,

141 w->stats_sent_bytes,

142 size,

@@ -152,9 +152,9 @@ void web_client_reset(struct web_client *w) {

152 log_access("%llu: (sent/all = %zu/%zu bytes %0.0f%%, prep/sent/total = %0.2f/%0.2f/%0.2f ms) %s: %d '%s'",

153 w->id,

154 sent, size, -((size > 0) ? ((size - sent) / (double) size * 100.0) : 0.0),

155 - usec_dt(&w->tv_ready, &w->tv_in) / 1000.0,

156 - usec_dt(&tv, &w->tv_ready) / 1000.0,

157 - usec_dt(&tv, &w->tv_in) / 1000.0,

155 + dt_usec(&w->tv_ready, &w->tv_in) / 1000.0,

156 + dt_usec(&tv, &w->tv_ready) / 1000.0,

157 + dt_usec(&tv, &w->tv_in) / 1000.0,

158 (w->mode == WEB_CLIENT_MODE_FILECOPY) ? "filecopy" : ((w->mode == WEB_CLIENT_MODE_OPTIONS)

159 ? "options" : "data"),

160 w->response.code,

replace `usec_dt()` calls by `dt_usec()`