From 7c88381a59771a3e0be35800af3496da1171e9a4 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Tue, 30 Jan 2007 15:32:31 +0000 Subject: Make time taken that is displayed in status bar use gettimeofday()-based time rather than clock()-based time svn path=/trunk/netsurf/; revision=3157 --- content/content.c | 10 +++++----- content/content.h | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'content') diff --git a/content/content.c b/content/content.c index f87084bce..d99d02b09 100644 --- a/content/content.c +++ b/content/content.c @@ -376,7 +376,7 @@ struct content * content_create(const char *url) c->refresh = 0; c->bitmap = 0; c->fresh = false; - c->time = clock(); + c->time = wallclock(); c->size = 0; c->title = 0; c->active = 0; @@ -614,7 +614,7 @@ void content_update_status(struct content *c) { char token[20]; const char *status; - clock_t time; + unsigned int time; snprintf(token, sizeof token, "HTTP%li", c->http_code); status = messages_get(token); @@ -624,13 +624,13 @@ void content_update_status(struct content *c) if (c->status == CONTENT_STATUS_TYPE_UNKNOWN || c->status == CONTENT_STATUS_LOADING || c->status == CONTENT_STATUS_READY) - time = clock() - c->time; + time = wallclock() - c->time; else time = c->time; snprintf(c->status_message, sizeof (c->status_message), "%s (%.1fs) %s", status, - (float) time / CLOCKS_PER_SEC, c->sub_status); + (float) time / 100, c->sub_status); /* LOG(("%s", c->status_message)); */ } @@ -752,7 +752,7 @@ void content_set_done(struct content *c) union content_msg_data msg_data; c->status = CONTENT_STATUS_DONE; - c->time = clock() - c->time; + c->time = wallclock() - c->time; content_update_status(c); content_broadcast(c, CONTENT_MSG_DONE, msg_data); } diff --git a/content/content.h b/content/content.h index 268ba31a1..43f9243d3 100644 --- a/content/content.h +++ b/content/content.h @@ -16,7 +16,6 @@ #define _NETSURF_DESKTOP_CONTENT_H_ #include -#include #include "netsurf/utils/config.h" #include "netsurf/content/content_type.h" #include "netsurf/css/css.h" @@ -179,7 +178,7 @@ struct content { * shared between users. */ bool fresh; struct cache_data *cache_data; /**< Cache control data */ - clock_t time; /**< Creation time, if TYPE_UNKNOWN, + unsigned int time; /**< Creation time, if TYPE_UNKNOWN, LOADING or READY, otherwise total time. */ -- cgit v1.2.3