Merge pull request #2197 from sunheehnus/sparkline

sparkline.c: mov label-ini into the AddSample Function
This commit is contained in:
Salvatore Sanfilippo 2014-12-09 11:27:40 +01:00
commit 4b03be6d2f
2 changed files with 3 additions and 4 deletions

View File

@ -512,7 +512,6 @@ sds latencyCommandGenSparkeline(char *event, struct latencyTimeSeries *ts) {
for (j = 0; j < LATENCY_TS_LEN; j++) { for (j = 0; j < LATENCY_TS_LEN; j++) {
int i = (ts->idx + j) % LATENCY_TS_LEN; int i = (ts->idx + j) % LATENCY_TS_LEN;
int elapsed; int elapsed;
char *label;
char buf[64]; char buf[64];
if (ts->samples[i].time == 0) continue; if (ts->samples[i].time == 0) continue;
@ -534,8 +533,7 @@ sds latencyCommandGenSparkeline(char *event, struct latencyTimeSeries *ts) {
snprintf(buf,sizeof(buf),"%dh",elapsed/3600); snprintf(buf,sizeof(buf),"%dh",elapsed/3600);
else else
snprintf(buf,sizeof(buf),"%dd",elapsed/(3600*24)); snprintf(buf,sizeof(buf),"%dd",elapsed/(3600*24));
label = zstrdup(buf); sparklineSequenceAddSample(seq,ts->samples[i].latency,buf);
sparklineSequenceAddSample(seq,ts->samples[i].latency,label);
} }
graph = sdscatprintf(graph, graph = sdscatprintf(graph,

View File

@ -49,7 +49,7 @@ static int label_margin_top = 1;
* sparklineSequenceAddSample(seq, 10, NULL); * sparklineSequenceAddSample(seq, 10, NULL);
* sparklineSequenceAddSample(seq, 20, NULL); * sparklineSequenceAddSample(seq, 20, NULL);
* sparklineSequenceAddSample(seq, 30, "last sample label"); * sparklineSequenceAddSample(seq, 30, "last sample label");
* sds output = sparklineRender(seq, 80, 4); * sds output = sparklineRender(sdsempty(), seq, 80, 4, SPARKLINE_FILL);
* freeSparklineSequence(seq); * freeSparklineSequence(seq);
* ------------------------------------------------------------------------- */ * ------------------------------------------------------------------------- */
@ -63,6 +63,7 @@ struct sequence *createSparklineSequence(void) {
/* Add a new sample into a sequence. */ /* Add a new sample into a sequence. */
void sparklineSequenceAddSample(struct sequence *seq, double value, char *label) { void sparklineSequenceAddSample(struct sequence *seq, double value, char *label) {
label = (label == NULL || label[0] == '\0') ? NULL : zstrdup(label);
if (seq->length == 0) { if (seq->length == 0) {
seq->min = seq->max = value; seq->min = seq->max = value;
} else { } else {