3277a2370a
Refactor sprinttime: implement sprinttime_nsec and sprinttime_usec that handle nanoseconds and microseconds, respectively. Always print raw values of time data fields, format string representations of time as comments. * defs.h (sprinttime): Change argument type from time_t to long long. (sprinttime_nsec, sprinttime_usec): New prototypes. * util.c (sprinttime_ex, sprinttime_nsec, sprinttime_usec): New functions. (sprinttime): Turn into a thin wrapper around sprinttime_ex. * stat.h (struct strace_stat): Add has_nsec field. * fetch_struct_stat.c (HAVE_NSEC): New macro. (fetch_struct_stat): Initialize has_nsec field with HAVE_NSEC. * fetch_struct_stat64.c (HAVE_NSEC): New macro. (fetch_struct_stat64): Initialize has_nsec field with HAVE_NSEC. * print_struct_stat.c (print_struct_stat) <PRINT_ST_TIME>: Print raw values of time fields, use sprinttime_nsec to format a string representation of time, use tprints_comment to print it as a comment. * statx.c (SYS_FUNC(statx)) <PRINT_FIELD_TIME>: Likewise. * utime.c (SYS_FUNC(utime)): Print raw values of struct utimbuf.actime and struct utimbuf.modtime fields, use sprinttime to format a string representation of time, use tprints_comment to print it as a comment. * tests/tests.h (print_time_t_nsec): Add int argument. * tests/print_time.c (print_time_t_ex): New function. (print_time_t_nsec): Add int argument, turn into a thin wrapper around print_time_t_ex. * tests/utime.c (main): Update expected output. * tests/xstatx.c [!IS_STATX] (HAVE_NSEC): New macro. [!IS_STATX] (PRINT_ST_TIME), [IS_STATX] (PRINT_FIELD_TIME): Update expected output. * NEWS: Mention this timestamps representation improvement. Co-authored-by: Dmitry V. Levin <ldv@altlinux.org>
118 lines
3.5 KiB
C
118 lines
3.5 KiB
C
/*
|
|
* Copyright (c) 2017 The strace developers.
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include "defs.h"
|
|
#include "statx.h"
|
|
|
|
#include <sys/stat.h>
|
|
|
|
#include "xlat/statx_masks.h"
|
|
#include "xlat/statx_attrs.h"
|
|
#include "xlat/at_statx_sync_types.h"
|
|
|
|
SYS_FUNC(statx)
|
|
{
|
|
if (entering(tcp)) {
|
|
print_dirfd(tcp, tcp->u_arg[0]);
|
|
printpath(tcp, tcp->u_arg[1]);
|
|
tprints(", ");
|
|
|
|
unsigned int flags = tcp->u_arg[2];
|
|
printflags(at_statx_sync_types, flags & AT_STATX_SYNC_TYPE,
|
|
NULL);
|
|
flags &= ~AT_STATX_SYNC_TYPE;
|
|
if (flags) {
|
|
tprints("|");
|
|
printflags(at_flags, flags, NULL);
|
|
}
|
|
|
|
tprints(", ");
|
|
printflags(statx_masks, tcp->u_arg[3], "STATX_???");
|
|
tprints(", ");
|
|
} else {
|
|
#define PRINT_FIELD_U(field) \
|
|
tprintf(", %s=%llu", #field, (unsigned long long) stx.field)
|
|
|
|
#define PRINT_FIELD_TIME(field) \
|
|
do { \
|
|
tprintf(", " #field "={tv_sec=%" PRId64 \
|
|
", tv_nsec=%" PRIu32 "}", \
|
|
stx.field.sec, stx.field.nsec); \
|
|
tprints_comment(sprinttime_nsec(stx.field.sec, \
|
|
zero_extend_signed_to_ull(stx.field.nsec))); \
|
|
} while (0)
|
|
|
|
struct_statx stx;
|
|
if (umove_or_printaddr(tcp, tcp->u_arg[4], &stx))
|
|
return 0;
|
|
|
|
tprints("{stx_mask=");
|
|
printflags(statx_masks, stx.stx_mask, "STATX_???");
|
|
|
|
if (!abbrev(tcp))
|
|
PRINT_FIELD_U(stx_blksize);
|
|
|
|
tprints(", stx_attributes=");
|
|
printflags(statx_attrs, stx.stx_attributes, "STATX_ATTR_???");
|
|
|
|
if (!abbrev(tcp)) {
|
|
PRINT_FIELD_U(stx_nlink);
|
|
printuid(", stx_uid=", stx.stx_uid);
|
|
printuid(", stx_gid=", stx.stx_gid);
|
|
}
|
|
|
|
tprints(", stx_mode=");
|
|
print_symbolic_mode_t(stx.stx_mode);
|
|
|
|
if (!abbrev(tcp))
|
|
PRINT_FIELD_U(stx_ino);
|
|
|
|
PRINT_FIELD_U(stx_size);
|
|
|
|
if (!abbrev(tcp)) {
|
|
PRINT_FIELD_U(stx_blocks);
|
|
|
|
tprints(", stx_attributes_mask=");
|
|
printflags(statx_attrs, stx.stx_attributes_mask,
|
|
"STATX_ATTR_???");
|
|
|
|
PRINT_FIELD_TIME(stx_atime);
|
|
PRINT_FIELD_TIME(stx_btime);
|
|
PRINT_FIELD_TIME(stx_ctime);
|
|
PRINT_FIELD_TIME(stx_mtime);
|
|
PRINT_FIELD_U(stx_rdev_major);
|
|
PRINT_FIELD_U(stx_rdev_minor);
|
|
PRINT_FIELD_U(stx_dev_major);
|
|
PRINT_FIELD_U(stx_dev_minor);
|
|
} else {
|
|
tprints(", ...");
|
|
}
|
|
tprints("}");
|
|
}
|
|
return 0;
|
|
}
|