r5100 - in trunk/varnish-cache/bin: varnishstat varnishtop
phk at varnish-cache.org
phk at varnish-cache.org
Thu Aug 12 11:48:46 CEST 2010
Author: phk
Date: 2010-08-12 11:48:45 +0200 (Thu, 12 Aug 2010)
New Revision: 5100
Modified:
trunk/varnish-cache/bin/varnishstat/varnishstat_curses.c
trunk/varnish-cache/bin/varnishtop/varnishtop.c
Log:
Don't assert good returns from ncurses for now.
Fixes: #741
Modified: trunk/varnish-cache/bin/varnishstat/varnishstat_curses.c
===================================================================
--- trunk/varnish-cache/bin/varnishstat/varnishstat_curses.c 2010-08-12 08:58:21 UTC (rev 5099)
+++ trunk/varnish-cache/bin/varnishstat/varnishstat_curses.c 2010-08-12 09:48:45 UTC (rev 5100)
@@ -52,7 +52,11 @@
#include "varnishapi.h"
#include "varnishstat.h"
+#if 0
#define AC(x) assert((x) != ERR)
+#else
+#define AC(x) x
+#endif
struct pt {
VTAILQ_ENTRY(pt) next;
@@ -202,13 +206,13 @@
line = 3;
VTAILQ_FOREACH(pt, &pthead, next) {
- if (line >= LINES)
- break;
ju = *pt->ptr;
if (ju == 0 && !pt->seen)
continue;
pt->seen = 1;
line++;
+ if (line >= LINES)
+ break;
if (pt->type == 'a') {
AC(mvprintw(line, 0,
"%12ju %12.2f %12.2f %s\n",
Modified: trunk/varnish-cache/bin/varnishtop/varnishtop.c
===================================================================
--- trunk/varnish-cache/bin/varnishtop/varnishtop.c 2010-08-12 08:58:21 UTC (rev 5099)
+++ trunk/varnish-cache/bin/varnishtop/varnishtop.c 2010-08-12 09:48:45 UTC (rev 5100)
@@ -54,7 +54,11 @@
#include "vsl.h"
#include "varnishapi.h"
+#if 0
#define AC(x) assert((x) != ERR)
+#else
+#define AC(x) x
+#endif
struct top {
uint8_t tag;
More information about the varnish-commit
mailing list