From c87a37661e14b288d2510b3e4de088a3fed3e5c0 Mon Sep 17 00:00:00 2001 From: Sun He Date: Mon, 8 Dec 2014 11:15:06 +0800 Subject: [PATCH 1/2] sparkline.c: mov label-ini into the AddSample Function --- src/latency.c | 4 +--- src/sparkline.c | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/latency.c b/src/latency.c index b7845ca2..c26fc939 100644 --- a/src/latency.c +++ b/src/latency.c @@ -475,7 +475,6 @@ sds latencyCommandGenSparkeline(char *event, struct latencyTimeSeries *ts) { for (j = 0; j < LATENCY_TS_LEN; j++) { int i = (ts->idx + j) % LATENCY_TS_LEN; int elapsed; - char *label; char buf[64]; if (ts->samples[i].time == 0) continue; @@ -497,8 +496,7 @@ sds latencyCommandGenSparkeline(char *event, struct latencyTimeSeries *ts) { snprintf(buf,sizeof(buf),"%dh",elapsed/3600); else snprintf(buf,sizeof(buf),"%dd",elapsed/(3600*24)); - label = zstrdup(buf); - sparklineSequenceAddSample(seq,ts->samples[i].latency,label); + sparklineSequenceAddSample(seq,ts->samples[i].latency,buf); } graph = sdscatprintf(graph, diff --git a/src/sparkline.c b/src/sparkline.c index 900f26ab..3355a598 100644 --- a/src/sparkline.c +++ b/src/sparkline.c @@ -49,7 +49,7 @@ static int label_margin_top = 1; * sparklineSequenceAddSample(seq, 10, NULL); * sparklineSequenceAddSample(seq, 20, NULL); * sparklineSequenceAddSample(seq, 30, "last sample label"); - * sds output = sparklineRender(seq, 80, 4); + * sds output = sparklineRender(sdsempty(), seq, 80, 4, SPARKLINE_FILL); * freeSparklineSequence(seq); * ------------------------------------------------------------------------- */ @@ -63,6 +63,7 @@ struct sequence *createSparklineSequence(void) { /* Add a new sample into a sequence. */ void sparklineSequenceAddSample(struct sequence *seq, double value, char *label) { + label = label == NULL ? label : zstrdup(label); if (seq->length == 0) { seq->min = seq->max = value; } else { From 07a9e44b86eff660e55bc1044a667eda7b981973 Mon Sep 17 00:00:00 2001 From: Sun He Date: Mon, 8 Dec 2014 11:43:32 +0800 Subject: [PATCH 2/2] sparkline.c: AddSample skip Empty label --- src/sparkline.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sparkline.c b/src/sparkline.c index 3355a598..8e2764ae 100644 --- a/src/sparkline.c +++ b/src/sparkline.c @@ -63,7 +63,7 @@ struct sequence *createSparklineSequence(void) { /* Add a new sample into a sequence. */ void sparklineSequenceAddSample(struct sequence *seq, double value, char *label) { - label = label == NULL ? label : zstrdup(label); + label = (label == NULL || label[0] == '\0') ? NULL : zstrdup(label); if (seq->length == 0) { seq->min = seq->max = value; } else {