mirror of
https://github.com/git/git
synced 2024-08-28 20:20:07 +00:00
9720d23e8c
date_mode_from_type() modifies a static variable and returns a pointer to it. This is not thread-safe. Most callers of date_mode_from_type() use it via the macro DATE_MODE and pass its result on to functions like show_date(), which take a const pointer and don't modify the struct. Avoid the static storage by putting the variable on the stack and returning the whole struct date_mode. Change functions that take a constant pointer to expect the whole struct instead. Reduce the cost of passing struct date_mode around on 64-bit systems by reordering its members to close the hole between the 32-bit wide .type and the 64-bit aligned .strftime_fmt as well as the alignment hole at the end. sizeof reports 24 before and 16 with this change on x64. Keep .type at the top to still allow initialization without designator -- though that's only done in a single location, in builtin/blame.c. Signed-off-by: René Scharfe <l.s.r@web.de> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
136 lines
3 KiB
C
136 lines
3 KiB
C
#include "test-tool.h"
|
|
#include "date.h"
|
|
#include "trace.h"
|
|
|
|
static const char *usage_msg = "\n"
|
|
" test-tool date relative [time_t]...\n"
|
|
" test-tool date human [time_t]...\n"
|
|
" test-tool date show:<format> [time_t]...\n"
|
|
" test-tool date parse [date]...\n"
|
|
" test-tool date approxidate [date]...\n"
|
|
" test-tool date timestamp [date]...\n"
|
|
" test-tool date getnanos [start-nanos]\n"
|
|
" test-tool date is64bit\n"
|
|
" test-tool date time_t-is64bit\n";
|
|
|
|
static void show_relative_dates(const char **argv)
|
|
{
|
|
struct strbuf buf = STRBUF_INIT;
|
|
|
|
for (; *argv; argv++) {
|
|
time_t t = atoi(*argv);
|
|
show_date_relative(t, &buf);
|
|
printf("%s -> %s\n", *argv, buf.buf);
|
|
}
|
|
strbuf_release(&buf);
|
|
}
|
|
|
|
static void show_human_dates(const char **argv)
|
|
{
|
|
for (; *argv; argv++) {
|
|
time_t t = atoi(*argv);
|
|
printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(HUMAN)));
|
|
}
|
|
}
|
|
|
|
static void show_dates(const char **argv, const char *format)
|
|
{
|
|
struct date_mode mode = DATE_MODE_INIT;
|
|
|
|
parse_date_format(format, &mode);
|
|
for (; *argv; argv++) {
|
|
char *arg;
|
|
timestamp_t t;
|
|
int tz;
|
|
|
|
/*
|
|
* Do not use our normal timestamp parsing here, as the point
|
|
* is to test the formatting code in isolation.
|
|
*/
|
|
t = parse_timestamp(*argv, &arg, 10);
|
|
while (*arg == ' ')
|
|
arg++;
|
|
tz = atoi(arg);
|
|
|
|
printf("%s -> %s\n", *argv, show_date(t, tz, mode));
|
|
}
|
|
|
|
date_mode_release(&mode);
|
|
}
|
|
|
|
static void parse_dates(const char **argv)
|
|
{
|
|
struct strbuf result = STRBUF_INIT;
|
|
|
|
for (; *argv; argv++) {
|
|
timestamp_t t;
|
|
int tz;
|
|
|
|
strbuf_reset(&result);
|
|
parse_date(*argv, &result);
|
|
if (sscanf(result.buf, "%"PRItime" %d", &t, &tz) == 2)
|
|
printf("%s -> %s\n",
|
|
*argv, show_date(t, tz, DATE_MODE(ISO8601)));
|
|
else
|
|
printf("%s -> bad\n", *argv);
|
|
}
|
|
strbuf_release(&result);
|
|
}
|
|
|
|
static void parse_approxidate(const char **argv)
|
|
{
|
|
for (; *argv; argv++) {
|
|
timestamp_t t;
|
|
t = approxidate(*argv);
|
|
printf("%s -> %s\n", *argv, show_date(t, 0, DATE_MODE(ISO8601)));
|
|
}
|
|
}
|
|
|
|
static void parse_approx_timestamp(const char **argv)
|
|
{
|
|
for (; *argv; argv++) {
|
|
timestamp_t t;
|
|
t = approxidate(*argv);
|
|
printf("%s -> %"PRItime"\n", *argv, t);
|
|
}
|
|
}
|
|
|
|
static void getnanos(const char **argv)
|
|
{
|
|
double seconds = getnanotime() / 1.0e9;
|
|
|
|
if (*argv)
|
|
seconds -= strtod(*argv, NULL);
|
|
printf("%lf\n", seconds);
|
|
}
|
|
|
|
int cmd__date(int argc UNUSED, const char **argv)
|
|
{
|
|
const char *x;
|
|
|
|
argv++;
|
|
if (!*argv)
|
|
usage(usage_msg);
|
|
if (!strcmp(*argv, "relative"))
|
|
show_relative_dates(argv+1);
|
|
else if (!strcmp(*argv, "human"))
|
|
show_human_dates(argv+1);
|
|
else if (skip_prefix(*argv, "show:", &x))
|
|
show_dates(argv+1, x);
|
|
else if (!strcmp(*argv, "parse"))
|
|
parse_dates(argv+1);
|
|
else if (!strcmp(*argv, "approxidate"))
|
|
parse_approxidate(argv+1);
|
|
else if (!strcmp(*argv, "timestamp"))
|
|
parse_approx_timestamp(argv+1);
|
|
else if (!strcmp(*argv, "getnanos"))
|
|
getnanos(argv+1);
|
|
else if (!strcmp(*argv, "is64bit"))
|
|
return sizeof(timestamp_t) == 8 ? 0 : 1;
|
|
else if (!strcmp(*argv, "time_t-is64bit"))
|
|
return sizeof(time_t) == 8 ? 0 : 1;
|
|
else
|
|
usage(usage_msg);
|
|
return 0;
|
|
}
|