From f454f13209d25d9c860b9c31f72ae0d996efbb31 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bj=C3=B6rn=20Jacke?= Date: Thu, 16 Sep 2010 19:02:27 +0200 Subject: [PATCH] s3: use nsec_time_diff instead of TspecDiff --- source3/client/client.c | 4 ++-- source3/libsmb/namequery.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source3/client/client.c b/source3/client/client.c index 36cb112ae50..62ff5d13f40 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -1106,7 +1106,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget) int this_time; clock_gettime_mono(&tp_end); - this_time = TspecDiff(&tp_start,&tp_end); + this_time = nsec_time_diff(&tp_start,&tp_end)/1000000; get_total_time_ms += this_time; get_total_size += nread; @@ -1749,7 +1749,7 @@ static int do_put(const char *rname, const char *lname, bool reput) int this_time; clock_gettime_mono(&tp_end); - this_time = TspecDiff(&tp_start,&tp_end); + this_time = nsec_time_diff(&tp_start,&tp_end)/1000000; put_total_time_ms += this_time; put_total_size += state.nread; diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index c949d3bcb44..00a3b97a98d 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -307,7 +307,7 @@ NODE_STATUS_STRUCT *node_status_query(int fd, while (1) { struct timespec tp2; clock_gettime_mono(&tp2); - if (TspecDiff(&tp,&tp2) > retry_time) { + if (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) { if (!retries) break; if (!found && !send_packet(&p)) @@ -716,7 +716,7 @@ struct sockaddr_storage *name_query(int fd, struct timespec tp2; clock_gettime_mono(&tp2); - if (TspecDiff(&tp,&tp2) > retry_time) { + if (nsec_time_diff(&tp,&tp2)/1000000 > retry_time) { if (!retries) break; if (!found && !send_packet(&p)) -- 2.11.4.GIT