Commit 01279307 authored by Ramon Nou's avatar Ramon Nou
Browse files

Merge branch 'fix_libc_syscall' into 'master' 

remove syscall linking in libc and user lib

* Linking syscall intercept in libc / userLib, makes syscall working on libc branches...

See merge request !300
parents e28fc75e 2cf54aca

include/client/logging.hpp

+2 −7
Original line number Diff line number Diff line
@@ -290,16 +290,11 @@ mini_gmtime_r(const time_t* timep, struct tm* tm) { 
    return tm;

}



static inline struct tm*

mini_gmtime(const time_t* timep) {

    static struct tm tm;

    return mini_gmtime_r(timep, &tm);

}



static inline ssize_t

format_timeval(struct timeval* tv, char* buf, size_t sz) {

    ssize_t written = -1;

    const struct tm* gm = mini_gmtime(&tv->tv_sec);

    struct tm tm;

    const struct tm* gm = mini_gmtime_r(&tv->tv_sec, &tm);





    written = (ssize_t) strftime(buf, sz, "%Y-%m-%d %H:%M:%S", gm);

src/client/CMakeLists.txt

+0 −2
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ if (GKFS_BUILD_USER_LIB) 
    fmt::fmt

    Threads::Threads

    Microsoft.GSL::GSL

    Syscall_intercept::Syscall_intercept

)

endif()
@@ -193,7 +192,6 @@ target_link_libraries( 
    fmt::fmt

    Threads::Threads

    Microsoft.GSL::GSL

    Syscall_intercept::Syscall_intercept

)

# Enable MSGPack metrics for intercept only

if (GKFS_ENABLE_CLIENT_METRICS)