diff options
Diffstat (limited to 'src/stat.c')
-rw-r--r-- | src/stat.c | 65 |
1 files changed, 35 insertions, 30 deletions
@@ -40,30 +40,30 @@ interpolate (queue_t *q, { time_t next; struct traffic_history th; if (now - last_time <= step) { th.inrate = inrate; th.outrate = outrate; - verbose (3, "Insert %lu %g %g", next, th.inrate, th.outrate); + verbose (3, _("insert %lu %g %g"), next, th.inrate, th.outrate); queue_put (q, &th); if (ovf) ovf (&th, tr, now); return; } for (next = last_time + step; next <= now; next += step) { th.inrate = (inrate - last_rates->inrate) * (next - last_time) / interval + last_rates->inrate; th.outrate = (outrate - last_rates->outrate) * (next - last_time) / interval + last_rates->outrate; - verbose (3, "Insert %lu %g %g", next, th.inrate, th.outrate); + verbose (3, _("insert %lu %g %g"), next, th.inrate, th.outrate); queue_put (q, &th); if (ovf) ovf (&th, tr, now); } } int overflow (struct traffic_history *th, @@ -87,69 +87,72 @@ overflow (struct traffic_history *th, now - avg->time, avg->inrate, avg->outrate, ovf, tr); else { struct traffic_history tmp; tmp.inrate = avg->inrate; tmp.outrate = avg->outrate; - verbose (3, "Insert %lu %g %g", now, tmp.inrate, tmp.outrate); + verbose (3, _("insert %lu %g %g"), now, tmp.inrate, tmp.outrate); queue_put (q, &tmp); } avg->inrate = avg->outrate = 0; avg->count = 0; avg->time = now; } avg->inrate = (avg->count * avg->inrate + th->inrate) / (avg->count + 1); avg->outrate = (avg->count * avg->outrate + th->outrate) / (avg->count + 1); avg->count++; } int ovf_monthly (struct traffic_history *th, struct traffic_record *tr, time_t now) { - verbose (2, "begin overflow_monthly %lu %g %g", now, th->inrate, th->outrate); + verbose (2, _("begin overflow_monthly %lu %g %g"), + now, th->inrate, th->outrate); overflow (th, tr, now, NULL, &tr->year_avg, &tr->year_hist, YEAR_COUNT, YEAR_SAMPLE); - verbose (2, "end overflow_monthly"); + verbose (2, _("end overflow_monthly")); } int ovf_weekly (struct traffic_history *th, struct traffic_record *tr, time_t now) { - verbose (2, "begin overflow_weekly %lu %g %g", now, th->inrate, th->outrate); + verbose (2, _("begin overflow_weekly %lu %g %g"), + now, th->inrate, th->outrate); overflow (th, tr, now, ovf_monthly, &tr->month_avg, &tr->month_hist, MONTH_COUNT, MONTH_SAMPLE); - verbose (2, "end overflow_daily"); + verbose (2, _("end overflow_daily")); } int ovf_daily (struct traffic_history *th, struct traffic_record *tr, time_t now) { - verbose (2, "begin overflow_daily %lu %g %g", now, th->inrate, th->outrate); + verbose (2, _("begin overflow_daily %lu %g %g"), + now, th->inrate, th->outrate); overflow (th, tr, now, ovf_weekly, &tr->week_avg, &tr->week_hist, WEEK_COUNT, WEEK_SAMPLE); - verbose (2, "end overflow_daily"); + verbose (2, _("end overflow_daily")); } void update_stats (struct monitor *mon, struct traffic_sample *sample, struct traffic_record *tr) { time_t interval; double inrate, outrate; struct traffic_history *lastp = queue_get_tail (&tr->day_hist); interval = sample->time - tr->last.time; if (interval == 0) { - logmsg (L_ERR, "Ignoring zero interval"); + logmsg (L_ERR, _("ignoring zero interval")); return; } inrate = (double) sample->in / interval; outrate = (double) sample->out / interval; if (lastp) { interpolate (&tr->day_hist, DAY_SAMPLE, @@ -212,17 +215,17 @@ _convert (queue_t *q, ovf_t ovf, struct traffic_history *lastp = queue_get_tail (q); interval = hp->time - tr->last.time; inrate = (double) hp->in; outrate = (double) hp->out; if (interval == 0) { - logmsg (L_ERR, "Ignoring zero interval"); + logmsg (L_ERR, _("ignoring zero interval")); break; } if (lastp) { interpolate (q, sample_interval, hp->time, tr->last.time, @@ -247,56 +250,56 @@ _convert (queue_t *q, ovf_t ovf, tr->last_rates.outrate = outrate; } } static void convert_yearly (struct traffic_record *tr, struct traffic_sample *hp, size_t count) { - verbose (2, "begin convert_yearly"); + verbose (2, _("begin convert_yearly")); _convert (&tr->year_hist, NULL, tr, hp, count, YEAR_SAMPLE); compute_avg (&tr->year_avg, &tr->year_hist, &tr->last); - verbose (2, "end convert_yearly"); + verbose (2, _("end convert_yearly")); } static void convert_monthly (struct traffic_record *tr, struct traffic_sample *hp, size_t count) { - verbose (2, "begin convert_monthly"); + verbose (2, _("begin convert_monthly")); if (count > MONTH_COUNT+1) convert_yearly (tr, hp + MONTH_COUNT + 1, count - (MONTH_COUNT + 1)); _convert (&tr->month_hist, ovf_monthly, tr, hp, MONTH_COUNT + 1, MONTH_SAMPLE); compute_avg (&tr->month_avg, &tr->month_hist, &tr->last); - verbose (2, "end convert_monthly"); + verbose (2, _("end convert_monthly")); } static void convert_weekly (struct traffic_record *tr, struct traffic_sample *hp, size_t count) { - verbose (2, "begin convert_weekly"); + verbose (2, _("begin convert_weekly")); if (count > WEEK_COUNT+1) convert_monthly (tr, hp + WEEK_COUNT + 1, count - (WEEK_COUNT + 1)); _convert (&tr->week_hist, ovf_weekly, tr, hp, WEEK_COUNT + 1, WEEK_SAMPLE); compute_avg (&tr->week_avg, &tr->week_hist, &tr->last); - verbose (2, "end convert_weekly"); + verbose (2, _("end convert_weekly")); } static void convert_daily (struct traffic_record *tr, struct traffic_sample *hp, size_t count) { - verbose (2, "begin convert_daily"); + verbose (2, _("begin convert_daily")); if (count > DAY_COUNT+1) convert_weekly (tr, hp + DAY_COUNT + 1, count - (DAY_COUNT + 1)); _convert (&tr->day_hist, ovf_daily, tr, hp, DAY_COUNT + 1, DAY_SAMPLE); - verbose (2, "end convert_daily"); + verbose (2, _("end convert_daily")); } static void convert_stats (struct monitor *mon, struct traffic_sample *last, struct traffic_sample *hp, size_t count) { struct traffic_record *trp, tr; @@ -324,25 +327,25 @@ import_log (const char *name) char *buf = NULL; size_t bufsize = 0; size_t line = 1; time_t cur; fp = fopen (name, "r"); if (!fp) { - logmsg (L_ERR, "cannot open `%s': %s", name, strerror (errno)); + logmsg (L_ERR, _("cannot open `%s': %s"), name, strerror (errno)); return 1; } - verbose (2, "Importing %s", name); + verbose (2, _("importing %s"), name); if (fscanf (fp, "%ld %lu %lu\n", &last.time, &last.in, &last.out) != 3) { - logmsg (L_ERR, "%s:1: Unexpected number of fields", name); + logmsg (L_ERR, _("%s:1: unexpected number of fields"), name); fclose (fp); return 1; } cur = last.time; obstack_init (&stk); while (getline (&buf, &bufsize, fp) > 0) { @@ -359,17 +362,17 @@ import_log (const char *name) } for (i = 0; i <= 4; i++) rd[i] = rd[i] < 0 ? 0 : rd[i]; hist.time = rd[0]; if (hist.time > cur) { - logmsg (L_WARNING, "%s:%lu: is corrupted", name, line); + logmsg (L_WARNING, _("%s:%lu: is corrupted"), name, line); break; } cur = hist.time; hist.in = rd[1]; hist.out = rd[2]; if (inmax < rd[3]) inmax = rd[3]; if (inmax < hist.in) @@ -394,37 +397,38 @@ import_log (const char *name) char *base = xstrdup (p ? p + 1 : name); p = strrchr (base, '.'); if (p) *p = 0; mon = find_monitor (base); if (!mon) { - logmsg (L_ERR, "cannot find monitor `%s'", base); + logmsg (L_ERR, _("cannot find monitor `%s'"), base); rc = 1; } else convert_stats (mon, &last, hp, count); } obstack_free (&stk, NULL); return rc; } void import (const char *dirname) { size_t count = 0; struct stat st; - verbose (2, "Examining `%s'", dirname); + verbose (2, _("examining `%s'"), dirname); if (stat (dirname, &st)) - die (EX_OSERR, "cannot stat file `%s': %s", dirname, strerror (errno)); + die (EX_OSERR, _("cannot stat file `%s': %s"), + dirname, strerror (errno)); else if (S_ISREG (st.st_mode)) { open_db (TAGR_DB_WR); if (import_log (dirname) == 0) count++; close_db (); } else if (S_ISDIR (st.st_mode)) @@ -445,24 +449,25 @@ import (const char *dirname) for (i = 0; i < gl.gl_pathc; i++) if (import_log (gl.gl_pathv[i]) == 0) count++; globfree (&gl); close_db (); break; case GLOB_NOSPACE: - die (EX_UNAVAILABLE, "cannot scan directory: %s", strerror (ENOMEM)); + die (EX_UNAVAILABLE, _("cannot scan directory: %s"), + strerror (ENOMEM)); case GLOB_ABORTED: - die (EX_UNAVAILABLE, "scanning aborted"); + die (EX_UNAVAILABLE, _("scanning aborted")); case GLOB_NOMATCH: break; default: - die (EX_UNAVAILABLE, "cannot scan directory `%s'", dirname); + die (EX_UNAVAILABLE, _("cannot scan directory `%s'"), dirname); } } - verbose (1, "Number of imported log files: %d", count); + verbose (1, _("number of imported log files: %d"), count); } |