Removed UTIL_setFileStat from util.h and move it to util.c
This commit is contained in:
parent
f881ee8c48
commit
d6d240f016
171
programs/util.c
171
programs/util.c
@ -18,6 +18,46 @@ extern "C" {
|
|||||||
******************************************/
|
******************************************/
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
|
|
||||||
|
int UTIL_isRegularFile(const char* infilename)
|
||||||
|
{
|
||||||
|
stat_t statbuf;
|
||||||
|
return UTIL_getFileStat(infilename, &statbuf); /* Only need to know whether it is a regular file */
|
||||||
|
}
|
||||||
|
|
||||||
|
int UTIL_getFileStat(const char* infilename, stat_t *statbuf)
|
||||||
|
{
|
||||||
|
int r;
|
||||||
|
#if defined(_MSC_VER)
|
||||||
|
r = _stat64(infilename, statbuf);
|
||||||
|
if (r || !(statbuf->st_mode & S_IFREG)) return 0; /* No good... */
|
||||||
|
#else
|
||||||
|
r = stat(infilename, statbuf);
|
||||||
|
if (r || !S_ISREG(statbuf->st_mode)) return 0; /* No good... */
|
||||||
|
#endif
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int UTIL_setFileStat(const char *filename, stat_t *statbuf)
|
||||||
|
{
|
||||||
|
int res = 0;
|
||||||
|
struct utimbuf timebuf;
|
||||||
|
|
||||||
|
if (!UTIL_isRegularFile(filename))
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
timebuf.actime = time(NULL);
|
||||||
|
timebuf.modtime = statbuf->st_mtime;
|
||||||
|
res += utime(filename, &timebuf); /* set access and modification times */
|
||||||
|
|
||||||
|
#if !defined(_WIN32)
|
||||||
|
res += chown(filename, statbuf->st_uid, statbuf->st_gid); /* Copy ownership */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
res += chmod(filename, statbuf->st_mode & 07777); /* Copy file permissions */
|
||||||
|
|
||||||
|
errno = 0;
|
||||||
|
return -res; /* number of errors is returned */
|
||||||
|
}
|
||||||
|
|
||||||
U32 UTIL_isDirectory(const char* infilename)
|
U32 UTIL_isDirectory(const char* infilename)
|
||||||
{
|
{
|
||||||
@ -87,6 +127,137 @@ U64 UTIL_getTotalFileSize(const char* const * const fileNamesTable, unsigned nbF
|
|||||||
return error ? UTIL_FILESIZE_UNKNOWN : total;
|
return error ? UTIL_FILESIZE_UNKNOWN : total;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*-****************************************
|
||||||
|
* Time functions
|
||||||
|
******************************************/
|
||||||
|
#if defined(_WIN32) /* Windows */
|
||||||
|
UTIL_time_t UTIL_getTime(void) { UTIL_time_t x; QueryPerformanceCounter(&x); return x; }
|
||||||
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
||||||
|
{
|
||||||
|
static LARGE_INTEGER ticksPerSecond;
|
||||||
|
static int init = 0;
|
||||||
|
if (!init) {
|
||||||
|
if (!QueryPerformanceFrequency(&ticksPerSecond))
|
||||||
|
UTIL_DISPLAYLEVEL(1, "ERROR: QueryPerformanceFrequency() failure\n");
|
||||||
|
init = 1;
|
||||||
|
}
|
||||||
|
return 1000000ULL*(clockEnd.QuadPart - clockStart.QuadPart)/ticksPerSecond.QuadPart;
|
||||||
|
}
|
||||||
|
U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
||||||
|
{
|
||||||
|
static LARGE_INTEGER ticksPerSecond;
|
||||||
|
static int init = 0;
|
||||||
|
if (!init) {
|
||||||
|
if (!QueryPerformanceFrequency(&ticksPerSecond))
|
||||||
|
UTIL_DISPLAYLEVEL(1, "ERROR: QueryPerformanceFrequency() failure\n");
|
||||||
|
init = 1;
|
||||||
|
}
|
||||||
|
return 1000000000ULL*(clockEnd.QuadPart - clockStart.QuadPart)/ticksPerSecond.QuadPart;
|
||||||
|
}
|
||||||
|
|
||||||
|
#elif defined(__APPLE__) && defined(__MACH__)
|
||||||
|
UTIL_time_t UTIL_getTime(void) { return mach_absolute_time(); }
|
||||||
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
||||||
|
{
|
||||||
|
static mach_timebase_info_data_t rate;
|
||||||
|
static int init = 0;
|
||||||
|
if (!init) {
|
||||||
|
mach_timebase_info(&rate);
|
||||||
|
init = 1;
|
||||||
|
}
|
||||||
|
return (((clockEnd - clockStart) * (U64)rate.numer) / ((U64)rate.denom))/1000ULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
||||||
|
{
|
||||||
|
static mach_timebase_info_data_t rate;
|
||||||
|
static int init = 0;
|
||||||
|
if (!init) {
|
||||||
|
mach_timebase_info(&rate);
|
||||||
|
init = 1;
|
||||||
|
}
|
||||||
|
return ((clockEnd - clockStart) * (U64)rate.numer) / ((U64)rate.denom);
|
||||||
|
}
|
||||||
|
|
||||||
|
#elif (PLATFORM_POSIX_VERSION >= 200112L) \
|
||||||
|
&& (defined(__UCLIBC__) \
|
||||||
|
|| (defined(__GLIBC__) \
|
||||||
|
&& ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 17) \
|
||||||
|
|| (__GLIBC__ > 2))))
|
||||||
|
|
||||||
|
UTIL_time_t UTIL_getTime(void)
|
||||||
|
{
|
||||||
|
UTIL_time_t time;
|
||||||
|
if (clock_gettime(CLOCK_MONOTONIC, &time))
|
||||||
|
UTIL_DISPLAYLEVEL(1, "ERROR: Failed to get time\n"); /* we could also exit() */
|
||||||
|
return time;
|
||||||
|
}
|
||||||
|
|
||||||
|
UTIL_time_t UTIL_getSpanTime(UTIL_time_t begin, UTIL_time_t end)
|
||||||
|
{
|
||||||
|
UTIL_time_t diff;
|
||||||
|
if (end.tv_nsec < begin.tv_nsec) {
|
||||||
|
diff.tv_sec = (end.tv_sec - 1) - begin.tv_sec;
|
||||||
|
diff.tv_nsec = (end.tv_nsec + 1000000000ULL) - begin.tv_nsec;
|
||||||
|
} else {
|
||||||
|
diff.tv_sec = end.tv_sec - begin.tv_sec;
|
||||||
|
diff.tv_nsec = end.tv_nsec - begin.tv_nsec;
|
||||||
|
}
|
||||||
|
return diff;
|
||||||
|
}
|
||||||
|
|
||||||
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t begin, UTIL_time_t end)
|
||||||
|
{
|
||||||
|
UTIL_time_t const diff = UTIL_getSpanTime(begin, end);
|
||||||
|
U64 micro = 0;
|
||||||
|
micro += 1000000ULL * diff.tv_sec;
|
||||||
|
micro += diff.tv_nsec / 1000ULL;
|
||||||
|
return micro;
|
||||||
|
}
|
||||||
|
|
||||||
|
U64 UTIL_getSpanTimeNano(UTIL_time_t begin, UTIL_time_t end)
|
||||||
|
{
|
||||||
|
UTIL_time_t const diff = UTIL_getSpanTime(begin, end);
|
||||||
|
U64 nano = 0;
|
||||||
|
nano += 1000000000ULL * diff.tv_sec;
|
||||||
|
nano += diff.tv_nsec;
|
||||||
|
return nano;
|
||||||
|
}
|
||||||
|
|
||||||
|
#else /* relies on standard C (note : clock_t measurements can be wrong when using multi-threading) */
|
||||||
|
typedef clock_t UTIL_time_t;
|
||||||
|
#define UTIL_TIME_INITIALIZER 0
|
||||||
|
UTIL_time_t UTIL_getTime(void) { return clock(); }
|
||||||
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }
|
||||||
|
U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define SEC_TO_MICRO 1000000
|
||||||
|
|
||||||
|
/* returns time span in microseconds */
|
||||||
|
U64 UTIL_clockSpanMicro(UTIL_time_t clockStart )
|
||||||
|
{
|
||||||
|
UTIL_time_t const clockEnd = UTIL_getTime();
|
||||||
|
return UTIL_getSpanTimeMicro(clockStart, clockEnd);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* returns time span in microseconds */
|
||||||
|
U64 UTIL_clockSpanNano(UTIL_time_t clockStart )
|
||||||
|
{
|
||||||
|
UTIL_time_t const clockEnd = UTIL_getTime();
|
||||||
|
return UTIL_getSpanTimeNano(clockStart, clockEnd);
|
||||||
|
}
|
||||||
|
|
||||||
|
void UTIL_waitForNextTick(void)
|
||||||
|
{
|
||||||
|
UTIL_time_t const clockStart = UTIL_getTime();
|
||||||
|
UTIL_time_t clockEnd;
|
||||||
|
do {
|
||||||
|
clockEnd = UTIL_getTime();
|
||||||
|
} while (UTIL_getSpanTimeNano(clockStart, clockEnd) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
#if defined (__cplusplus)
|
#if defined (__cplusplus)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
161
programs/util.h
161
programs/util.h
@ -122,29 +122,9 @@ static int g_utilDisplayLevel;
|
|||||||
#define UTIL_TIME_INITIALIZER { { 0, 0 } }
|
#define UTIL_TIME_INITIALIZER { { 0, 0 } }
|
||||||
typedef LARGE_INTEGER UTIL_time_t;
|
typedef LARGE_INTEGER UTIL_time_t;
|
||||||
|
|
||||||
UTIL_STATIC UTIL_time_t UTIL_getTime(void) { UTIL_time_t x; QueryPerformanceCounter(&x); return x; }
|
UTIL_time_t UTIL_getTime(void);
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd);
|
||||||
{
|
U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd);
|
||||||
static LARGE_INTEGER ticksPerSecond;
|
|
||||||
static int init = 0;
|
|
||||||
if (!init) {
|
|
||||||
if (!QueryPerformanceFrequency(&ticksPerSecond))
|
|
||||||
UTIL_DISPLAYLEVEL(1, "ERROR: QueryPerformanceFrequency() failure\n");
|
|
||||||
init = 1;
|
|
||||||
}
|
|
||||||
return 1000000ULL*(clockEnd.QuadPart - clockStart.QuadPart)/ticksPerSecond.QuadPart;
|
|
||||||
}
|
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
|
||||||
{
|
|
||||||
static LARGE_INTEGER ticksPerSecond;
|
|
||||||
static int init = 0;
|
|
||||||
if (!init) {
|
|
||||||
if (!QueryPerformanceFrequency(&ticksPerSecond))
|
|
||||||
UTIL_DISPLAYLEVEL(1, "ERROR: QueryPerformanceFrequency() failure\n");
|
|
||||||
init = 1;
|
|
||||||
}
|
|
||||||
return 1000000000ULL*(clockEnd.QuadPart - clockStart.QuadPart)/ticksPerSecond.QuadPart;
|
|
||||||
}
|
|
||||||
|
|
||||||
#elif defined(__APPLE__) && defined(__MACH__)
|
#elif defined(__APPLE__) && defined(__MACH__)
|
||||||
|
|
||||||
@ -152,27 +132,9 @@ static int g_utilDisplayLevel;
|
|||||||
#define UTIL_TIME_INITIALIZER 0
|
#define UTIL_TIME_INITIALIZER 0
|
||||||
typedef U64 UTIL_time_t;
|
typedef U64 UTIL_time_t;
|
||||||
|
|
||||||
UTIL_STATIC UTIL_time_t UTIL_getTime(void) { return mach_absolute_time(); }
|
UTIL_time_t UTIL_getTime(void);
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd);
|
||||||
{
|
U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd);
|
||||||
static mach_timebase_info_data_t rate;
|
|
||||||
static int init = 0;
|
|
||||||
if (!init) {
|
|
||||||
mach_timebase_info(&rate);
|
|
||||||
init = 1;
|
|
||||||
}
|
|
||||||
return (((clockEnd - clockStart) * (U64)rate.numer) / ((U64)rate.denom))/1000ULL;
|
|
||||||
}
|
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd)
|
|
||||||
{
|
|
||||||
static mach_timebase_info_data_t rate;
|
|
||||||
static int init = 0;
|
|
||||||
if (!init) {
|
|
||||||
mach_timebase_info(&rate);
|
|
||||||
init = 1;
|
|
||||||
}
|
|
||||||
return ((clockEnd - clockStart) * (U64)rate.numer) / ((U64)rate.denom);
|
|
||||||
}
|
|
||||||
|
|
||||||
#elif (PLATFORM_POSIX_VERSION >= 200112L) \
|
#elif (PLATFORM_POSIX_VERSION >= 200112L) \
|
||||||
&& (defined(__UCLIBC__) \
|
&& (defined(__UCLIBC__) \
|
||||||
@ -184,77 +146,30 @@ static int g_utilDisplayLevel;
|
|||||||
typedef struct timespec UTIL_freq_t;
|
typedef struct timespec UTIL_freq_t;
|
||||||
typedef struct timespec UTIL_time_t;
|
typedef struct timespec UTIL_time_t;
|
||||||
|
|
||||||
UTIL_STATIC UTIL_time_t UTIL_getTime(void)
|
UTIL_time_t UTIL_getTime(void);
|
||||||
{
|
|
||||||
UTIL_time_t time;
|
|
||||||
if (clock_gettime(CLOCK_MONOTONIC, &time))
|
|
||||||
UTIL_DISPLAYLEVEL(1, "ERROR: Failed to get time\n"); /* we could also exit() */
|
|
||||||
return time;
|
|
||||||
}
|
|
||||||
|
|
||||||
UTIL_STATIC UTIL_time_t UTIL_getSpanTime(UTIL_time_t begin, UTIL_time_t end)
|
UTIL_time_t UTIL_getSpanTime(UTIL_time_t begin, UTIL_time_t end);
|
||||||
{
|
|
||||||
UTIL_time_t diff;
|
|
||||||
if (end.tv_nsec < begin.tv_nsec) {
|
|
||||||
diff.tv_sec = (end.tv_sec - 1) - begin.tv_sec;
|
|
||||||
diff.tv_nsec = (end.tv_nsec + 1000000000ULL) - begin.tv_nsec;
|
|
||||||
} else {
|
|
||||||
diff.tv_sec = end.tv_sec - begin.tv_sec;
|
|
||||||
diff.tv_nsec = end.tv_nsec - begin.tv_nsec;
|
|
||||||
}
|
|
||||||
return diff;
|
|
||||||
}
|
|
||||||
|
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t begin, UTIL_time_t end)
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t begin, UTIL_time_t end);
|
||||||
{
|
|
||||||
UTIL_time_t const diff = UTIL_getSpanTime(begin, end);
|
|
||||||
U64 micro = 0;
|
|
||||||
micro += 1000000ULL * diff.tv_sec;
|
|
||||||
micro += diff.tv_nsec / 1000ULL;
|
|
||||||
return micro;
|
|
||||||
}
|
|
||||||
|
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeNano(UTIL_time_t begin, UTIL_time_t end)
|
U64 UTIL_getSpanTimeNano(UTIL_time_t begin, UTIL_time_t end);
|
||||||
{
|
|
||||||
UTIL_time_t const diff = UTIL_getSpanTime(begin, end);
|
|
||||||
U64 nano = 0;
|
|
||||||
nano += 1000000000ULL * diff.tv_sec;
|
|
||||||
nano += diff.tv_nsec;
|
|
||||||
return nano;
|
|
||||||
}
|
|
||||||
|
|
||||||
#else /* relies on standard C (note : clock_t measurements can be wrong when using multi-threading) */
|
#else /* relies on standard C (note : clock_t measurements can be wrong when using multi-threading) */
|
||||||
typedef clock_t UTIL_time_t;
|
typedef clock_t UTIL_time_t;
|
||||||
#define UTIL_TIME_INITIALIZER 0
|
#define UTIL_TIME_INITIALIZER 0
|
||||||
UTIL_STATIC UTIL_time_t UTIL_getTime(void) { return clock(); }
|
UTIL_time_t UTIL_getTime(void) { return clock(); }
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }
|
U64 UTIL_getSpanTimeMicro(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }
|
||||||
UTIL_STATIC U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }
|
U64 UTIL_getSpanTimeNano(UTIL_time_t clockStart, UTIL_time_t clockEnd) { return 1000000000ULL * (clockEnd - clockStart) / CLOCKS_PER_SEC; }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define SEC_TO_MICRO 1000000
|
#define SEC_TO_MICRO 1000000
|
||||||
|
|
||||||
/* returns time span in microseconds */
|
/* returns time span in microseconds */
|
||||||
UTIL_STATIC U64 UTIL_clockSpanMicro(UTIL_time_t clockStart )
|
U64 UTIL_clockSpanMicro(UTIL_time_t clockStart);
|
||||||
{
|
|
||||||
UTIL_time_t const clockEnd = UTIL_getTime();
|
|
||||||
return UTIL_getSpanTimeMicro(clockStart, clockEnd);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* returns time span in microseconds */
|
/* returns time span in microseconds */
|
||||||
UTIL_STATIC U64 UTIL_clockSpanNano(UTIL_time_t clockStart )
|
U64 UTIL_clockSpanNano(UTIL_time_t clockStart);
|
||||||
{
|
void UTIL_waitForNextTick(void);
|
||||||
UTIL_time_t const clockEnd = UTIL_getTime();
|
|
||||||
return UTIL_getSpanTimeNano(clockStart, clockEnd);
|
|
||||||
}
|
|
||||||
|
|
||||||
UTIL_STATIC void UTIL_waitForNextTick(void)
|
|
||||||
{
|
|
||||||
UTIL_time_t const clockStart = UTIL_getTime();
|
|
||||||
UTIL_time_t clockEnd;
|
|
||||||
do {
|
|
||||||
clockEnd = UTIL_getTime();
|
|
||||||
} while (UTIL_getSpanTimeNano(clockStart, clockEnd) == 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -269,50 +184,10 @@ UTIL_STATIC void UTIL_waitForNextTick(void)
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
UTIL_STATIC int UTIL_getFileStat(const char* infilename, stat_t *statbuf)
|
int UTIL_isRegularFile(const char* infilename);
|
||||||
{
|
|
||||||
int r;
|
|
||||||
#if defined(_MSC_VER)
|
|
||||||
r = _stat64(infilename, statbuf);
|
|
||||||
if (r || !(statbuf->st_mode & S_IFREG)) return 0; /* No good... */
|
|
||||||
#else
|
|
||||||
r = stat(infilename, statbuf);
|
|
||||||
if (r || !S_ISREG(statbuf->st_mode)) return 0; /* No good... */
|
|
||||||
#endif
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
UTIL_STATIC int UTIL_isRegularFile(const char* infilename)
|
|
||||||
{
|
|
||||||
stat_t statbuf;
|
|
||||||
return UTIL_getFileStat(infilename, &statbuf); /* Only need to know whether it is a regular file */
|
|
||||||
}
|
|
||||||
|
|
||||||
UTIL_STATIC int UTIL_setFileStat(const char *filename, stat_t *statbuf)
|
|
||||||
{
|
|
||||||
int res = 0;
|
|
||||||
struct utimbuf timebuf;
|
|
||||||
|
|
||||||
if (!UTIL_isRegularFile(filename))
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
timebuf.actime = time(NULL);
|
|
||||||
timebuf.modtime = statbuf->st_mtime;
|
|
||||||
res += utime(filename, &timebuf); /* set access and modification times */
|
|
||||||
|
|
||||||
#if !defined(_WIN32)
|
|
||||||
res += chown(filename, statbuf->st_uid, statbuf->st_gid); /* Copy ownership */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
res += chmod(filename, statbuf->st_mode & 07777); /* Copy file permissions */
|
|
||||||
|
|
||||||
errno = 0;
|
|
||||||
return -res; /* number of errors is returned */
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
int UTIL_setFileStat(const char *filename, stat_t *statbuf);
|
int UTIL_setFileStat(const char *filename, stat_t *statbuf);
|
||||||
U32 UTIL_isDirectory(const char* infilename);
|
U32 UTIL_isDirectory(const char* infilename);
|
||||||
|
int UTIL_getFileStat(const char* infilename, stat_t *statbuf);
|
||||||
|
|
||||||
U32 UTIL_isLink(const char* infilename);
|
U32 UTIL_isLink(const char* infilename);
|
||||||
#define UTIL_FILESIZE_UNKNOWN ((U64)(-1))
|
#define UTIL_FILESIZE_UNKNOWN ((U64)(-1))
|
||||||
|
Loading…
Reference in New Issue
Block a user