@cryptotaxi247 / netdata-1 / commits / becfbec99

replace `time_usec()` calls by `now_realtime_usec()`

Signed-off-by: Rémi Lefèvre <remi.lefevre@parrot.com>

Rémi Lefèvre committed Dec 9, 2016 at 09:40 UTC becfbec9998a861afddc10e355a8cd4b184d5bed

7 files changed +41 -52

src/apps_plugin.c

+5 -5

@@ -592,7 +592,7 @@ int read_proc_pid_stat(struct pid_stat *p) {

592 if(unlikely(!ff)) goto cleanup;

593

594 p->last_stat_collected_usec = p->stat_collected_usec;

595 - p->stat_collected_usec = time_usec();

595 + p->stat_collected_usec = now_realtime_usec();

596 file_counter++;

597

598 // p->pid = atol(procfile_lineword(ff, 0, 0+i));

@@ -774,7 +774,7 @@ int read_proc_pid_io(struct pid_stat *p) {

774 file_counter++;

775

776 p->last_io_collected_usec = p->io_collected_usec;

777 - p->io_collected_usec = time_usec();

777 + p->io_collected_usec = now_realtime_usec();

778

779 unsigned long long last;

780

@@ -848,7 +848,7 @@ int read_proc_stat() {

848 if(unlikely(!ff)) goto cleanup;

849

850 last_collected_usec = collected_usec;

851 - collected_usec = time_usec();

851 + collected_usec = now_realtime_usec();

852

853 file_counter++;

854

@@ -2843,12 +2843,12 @@ int main(int argc, char **argv)

2843 unsigned long long step = update_every * 1000000ULL;

2844 global_iterations_counter = 1;

2845 for(;1; global_iterations_counter++) {

2846 - unsigned long long now = time_usec();

2846 + unsigned long long now = now_realtime_usec();

2847 unsigned long long next = now - (now % step) + step;

2848

2849 while(now < next) {

2850 sleep_usec(next - now);

2851 - now = time_usec();

2851 + now = now_realtime_usec();

2852 }

2853

2854 if(!collect_data_for_all_processes_from_proc()) {

src/backends.c

+8 -8

@@ -396,8 +396,8 @@ void *backends_main(void *ptr) {

396 info("BACKEND configured ('%s' on '%s' sending '%s' data, every %d seconds, as host '%s', with prefix '%s')", type, destination, source, frequency, hostname, prefix);

397

398 unsigned long long step_ut = frequency * 1000000ULL;

399 - unsigned long long random_ut = time_usec() % (step_ut / 2);

400 - time_t before = (time_t)((time_usec() - step_ut) / 10000000ULL);

399 + unsigned long long random_ut = now_realtime_usec() % (step_ut / 2);

400 + time_t before = (time_t)((now_realtime_usec() - step_ut) / 10000000ULL);

401 time_t after = before;

402 int failures = 0;

403

@@ -405,7 +405,7 @@ void *backends_main(void *ptr) {

405 // ------------------------------------------------------------------------

406 // wait for the next iteration point

407

408 - unsigned long long now_ut = time_usec();

408 + unsigned long long now_ut = now_realtime_usec();

409 unsigned long long next_ut = now_ut - (now_ut % step_ut) + step_ut;

410 before = (time_t)(next_ut / 1000000ULL);

411

@@ -414,7 +414,7 @@ void *backends_main(void *ptr) {

414

415 while(now_ut < next_ut) {

416 sleep_usec(next_ut - now_ut);

417 - now_ut = time_usec();

417 + now_ut = now_realtime_usec();

418 }

419

420 // ------------------------------------------------------------------------

@@ -465,7 +465,7 @@ void *backends_main(void *ptr) {

465 // connect to a backend server

466

467 if(unlikely(sock == -1)) {

468 - unsigned long long start_ut = time_usec();

468 + unsigned long long start_ut = now_realtime_usec();

469 const char *s = destination;

470 while(*s) {

471 const char *e = s;

@@ -486,7 +486,7 @@ void *backends_main(void *ptr) {

486 if(sock != -1) break;

487 s = e;

488 }

489 - chart_backend_latency += time_usec() - start_ut;

489 + chart_backend_latency += now_realtime_usec() - start_ut;

490 }

491

492 if(unlikely(netdata_exit)) break;

@@ -496,13 +496,13 @@ void *backends_main(void *ptr) {

496

497 if(likely(sock != -1)) {

498 size_t len = buffer_strlen(b);

499 - unsigned long long start_ut = time_usec();

499 + unsigned long long start_ut = now_realtime_usec();

500 int flags = 0;

501 #ifdef MSG_NOSIGNAL

502 flags += MSG_NOSIGNAL;

503 #endif

504 ssize_t written = send(sock, buffer_tostring(b), len, flags);

505 - chart_backend_latency += time_usec() - start_ut;

505 + chart_backend_latency += now_realtime_usec() - start_ut;

506 if(written != -1 && (size_t)written == len) {

507 // we sent the data successfully

508 chart_transmission_successes++;

src/common.c

-10

@@ -197,16 +197,6 @@ void freez(void *ptr) {

197 free(ptr);

198 }

199

200 -// ----------------------------------------------------------------------------

201 -// time functions

202 -

203 -// time(NULL) in nanoseconds

204 -inline unsigned long long time_usec(void) {

205 - struct timeval now;

206 - gettimeofday(&now, NULL);

207 - return timeval_usec(&now);

208 -}

209 -

200 int sleep_usec(unsigned long long usec) {

201

202 #ifndef NETDATA_WITH_USLEEP

src/common.h

-1

@@ -191,7 +191,6 @@ extern int enable_ksm;

191

192 extern pid_t gettid(void);

193

194 -extern unsigned long long time_usec(void);

194 extern int sleep_usec(unsigned long long usec);

195

196 extern char *fgets_trim_len(char *buf, size_t buf_size, FILE *fp, size_t *len);

src/plugin_freebsd.c

+3 -3

@@ -27,12 +27,12 @@ void *freebsd_main(void *ptr)

28 unsigned long long step = rrd_update_every * 1000000ULL;

29 for(;;) {

30 - unsigned long long now = time_usec();

30 + unsigned long long now = now_realtime_usec();

31 unsigned long long next = now - (now % step) + step;

33 while(now < next) {

34 sleep_usec(next - now);

35 - now = time_usec();

35 + now = now_realtime_usec();

36 }

38 if(unlikely(netdata_exit)) break;

@@ -41,7 +41,7 @@ void *freebsd_main(void *ptr)

42 if(!vdo_freebsd_sysctl) {

43 debug(D_PROCNETDEV_LOOP, "FREEBSD: calling do_freebsd_sysctl().");

44 - now = time_usec();

44 + now = now_realtime_usec();

45 vdo_freebsd_sysctl = do_freebsd_sysctl(rrd_update_every, (sutime_freebsd_sysctl > 0)?now - sutime_freebsd_sysctl:0ULL);

46 sutime_freebsd_sysctl = now;

47 }

src/plugin_proc.c

+22 -22

@@ -63,12 +63,12 @@ void *proc_main(void *ptr)

64 unsigned long long step = rrd_update_every * 1000000ULL;

65 for(;;) {

66 - unsigned long long now = time_usec();

66 + unsigned long long now = now_realtime_usec();

67 unsigned long long next = now - (now % step) + step;

69 while(now < next) {

70 sleep_usec(next - now);

71 - now = time_usec();

71 + now = now_realtime_usec();

72 }

74 if(unlikely(netdata_exit)) break;

@@ -78,7 +78,7 @@ void *proc_main(void *ptr)

78 if(!vdo_sys_kernel_mm_ksm) {

79 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_sys_kernel_mm_ksm().");

81 - now = time_usec();

81 + now = now_realtime_usec();

82 vdo_sys_kernel_mm_ksm = do_sys_kernel_mm_ksm(rrd_update_every, (sutime_sys_kernel_mm_ksm > 0)?now - sutime_sys_kernel_mm_ksm:0ULL);

83 sutime_sys_kernel_mm_ksm = now;

84 }

@@ -86,7 +86,7 @@ void *proc_main(void *ptr)

87 if(!vdo_proc_loadavg) {

88 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_loadavg().");

89 - now = time_usec();

89 + now = now_realtime_usec();

90 vdo_proc_loadavg = do_proc_loadavg(rrd_update_every, (sutime_proc_loadavg > 0)?now - sutime_proc_loadavg:0ULL);

91 sutime_proc_loadavg = now;

92 }

@@ -94,7 +94,7 @@ void *proc_main(void *ptr)

95 if(!vdo_ipc) {

96 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_ipc().");

97 - now = time_usec();

97 + now = now_realtime_usec();

98 vdo_ipc = do_ipc(rrd_update_every, (sutime_ipc > 0)?now - sutime_ipc:0ULL);

99 sutime_ipc = now;

100 }

@@ -102,7 +102,7 @@ void *proc_main(void *ptr)

102

103 if(!vdo_proc_interrupts) {

104 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_interrupts().");

105 - now = time_usec();

105 + now = now_realtime_usec();

106 vdo_proc_interrupts = do_proc_interrupts(rrd_update_every, (sutime_proc_interrupts > 0)?now - sutime_proc_interrupts:0ULL);

107 sutime_proc_interrupts = now;

108 }

@@ -110,7 +110,7 @@ void *proc_main(void *ptr)

110

111 if(!vdo_proc_softirqs) {

112 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_softirqs().");

113 - now = time_usec();

113 + now = now_realtime_usec();

114 vdo_proc_softirqs = do_proc_softirqs(rrd_update_every, (sutime_proc_softirqs > 0)?now - sutime_proc_softirqs:0ULL);

115 sutime_proc_softirqs = now;

116 }

@@ -118,7 +118,7 @@ void *proc_main(void *ptr)

118

119 if(!vdo_proc_net_softnet_stat) {

120 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_softnet_stat().");

121 - now = time_usec();

121 + now = now_realtime_usec();

122 vdo_proc_net_softnet_stat = do_proc_net_softnet_stat(rrd_update_every, (sutime_proc_net_softnet_stat > 0)?now - sutime_proc_net_softnet_stat:0ULL);

123 sutime_proc_net_softnet_stat = now;

124 }

@@ -126,7 +126,7 @@ void *proc_main(void *ptr)

126

127 if(!vdo_proc_sys_kernel_random_entropy_avail) {

128 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_sys_kernel_random_entropy_avail().");

129 - now = time_usec();

129 + now = now_realtime_usec();

130 vdo_proc_sys_kernel_random_entropy_avail = do_proc_sys_kernel_random_entropy_avail(rrd_update_every, (sutime_proc_sys_kernel_random_entropy_avail > 0)?now - sutime_proc_sys_kernel_random_entropy_avail:0ULL);

131 sutime_proc_sys_kernel_random_entropy_avail = now;

132 }

@@ -134,7 +134,7 @@ void *proc_main(void *ptr)

134

135 if(!vdo_proc_net_dev) {

136 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_dev().");

137 - now = time_usec();

137 + now = now_realtime_usec();

138 vdo_proc_net_dev = do_proc_net_dev(rrd_update_every, (sutime_proc_net_dev > 0)?now - sutime_proc_net_dev:0ULL);

139 sutime_proc_net_dev = now;

140 }

@@ -142,7 +142,7 @@ void *proc_main(void *ptr)

142

143 if(!vdo_proc_diskstats) {

144 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_diskstats().");

145 - now = time_usec();

145 + now = now_realtime_usec();

146 vdo_proc_diskstats = do_proc_diskstats(rrd_update_every, (sutime_proc_diskstats > 0)?now - sutime_proc_diskstats:0ULL);

147 sutime_proc_diskstats = now;

148 }

@@ -150,7 +150,7 @@ void *proc_main(void *ptr)

150

151 if(!vdo_proc_net_snmp) {

152 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_snmp().");

153 - now = time_usec();

153 + now = now_realtime_usec();

154 vdo_proc_net_snmp = do_proc_net_snmp(rrd_update_every, (sutime_proc_net_snmp > 0)?now - sutime_proc_net_snmp:0ULL);

155 sutime_proc_net_snmp = now;

156 }

@@ -158,7 +158,7 @@ void *proc_main(void *ptr)

158

159 if(!vdo_proc_net_snmp6) {

160 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_snmp6().");

161 - now = time_usec();

161 + now = now_realtime_usec();

162 vdo_proc_net_snmp6 = do_proc_net_snmp6(rrd_update_every, (sutime_proc_net_snmp6 > 0)?now - sutime_proc_net_snmp6:0ULL);

163 sutime_proc_net_snmp6 = now;

164 }

@@ -166,7 +166,7 @@ void *proc_main(void *ptr)

166

167 if(!vdo_proc_net_netstat) {

168 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_netstat().");

169 - now = time_usec();

169 + now = now_realtime_usec();

170 vdo_proc_net_netstat = do_proc_net_netstat(rrd_update_every, (sutime_proc_net_netstat > 0)?now - sutime_proc_net_netstat:0ULL);

171 sutime_proc_net_netstat = now;

172 }

@@ -174,7 +174,7 @@ void *proc_main(void *ptr)

174

175 if(!vdo_proc_net_stat_conntrack) {

176 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_stat_conntrack().");

177 - now = time_usec();

177 + now = now_realtime_usec();

178 vdo_proc_net_stat_conntrack = do_proc_net_stat_conntrack(rrd_update_every, (sutime_proc_net_stat_conntrack > 0)?now - sutime_proc_net_stat_conntrack:0ULL);

179 sutime_proc_net_stat_conntrack = now;

180 }

@@ -182,7 +182,7 @@ void *proc_main(void *ptr)

182

183 if(!vdo_proc_net_ip_vs_stats) {

184 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_net_ip_vs_stats().");

185 - now = time_usec();

185 + now = now_realtime_usec();

186 vdo_proc_net_ip_vs_stats = do_proc_net_ip_vs_stats(rrd_update_every, (sutime_proc_net_ip_vs_stats > 0)?now - sutime_proc_net_ip_vs_stats:0ULL);

187 sutime_proc_net_ip_vs_stats = now;

188 }

@@ -190,7 +190,7 @@ void *proc_main(void *ptr)

190

191 if(!vdo_proc_net_stat_synproxy) {

192 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_net_stat_synproxy().");

193 - now = time_usec();

193 + now = now_realtime_usec();

194 vdo_proc_net_stat_synproxy = do_proc_net_stat_synproxy(rrd_update_every, (sutime_proc_net_stat_synproxy > 0)?now - sutime_proc_net_stat_synproxy:0ULL);

195 sutime_proc_net_stat_synproxy = now;

196 }

@@ -198,7 +198,7 @@ void *proc_main(void *ptr)

198

199 if(!vdo_proc_stat) {

200 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_stat().");

201 - now = time_usec();

201 + now = now_realtime_usec();

202 vdo_proc_stat = do_proc_stat(rrd_update_every, (sutime_proc_stat > 0)?now - sutime_proc_stat:0ULL);

203 sutime_proc_stat = now;

204 }

@@ -206,7 +206,7 @@ void *proc_main(void *ptr)

206

207 if(!vdo_proc_meminfo) {

208 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_meminfo().");

209 - now = time_usec();

209 + now = now_realtime_usec();

210 vdo_proc_meminfo = do_proc_meminfo(rrd_update_every, (sutime_proc_meminfo > 0)?now - sutime_proc_meminfo:0ULL);

211 sutime_proc_meminfo = now;

212 }

@@ -214,7 +214,7 @@ void *proc_main(void *ptr)

214

215 if(!vdo_proc_vmstat) {

216 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling vdo_proc_vmstat().");

217 - now = time_usec();

217 + now = now_realtime_usec();

218 vdo_proc_vmstat = do_proc_vmstat(rrd_update_every, (sutime_proc_vmstat > 0)?now - sutime_proc_vmstat:0ULL);

219 sutime_proc_vmstat = now;

220 }

@@ -222,7 +222,7 @@ void *proc_main(void *ptr)

222

223 if(!vdo_proc_net_rpc_nfsd) {

224 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_rpc_nfsd().");

225 - now = time_usec();

225 + now = now_realtime_usec();

226 vdo_proc_net_rpc_nfsd = do_proc_net_rpc_nfsd(rrd_update_every, (sutime_proc_net_rpc_nfsd > 0)?now - sutime_proc_net_rpc_nfsd:0ULL);

227 sutime_proc_net_rpc_nfsd = now;

228 }

@@ -230,7 +230,7 @@ void *proc_main(void *ptr)

230

231 if(!vdo_proc_net_rpc_nfs) {

232 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_proc_net_rpc_nfs().");

233 - now = time_usec();

233 + now = now_realtime_usec();

234 vdo_proc_net_rpc_nfs = do_proc_net_rpc_nfs(rrd_update_every, (sutime_proc_net_rpc_nfs > 0)?now - sutime_proc_net_rpc_nfs:0ULL);

235 sutime_proc_net_rpc_nfs = now;

236 }

src/sys_fs_cgroup.c

+3 -3

@@ -1445,11 +1445,11 @@ void *cgroups_main(void *ptr)

1445 if(unlikely(netdata_exit)) break;

1446

1447 // delay until it is our time to run

1448 - while((sunow = time_usec()) < sunext)

1448 + while((sunow = now_realtime_usec()) < sunext)

1449 sleep_usec(sunext - sunow);

1450

1451 // find the next time we need to run

1452 - while(time_usec() > sunext)

1452 + while(now_realtime_usec() > sunext)

1453 sunext += rrd_update_every * 1000000ULL;

1454

1455 if(unlikely(netdata_exit)) break;

@@ -1458,7 +1458,7 @@ void *cgroups_main(void *ptr)

1458

1459 if(!vdo_sys_fs_cgroup) {

1460 debug(D_PROCNETDEV_LOOP, "PROCNETDEV: calling do_sys_fs_cgroup().");

1461 - sunow = time_usec();

1461 + sunow = now_realtime_usec();

1462 vdo_sys_fs_cgroup = do_sys_fs_cgroup(rrd_update_every, (sutime_sys_fs_cgroup > 0)?sunow - sutime_sys_fs_cgroup:0ULL);

1463 sutime_sys_fs_cgroup = sunow;

1464 }