diff options
| author | Diogo Sousa <diogogsousa@gmail.com> | 2014-01-27 20:24:56 +0000 |
|---|---|---|
| committer | Diogo Sousa <diogogsousa@gmail.com> | 2014-01-30 19:23:35 +0000 |
| commit | 9969282c72f838004fe3d75f06db48072b0fbfeb (patch) | |
| tree | 70ef95eff34cb08db09cc0b53416198dbe5f58ea /src/fe-gtk | |
| parent | 1d6d737927d4e99333a8e6ae26b44ca959fc1cd9 (diff) | |
Now make_ping_time() in common/util.c returns the time in milliseconds instead
of microseconds. In fe_set_lag(serv, lag) the lag argument is now in milliseconds as well. Fixes #758.
Diffstat (limited to 'src/fe-gtk')
| -rw-r--r-- | src/fe-gtk/fe-gtk.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fe-gtk/fe-gtk.c b/src/fe-gtk/fe-gtk.c index 389ef899..ae68bb79 100644 --- a/src/fe-gtk/fe-gtk.c +++ b/src/fe-gtk/fe-gtk.c @@ -713,7 +713,7 @@ fe_lastlog (session *sess, session *lastlog_sess, char *sstr, gtk_xtext_search_f } void -fe_set_lag (server *serv, int lag) +fe_set_lag (server *serv, long lag) { GSList *list = sess_list; session *sess; @@ -727,21 +727,21 @@ fe_set_lag (server *serv, int lag) if (!serv->lag_sent) return; nowtim = make_ping_time (); - lag = (nowtim - serv->lag_sent) / 100000; + lag = nowtim - serv->lag_sent; } /* if there is no pong for >30s report the lag as +30s */ - if (lag > 300 && serv->lag_sent) - lag=300; + if (lag > 30000 && serv->lag_sent) + lag=30000; - per = (double)((double)lag / (double)10); + per = ((double)lag) / 1000.0; if (per > 1.0) per = 1.0; - snprintf (lagtext, sizeof (lagtext) - 1, "%s%d.%ds", - serv->lag_sent ? "+" : "", lag / 10, lag % 10); - snprintf (lagtip, sizeof (lagtip) - 1, "Lag: %s%d.%d seconds", - serv->lag_sent ? "+" : "", lag / 10, lag % 10); + snprintf (lagtext, sizeof (lagtext) - 1, "%s%ld.%lds", + serv->lag_sent ? "+" : "", lag / 1000, (lag/100) % 10); + snprintf (lagtip, sizeof (lagtip) - 1, "Lag: %s%ld.%ld seconds", + serv->lag_sent ? "+" : "", lag / 1000, (lag/100) % 10); while (list) { |