remove da log printing from probe_file

diff --git a/probe_file/da_io.h b/probe_file/da_io.h
index 57e6f2f..23cec28 100755 (executable)
--- a/probe_file/da_io.h
+++ b/probe_file/da_io.h
@@ -64,7 +64,7 @@
        _fd = (FILEP != NULL) ? fileno(FILEP) : -1\r
 \r
 #define DECLARE_VARIABLE_FD                                                    \\r
-               DECLARE_VARIABLE_STANDARD; log_t log;           \\r
+               DECLARE_VARIABLE_STANDARD;                                      \\r
                char* _filepath = "";                                           \\r
                int __attribute((unused)) _fd;                          \\r
                int __attribute((unused)) _fstatret = -1;       \\r
@@ -74,34 +74,15 @@
 // POST_PROBEBLOCK_MIDDLE for file\r
 // =================================================================\r
 \r
-#define POST_PROBEBLOCK_MIDDLE_FD(SIZE, FD, APITYPE)                                                   \\r
-       log.length += sprintf(log.data + log.length, "`,%u`,%d`,%d`,%d`,%ld`,%s",       \\r
-                       SIZE, FD, FD_FILE, APITYPE, (_fstatret == 0 ? _statbuf.st_size : 0), _filepath)\r
-\r
 #define POST_PACK_PROBEBLOCK_MIDDLE_FD(SIZE, FD, APITYPE)                      \\r
        PACK_RESOURCE(SIZE, FD, FD_FILE, APITYPE,                                               \\r
                      (_fstatret == 0 ? _statbuf.st_size : 0), _filepath);      \\r
        FLUSH_LOCAL_BUF()\r
 \r
-#define POST_PROBEBLOCK_MIDDLE_NOFD(SIZE, APITYPE)                                                     \\r
-       log.length += sprintf(log.data + log.length, "`,%u`,`,%d`,%d`,0`,%s",   \\r
-                       SIZE, FD_FILE, APITYPE, _filepath)\r
-\r
 #define POST_PACK_PROBEBLOCK_MIDDLE_NOFD(SIZE, APITYPE)                        \\r
        PACK_RESOURCE(SIZE, 0, FD_FILE, APITYPE, 0, _filepath);         \\r
        FLUSH_LOCAL_BUF()\r
 \r
-#define POST_PROBEBLOCK_CALLSTACK_RESOURCE(APITYPE)                                    \\r
-       do {                                                                                                                    \\r
-               if(APITYPE == FD_API_OPEN) {                                                            \\r
-                       APPEND_LOG_CALLSTACK();                                                                 \\r
-               } else if(unlikely(newerrno != 0 || blockresult == 2)) {        \\r
-                       APPEND_LOG_CALLSTACK();                                                                 \\r
-               } else {                                                                                                        \\r
-                       APPEND_LOG_NULL_CALLSTACK();                                                    \\r
-               }                                                                                                                       \\r
-       } while(0)\r
-\r
 // ==================================================================\r
 // BEFORE_ORIGINAL macro for file\r
 // ==================================================================\r
@@ -121,13 +102,6 @@
 // AFTER_ORIGINAL macro for file\r
 // ==================================================================\r
 \r
-#define AFTER_ORIGINAL_FD_RET(RTYPE, RVAL, SIZE, FD, APITYPE, INPUTFORMAT, ...)        \\r
-       POST_PROBEBLOCK_BEGIN(LC_RESOURCE, RTYPE, RVAL, INPUTFORMAT, __VA_ARGS__);      \\r
-       _fstatret = fstat(FD, &_statbuf);                                                                                       \\r
-       POST_PROBEBLOCK_MIDDLE_FD(SIZE, FD, APITYPE);                                                           \\r
-       POST_PROBEBLOCK_CALLSTACK_RESOURCE(APITYPE);                                                            \\r
-       POST_PROBEBLOCK_END()\r
-\r
 #define AFTER_PACK_ORIGINAL_FD(RVAL, SIZE, FD, APITYPE, INPUTFORMAT, ...)                      \\r
        POST_PACK_PROBEBLOCK_BEGIN();                                                                                                   \\r
        PREPARE_LOCAL_BUF();                                                                                                                    \\r
@@ -137,12 +111,6 @@
        POST_PACK_PROBEBLOCK_MIDDLE_FD(SIZE, FD, APITYPE);                                                              \\r
        POST_PACK_PROBEBLOCK_END()\r
 \r
-#define AFTER_ORIGINAL_NOFD_RET(RTYPE, RVAL, SIZE, APITYPE, INPUTFORMAT, ...)  \\r
-       POST_PROBEBLOCK_BEGIN(LC_RESOURCE, RTYPE, RVAL, INPUTFORMAT, __VA_ARGS__);      \\r
-       POST_PROBEBLOCK_MIDDLE_NOFD(SIZE, APITYPE);                                                                     \\r
-       POST_PROBEBLOCK_CALLSTACK_RESOURCE(APITYPE);                                                            \\r
-       POST_PROBEBLOCK_END()\r
-\r
 #define AFTER_PACK_ORIGINAL_NOFD(RVAL, SIZE, APITYPE, INPUTFORMAT, ...)                                        \\r
        POST_PACK_PROBEBLOCK_BEGIN();                                                                                                           \\r
        PREPARE_LOCAL_BUF();                                                                                                                            \\r
@@ -151,17 +119,6 @@
        POST_PACK_PROBEBLOCK_MIDDLE_NOFD(SIZE, APITYPE);                                                                        \\r
        POST_PACK_PROBEBLOCK_END()\r
 \r
-#define AFTER_ORIGINAL_FILEP_RET(RTYPE, RVAL, SIZE, FILEP, APITYPE, INPUTFORMAT, ...)  \\r
-       POST_PROBEBLOCK_BEGIN(LC_RESOURCE, RTYPE, RVAL, INPUTFORMAT, __VA_ARGS__);                      \\r
-       GET_FD_FROM_FILEP(FILEP);                                                                                                                       \\r
-       if(_fd != -1) {                                                                                                                                         \\r
-               _fstatret = fstat(_fd, &_statbuf);                                                                                              \\r
-       }                                                                                                                                                                       \\r
-       if(_fstatret != 0) PRINTMSG("ERROR : fstat error\n");                                                           \\r
-       POST_PROBEBLOCK_MIDDLE_FD(SIZE, _fd, APITYPE);                                                                          \\r
-       POST_PROBEBLOCK_CALLSTACK_RESOURCE(APITYPE);                                                                            \\r
-       POST_PROBEBLOCK_END()\r
-\r
 #define AFTER_PACK_ORIGINAL_FILEP(RVAL, SIZE, FILEP, APITYPE, INPUTFORMAT, ...)                        \\r
        POST_PACK_PROBEBLOCK_BEGIN();                                                                                                           \\r
        GET_FD_FROM_FILEP(FILEP);                                                                                                                       \\r
@@ -174,13 +131,4 @@
        POST_PACK_PROBEBLOCK_MIDDLE_FD(SIZE, _fd, APITYPE);                                                                     \\r
        POST_PACK_PROBEBLOCK_END()\r
 \r
-#define AFTER_ORIGINAL_FD(SIZE, FD, APITYPE, INPUTFORMAT, ...)                 \\r
-       AFTER_ORIGINAL_FD_RET(VT_INT, ret, SIZE, FD, APITYPE, INPUTFORMAT, __VA_ARGS__)\r
-\r
-#define AFTER_ORIGINAL_NOFD(SIZE, APITYPE, INPUTFORMAT, ...)                   \\r
-       AFTER_ORIGINAL_NOFD_RET(VT_INT, ret, SIZE, APITYPE, INPUTFORMAT, __VA_ARGS__)\r
-\r
-#define AFTER_ORIGINAL_FILEP(SIZE, FILEP, APITYPE, INPUTFORMAT, ...)   \\r
-       AFTER_ORIGINAL_FILEP_RET(VT_INT, ret, SIZE, FILEP, APITYPE, INPUTFORMAT, __VA_ARGS__)\r
-\r
 #endif // __DA_IO_H__\r

diff --git a/probe_file/da_io_posix.c b/probe_file/da_io_posix.c
index 4254cb9..85dabdd 100755 (executable)
--- a/probe_file/da_io_posix.c
+++ b/probe_file/da_io_posix.c
@@ -70,8 +70,6 @@ int open(const char* path, int oflag, ...)
 
        ret = openp(path, oflag, mode);
 
-//     AFTER_ORIGINAL_FD(0, ret, FD_API_OPEN, "%s, %d, %d", path, oflag, mode);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, ret, FD_API_OPEN, "sdd", path, oflag, mode);
 
        return ret;
@@ -95,8 +93,6 @@ int openat(int fd, const char* path, int oflag, ...)
 
        ret = openatp(fd, path, oflag, mode);
 
-//     AFTER_ORIGINAL_FD(0, ret, FD_API_OPEN, "%d, %s, %d, %d", fd, path, oflag, mode);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, ret, FD_API_OPEN, "dsdd", fd, path, oflag, mode);
 
        return ret;
@@ -111,8 +107,6 @@ int creat(const char* path, mode_t mode)
 
        ret = creatp(path, mode);
 
-//     AFTER_ORIGINAL_FD(0, ret, FD_API_OPEN, "%s, %d", path, mode);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, ret, FD_API_OPEN, "sd", path, mode);
 
        return ret;
@@ -131,12 +125,7 @@ int close(int fd)
        PRE_PROBEBLOCK_END();
 
        ret = closep(fd);
-/*
-       POST_PROBEBLOCK_BEGIN(LC_RESOURCE, VT_INT, ret, "%d", fd);
-       POST_PROBEBLOCK_MIDDLE_FD(0, fd, FD_API_CLOSE);
-       POST_PROBEBLOCK_CALLSTACK_RESOURCE(FD_API_CLOSE);
-       POST_PROBEBLOCK_END();
-*/
+
        POST_PACK_PROBEBLOCK_BEGIN();
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, LC_RESOURCE, "d", fd);
@@ -156,8 +145,6 @@ int access(const char *path, int amode)
 
        ret = accessp(path, amode);
 
-//     AFTER_ORIGINAL_NOFD(0, FD_API_PERMISSION, "%s, %d", path, amode);
-
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_PERMISSION, "sd", path, amode);
 
        return ret;
@@ -172,9 +159,6 @@ int faccessat(int fd, const char *path, int amode, int flag)
 
        ret = faccessatp(fd, path, amode, flag);
 
-//     AFTER_ORIGINAL_FD(0, fd, FD_API_PERMISSION,
-//                     "%d, %s, %d, %d", fd, path, amode, flag);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_PERMISSION, "dsdd", fd, path, amode, flag);
 
        return ret;
@@ -189,9 +173,6 @@ off_t lseek(int fd, off_t offset, int whence)
 
        offret = lseekp(fd, offset, whence);
 
-//     AFTER_ORIGINAL_FD_RET(VT_OFF_T, offret, (unsigned int)offset, fd, FD_API_OTHER,
-//                     "%d, %ld, %d", fd, offset, whence);
-
        AFTER_PACK_ORIGINAL_FD(offret, (unsigned int)offset, fd, FD_API_OTHER,
                        "dxd", fd, offset, whence);
 
@@ -206,8 +187,6 @@ int fsync(int fd)
 
        ret = fsyncp(fd);
 
-//     AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER, "%d", fd);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "d", fd);
 
        return ret;
@@ -221,8 +200,6 @@ int fdatasync(int fd)
 
        ret = fdatasyncp(fd);
 
-//     AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER, "%d", fd);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "d", fd);
 
        return ret;
@@ -237,9 +214,6 @@ int truncate(const char *path, off_t length)
 
        ret = truncatep(path, length);
 
-//     AFTER_ORIGINAL_NOFD((unsigned int)length, FD_API_DIRECTORY,
-//                     "%s, %ld", path, length);
-
        AFTER_PACK_ORIGINAL_NOFD(ret, (unsigned int)length, FD_API_DIRECTORY, "sx", path, length);
 
        return ret;
@@ -253,9 +227,6 @@ int ftruncate(int fd, off_t length)
 
        ret = ftruncatep(fd, length);
 
-//     AFTER_ORIGINAL_FD((unsigned int)length, fd, FD_API_DIRECTORY,
-//                     "%d, %ld", fd, length);
-
        AFTER_PACK_ORIGINAL_FD(ret, (unsigned int)length, fd, FD_API_DIRECTORY, "dx", fd, length);
 
        return ret;
@@ -272,8 +243,6 @@ int mkfifo(const char *path, mode_t mode)
 
        ret = mkfifop(path, mode);
 
-//     AFTER_ORIGINAL_NOFD(0, FD_API_OTHER, "%s, %u", path, mode);
-
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_OTHER, "sd", path, mode);
 
        return ret;
@@ -288,9 +257,6 @@ int mkfifoat(int fd, const char *path, mode_t mode)
 
        ret = mkfifoatp(fd, path, mode);
 
-//     AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER,
-//                     "%d, %s, %u", fd, path, mode);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dsd", fd, path, mode);
 
        return ret;
@@ -305,9 +271,6 @@ int mknod(const char *path, mode_t mode, dev_t dev)
 
        ret = mknodp(path, mode, dev);
 
-//     AFTER_ORIGINAL_NOFD(0, FD_API_OTHER,
-//                     "%s, %u, %lu", path, mode, (unsigned long int)dev);
-
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_OTHER,
                        "sdx", path, mode, (unsigned long int)dev);
 
@@ -323,9 +286,6 @@ int mknodat(int fd, const char *path, mode_t mode, dev_t dev)
 
        ret = mknodatp(fd,path, mode,dev);
 
-//     AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER,
-//                     "%d, %s, %u, %lu", fd, path, mode, (unsigned long int)dev);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER,
                        "dsdx", fd, path, mode, (unsigned long int)dev);
 
@@ -343,7 +303,6 @@ int chown(const char *path, uid_t owner, gid_t group)
        BEFORE_ORIGINAL_FILE(chown, LIBC);
        _filepath = (char*)path;
        ret = chownp(path, owner, group);
-//     AFTER_ORIGINAL_NOFD(0, FD_API_PERMISSION, "%s, %u, %u", path, owner, group);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_PERMISSION, "sdd", path, owner, group);
        return ret;
 }
@@ -355,8 +314,6 @@ int fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag)
        BEFORE_ORIGINAL_FILE(fchownat, LIBC);
        _filepath = (char*)path;
        ret = fchownatp(fd, path, owner, group, flag);
-//     AFTER_ORIGINAL_FD(0, fd, FD_API_PERMISSION,
-//                     "%d, %s, %u, %u, %d", fd, path, owner, group, flag);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_PERMISSION,
                        "dsddd", fd, path, owner, group, flag);
        return ret;
@@ -368,7 +325,6 @@ int fchown(int fd, uid_t owner, gid_t group)
 
        BEFORE_ORIGINAL_FILE(fchown, LIBC);
        ret = fchownp(fd, owner, group);
-//     AFTER_ORIGINAL_FD(0, fd, FD_API_PERMISSION, "%d, %u, %u", fd, owner, group);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_PERMISSION, "ddd", fd, owner, group);
        return ret;
 }
@@ -380,7 +336,6 @@ int lchown(const char *path, uid_t owner, gid_t group)
        BEFORE_ORIGINAL_FILE(lchown, LIBC);
        _filepath = (char*)path;
        ret = lchownp(path, owner, group);
-//     AFTER_ORIGINAL_NOFD(0, FD_API_PERMISSION, "%s, %u, %u", path, owner, group);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_PERMISSION, "sdd", path, owner, group);
        return ret;
 }
@@ -391,8 +346,6 @@ int lockf(int fd, int function, off_t size)
 
        BEFORE_ORIGINAL_FILE(lockf, LIBC);
        ret = lockfp(fd, function, size);
-       // AFTER_ORIGINAL_FD((unsigned int)size, fd, FD_API_PERMISSION,
-       //              "%d, %d, %ld", fd, function, size);
        AFTER_PACK_ORIGINAL_FD(ret, (unsigned int)size, fd, FD_API_PERMISSION,
                        "ddx", fd, function, size);
        return ret;
@@ -405,7 +358,6 @@ int chmod(const char *path, mode_t mode)
        BEFORE_ORIGINAL_FILE(chmod, LIBC);
        _filepath = (char*)path;
        ret = chmodp(path, mode);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_PERMISSION, "%s, %u", path, mode);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_PERMISSION, "sd", path, mode);
        return ret;
 }
@@ -417,8 +369,6 @@ int fchmodat(int fd, const char *path, mode_t mode, int flag)
        BEFORE_ORIGINAL_FILE(fchmodat, LIBC);
        _filepath = (char*)path;
        ret = fchmodatp(fd, path, mode, flag);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_PERMISSION,
-       //              "%d, %s, %u, %d", fd, path, mode, flag);
        AFTER_PACK_ORIGINAL_FD(ret,0, fd, FD_API_PERMISSION,
                        "dsdd", fd, path, mode, flag);
        return ret;
@@ -430,7 +380,6 @@ int fchmod(int fd, mode_t mode)
 
        BEFORE_ORIGINAL_FILE(fchmod, LIBC);
        ret = fchmodp(fd, mode);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_PERMISSION, "%d, %u", fd, mode);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_PERMISSION, "dd", fd, mode);
        return ret;
 }
@@ -448,9 +397,6 @@ ssize_t pread(int fd, void *buf, size_t nbyte, off_t offset)
 
        sret = preadp(fd, buf, nbyte, offset);
 
-       // AFTER_ORIGINAL_FD_RET(VT_SSIZE_T, sret, (unsigned int)sret, fd, FD_API_READ,
-       //              "%d, %p, %u, %ld", fd, buf, nbyte, offset);
-
        AFTER_PACK_ORIGINAL_FD(sret, (unsigned int)sret, fd, FD_API_READ,
                        "dpdx", fd, buf, nbyte, offset);
 
@@ -465,9 +411,6 @@ ssize_t read(int fd, void *buf, size_t nbyte)
 
        sret = readp(fd, buf, nbyte);
 
-       // AFTER_ORIGINAL_FD_RET(VT_SSIZE_T, sret, (unsigned int)sret, fd, FD_API_READ,
-       //              "%d, %p, %u", fd, buf, nbyte);
-
        AFTER_PACK_ORIGINAL_FD(sret, (unsigned int)sret, fd, FD_API_READ,
                        "dpd", fd, buf, nbyte);
 
@@ -483,9 +426,6 @@ ssize_t pwrite(int fd, const void *buf, size_t nbyte, off_t offset)
 
        sret = pwritep(fd, buf, nbyte, offset);
 
-       // AFTER_ORIGINAL_FD_RET(VT_SSIZE_T, sret, (unsigned int)sret, fd, FD_API_WRITE,
-       //              "%d, %p, %u, %ld", fd, buf, nbyte, offset);
-
        AFTER_PACK_ORIGINAL_FD(sret, (unsigned int)sret, fd, FD_API_WRITE,
                        "dpdx", fd, buf, nbyte, offset);
 
@@ -501,9 +441,6 @@ ssize_t write(int fd, const void *buf, size_t nbyte)
 
        sret = writep(fd, buf, nbyte);
 
-       // AFTER_ORIGINAL_FD_RET(VT_SSIZE_T, sret, (unsigned int)sret, fd, FD_API_WRITE,
-       //              "%d, %p, %u", fd, buf, nbyte);
-
        AFTER_PACK_ORIGINAL_FD(sret, (unsigned int)sret, fd, FD_API_WRITE,
                        "dpd", fd, buf, nbyte);
 
@@ -519,9 +456,6 @@ ssize_t readv(int fd, const struct iovec *iov, int iovcnt)
        BEFORE_ORIGINAL_FILE(readv, LIBC);
        sret = readvp(fd,iov,iovcnt);
 
-       // AFTER_ORIGINAL_FD_RET(VT_SSIZE_T, sret, (unsigned int)sret, fd, FD_API_READ,
-       //              "%d, %p, %d", fd, iov, iovcnt);
-
        AFTER_PACK_ORIGINAL_FD(sret, (unsigned int)sret, fd, FD_API_READ,
                        "dpd", fd, iov, iovcnt);
 
@@ -553,7 +487,6 @@ int rmdir(const char *path)
        BEFORE_ORIGINAL_FILE(rmdir, LIBC);
        _filepath = (char*)path;
        ret = rmdirp(path);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s", path);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "s", path);
        return ret;
 }
@@ -564,7 +497,6 @@ int fchdir(int fd)
 
        BEFORE_ORIGINAL_FILE(fchdir, LIBC);
        ret = fchdirp(fd);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_DIRECTORY, "%d", fd);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_DIRECTORY, "d", fd);
        return ret;
 }
@@ -576,7 +508,6 @@ int chdir(const char *path)
        BEFORE_ORIGINAL_FILE(chdir, LIBC);
        _filepath = (char*)path;
        ret = chdirp(path);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s", path);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "s", path);
        return ret;
 }
@@ -588,7 +519,6 @@ int link(const char *path1, const char *path2)
        BEFORE_ORIGINAL_FILE(link, LIBC);
        _filepath = (char*)path1;
        ret = linkp(path1, path2);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s, %s", path1, path2);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "ss", path1, path2);
        return ret;
 }
@@ -600,8 +530,6 @@ int linkat(int fd1, const char *path1, int fd2, const char *path2, int flag)
        BEFORE_ORIGINAL_FILE(linkat, LIBC);
        _filepath = (char*)path1;
        ret = linkatp(fd1, path1, fd2, path2, flag);
-       // AFTER_ORIGINAL_FD(0, fd2, FD_API_DIRECTORY,
-       //              "%d, %s, %d, %s, %d", fd1, path2, fd2, path2, flag);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd2, FD_API_DIRECTORY,
                        "dsdsd", fd1, path2, fd2, path2, flag);
        return ret;
@@ -614,7 +542,6 @@ int unlink(const char *path)
        BEFORE_ORIGINAL_FILE(unlink, LIBC);
        _filepath = (char*)path;
        ret = unlinkp(path);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s", path);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "s", path);
        return ret;
 }
@@ -626,7 +553,6 @@ int unlinkat(int fd, const char *path, int flag)
        BEFORE_ORIGINAL_FILE(unlinkat, LIBC);
        _filepath = (char*)path;
        ret = unlinkatp(fd, path, flag);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_DIRECTORY, "%d, %s, %d", fd, path, flag);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_DIRECTORY, "dsd", fd, path, flag);
        return ret;
 }
@@ -638,7 +564,6 @@ int symlink(const char *path1, const char *path2)
        BEFORE_ORIGINAL_FILE(symlink, LIBC);
        _filepath = (char*)path1;
        ret = symlinkp(path1, path2);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s, %s", path1, path2);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "ss", path1, path2);
        return ret;
 }
@@ -650,7 +575,6 @@ int symlinkat(const char *path1, int fd, const char *path2)
        BEFORE_ORIGINAL_FILE(symlinkat, LIBC);
        _filepath = (char*)path1;
        ret = symlinkatp(path1, fd, path2);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_DIRECTORY, "%s, %d, %s", path1, fd, path2);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_DIRECTORY, "sds", path1, fd, path2);
        return ret;
 }
@@ -665,9 +589,6 @@ ssize_t readlink(const char* path, char* buf, size_t bufsize)
 
        sret = readlinkp(path, buf, bufsize);
 
-       // AFTER_ORIGINAL_NOFD_RET(VT_SSIZE_T, sret, bufsize, FD_API_DIRECTORY,
-       //              "%s, %s, %u", path, buf, bufsize);
-
        AFTER_PACK_ORIGINAL_NOFD(sret, bufsize, FD_API_DIRECTORY,
                        "ssd", path, buf, bufsize);
 
@@ -684,9 +605,6 @@ ssize_t readlinkat(int fd, const char * path, char * buf, size_t bufsize)
 
        sret = readlinkatp(fd, path, buf, bufsize);
 
-       // AFTER_ORIGINAL_FD_RET(VT_SSIZE_T, sret, bufsize, fd, FD_API_DIRECTORY,
-       //              "%d, %s, %s, %u", fd, path, buf, bufsize);
-
        AFTER_PACK_ORIGINAL_FD(sret, bufsize, fd, FD_API_DIRECTORY,
                        "dssd", fd, path, buf, bufsize);
 
@@ -700,7 +618,6 @@ int mkdir(const char *path, mode_t mode)
        BEFORE_ORIGINAL_FILE(mkdir, LIBC);
        _filepath = (char*)path;
        ret = mkdirp(path, mode);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s, %u", path, mode);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "sd", path, mode);
        return ret;
 }
@@ -712,7 +629,6 @@ int mkdirat(int fd, const char *path, mode_t mode)
        BEFORE_ORIGINAL_FILE(mkdirat, LIBC);
        _filepath = (char*)path;
        ret = mkdiratp(fd, path, mode);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_DIRECTORY, "%d, %s, %u", fd, path, mode);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_DIRECTORY, "dsd", fd, path, mode);
        return ret;
 }
@@ -723,7 +639,6 @@ int closedir(DIR *dirp)
 
        BEFORE_ORIGINAL_FILE(closedir, LIBC);
        ret = closedirp(dirp);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%p", dirp);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "p", dirp);
        return ret;
 }
@@ -737,8 +652,6 @@ DIR *fdopendir(int fd)
 
        dret = fdopendirp(fd);
 
-       // AFTER_ORIGINAL_FD_RET(VT_PTR, dret, 0, fd, FD_API_DIRECTORY, "%d", fd);
-
        AFTER_PACK_ORIGINAL_FD(dret, 0, fd, FD_API_DIRECTORY, "d", fd);
 
        return dret;
@@ -754,8 +667,6 @@ DIR *opendir(const char *dirname)
 
        dret = opendirp(dirname);
 
-       // AFTER_ORIGINAL_NOFD_RET(VT_PTR, dret, 0, FD_API_DIRECTORY, "%s", dirname);
-
        AFTER_PACK_ORIGINAL_NOFD(dret, 0, FD_API_DIRECTORY, "s", dirname);
 
        return dret;
@@ -769,8 +680,6 @@ struct dirent *readdir(DIR *dirp)
        BEFORE_ORIGINAL_FILE(readdir, LIBC);
 
        dret = readdirp(dirp);
-       
-       // AFTER_ORIGINAL_NOFD_RET(VT_PTR, dret, 0, FD_API_DIRECTORY, "%p", dirp);
 
        AFTER_PACK_ORIGINAL_NOFD(dret, 0, FD_API_DIRECTORY, "p", dirp);
 
@@ -783,7 +692,6 @@ int readdir_r(DIR * dirp, struct dirent * entry, struct dirent ** result)
 
        BEFORE_ORIGINAL_FILE(readdir_r, LIBC);
        ret = readdir_rp(dirp, entry, result);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%p, %p, %p", dirp, entry, result);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "ppp", dirp, entry, result);
        return ret;
 }
@@ -796,7 +704,6 @@ void rewinddir(DIR *dirp)
 
        rewinddirp(dirp);
        
-       // AFTER_ORIGINAL_NOFD_RET(VT_NULL, NULL, 0, FD_API_DIRECTORY, "%p", dirp);
        AFTER_PACK_ORIGINAL_NOFD(0, 0, FD_API_DIRECTORY, "p", dirp);
 }
 
@@ -808,9 +715,6 @@ void seekdir(DIR *dirp, long loc)
 
        seekdirp(dirp, loc);
 
-       // AFTER_ORIGINAL_NOFD_RET(VT_NULL, NULL, 0, FD_API_DIRECTORY,
-       //              "%p, %ld", dirp, loc);
-
        AFTER_PACK_ORIGINAL_NOFD(0, 0, FD_API_DIRECTORY, "px", dirp, loc);
 }
 
@@ -823,8 +727,6 @@ long telldir(DIR *dirp)
 
        lret = telldirp(dirp);
 
-       // AFTER_ORIGINAL_NOFD_RET(VT_LONG, lret, 0, FD_API_DIRECTORY, "%p", dirp);
-
        AFTER_PACK_ORIGINAL_NOFD(lret, 0, FD_API_DIRECTORY, "p", dirp);
 
        return lret;
@@ -848,8 +750,6 @@ int fcntl(int fd, int cmd, ...)
 
        ret = fcntlp(fd, cmd, arg);
 
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER, "%d, %d, %d", fd, cmd, arg);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "ddd", fd, cmd, arg);
 
        return ret;
@@ -863,8 +763,6 @@ int dup(int fd)
 
        ret = dupp(fd);
 
-       // AFTER_ORIGINAL_FD(0, ret, FD_API_OPEN, "%d", fd);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, ret, FD_API_OPEN, "d", fd);
 
        return ret;
@@ -878,8 +776,6 @@ int dup2(int fd, int fd2)
 
        ret = dup2p(fd, fd2);
 
-       // AFTER_ORIGINAL_FD(0, ret, FD_API_OPEN, "%d, %d", fd, fd2);
-
        AFTER_PACK_ORIGINAL_FD(ret, 0, ret, FD_API_OPEN, "dd", fd, fd2);
 
        return ret;
@@ -894,7 +790,6 @@ int fstat(int fd, struct stat *buf)
 
        BEFORE_ORIGINAL_FILE(fstat, LIBC);
        ret = fstatp(fd, buf);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER, "%d, %p", fd, buf);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dp", fd, buf);
        return ret;
 }
@@ -906,7 +801,6 @@ int stat(const char * path, struct stat * buf)
        BEFORE_ORIGINAL_FILE(stat, LIBC);
        _filepath = (char*)path;
        ret = statp(path, buf);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_OTHER, "%s, %p", path, buf);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_OTHER, "sp", path, buf);
        return ret;
 }
@@ -920,7 +814,6 @@ int fstatat(int fd, const char * path, struct stat * buf, int flag)
        BEFORE_ORIGINAL_FILE(fstatat, LIBC);
        _filepath = (char*)path;
        ret = fstatatp(fd, path, buf, flag);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER, "%d, %s, %p, %d", fd, path, buf, flag);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dspd", fd, path, buf, flag);
        return ret;
 }
@@ -932,7 +825,6 @@ int lstat(const char * path, struct stat * buf)
        BEFORE_ORIGINAL_FILE(lstat, LIBC);
        _filepath = (char*)path;
        ret = lstatp(path, buf);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_OTHER, "%s, %p", path, buf);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_OTHER, "sp", path, buf);
        return ret;
 }
@@ -943,7 +835,6 @@ int futimens(int fd, const struct timespec times[2])
 
        BEFORE_ORIGINAL_FILE(futimens, LIBC);
        ret = futimensp(fd, times);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER, "%d, %p", fd, times);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dp", fd, times);
        return ret;
 }
@@ -955,8 +846,6 @@ int utimensat(int fd, const char *path, const struct timespec times[2], int flag
        BEFORE_ORIGINAL_FILE(utimensat, LIBC);
        _filepath = (char*)path;
        ret = utimensatp(fd, path, times, flag);
-       // AFTER_ORIGINAL_FD(0, fd, FD_API_OTHER,
-       //              "%d, %s, %p, %d", fd, path, times, flag);
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dspd", fd, path, times, flag);
        return ret;
 }
@@ -968,7 +857,6 @@ int utimes(const char *path, const struct timeval times[2])
        BEFORE_ORIGINAL_FILE(utimes, LIBC);
        _filepath = (char*)path;
        ret = utimesp(path, times);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_OTHER, "%s, %p", path, times);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_OTHER, "sp", path, times);
        return ret;
 }
@@ -980,7 +868,6 @@ int utime(const char *path, const struct utimbuf *times)
        BEFORE_ORIGINAL_FILE(utime, LIBC);
        _filepath = (char*)path;
        ret = utimep(path, times);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_OTHER, "%s, %p", path, times);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_OTHER, "sp", path, times);
        return ret;
 }

diff --git a/probe_file/da_io_stdc.c b/probe_file/da_io_stdc.c
index bcdc519..89384b5 100644 (file)
--- a/probe_file/da_io_stdc.c
+++ b/probe_file/da_io_stdc.c
@@ -53,8 +53,6 @@ FILE* fopen(const char* filename, const char* mode)
        _filepath = (char*)filename;
        
        fret = fopenp(filename, mode);
-       
-       //AFTER_ORIGINAL_FILEP_RET(VT_PTR, fret, 0, fret, FD_API_OPEN, "%s, %s", filename, mode);
 
        AFTER_PACK_ORIGINAL_FILEP(fret, 0, fret, FD_API_OPEN, "ss", filename, mode);
 
@@ -71,9 +69,6 @@ FILE* freopen(const char * filename, const char * mode, FILE * stream)
 
        fret = freopenp(filename, mode, stream);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_PTR, fret, 0, fret, FD_API_OPEN,
-       //              "%s, %s, %p", filename, mode, stream);
-
        AFTER_PACK_ORIGINAL_FILEP(fret, 0, fret, FD_API_OPEN, "ssp", filename, mode, stream);
 
        return fret;
@@ -88,8 +83,6 @@ FILE* fdopen(int fildes, const char *mode)
 
        fret = fdopenp(fildes, mode);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_PTR, fret, 0, fret, FD_API_OPEN, "%d, %s", fildes, mode);
-
        AFTER_PACK_ORIGINAL_FILEP(fret, 0, fret, FD_API_OPEN, "ds", fildes, mode);
 
        return fret;
@@ -101,7 +94,6 @@ int fflush(FILE* stream)
 
        BEFORE_ORIGINAL_FILE(fflush, LIBC);
        ret = fflushp(stream);
-       // AFTER_ORIGINAL_FILEP(0, stream, FD_API_OTHER, "%p", stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, 0, stream, FD_API_OTHER, "p", stream);
        return ret;
 }
@@ -122,12 +114,7 @@ int fclose(FILE* stream)
        PRE_PROBEBLOCK_END();
 
        ret = fclosep(stream);
-/*
-       POST_PROBEBLOCK_BEGIN(LC_RESOURCE, VT_INT, ret, "%p", stream);
-       POST_PROBEBLOCK_MIDDLE_FD(0, _fd, FD_API_CLOSE);
-       POST_PROBEBLOCK_CALLSTACK_RESOURCE(FD_API_CLOSE);
-       POST_PROBEBLOCK_END();
-*/
+
        POST_PACK_PROBEBLOCK_BEGIN();
        PREPARE_LOCAL_BUF();
        PACK_COMMON_BEGIN(MSG_PROBE_RESOURCE, LC_RESOURCE, "p", stream);
@@ -145,7 +132,6 @@ int remove(const char* filename)
        BEFORE_ORIGINAL_FILE(remove, LIBC);
        _filepath = (char*)filename;
        ret = removep(filename);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s", filename);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "s", filename);
        return ret;
 }
@@ -157,7 +143,6 @@ int rename(const char* oldname, const char* newname)
        BEFORE_ORIGINAL_FILE(rename, LIBC);
        _filepath = (char*)newname;
        ret = renamep(oldname, newname);
-       // AFTER_ORIGINAL_NOFD(0, FD_API_DIRECTORY, "%s, %s", oldname, newname);
        AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_DIRECTORY, "ss", oldname, newname);
        return ret;
 }
@@ -170,7 +155,6 @@ FILE * tmpfile ( void )
        BEFORE_ORIGINAL_FILE_NOFILTER(tmpfile, LIBC);
        _filepath = "<temp file>";
        fret = tmpfilep();
-       // AFTER_ORIGINAL_FILEP_RET(VT_PTR, fret, 0, fret, FD_API_OPEN, "%s", "");
        AFTER_PACK_ORIGINAL_FILEP(fret, 0, fret, FD_API_OPEN, "s", "");
        return fret;
 }
@@ -181,7 +165,6 @@ int fgetpos(FILE* stream, fpos_t* position)
 
        BEFORE_ORIGINAL_FILE(fgetpos, LIBC);
        ret = fgetposp(stream, position);
-       // AFTER_ORIGINAL_FILEP(0, stream, FD_API_OTHER, "%p, %p", stream, position);
        AFTER_PACK_ORIGINAL_FILEP(ret, 0, stream, FD_API_OTHER, "pp", stream, position);
        return ret;
 }
@@ -192,8 +175,6 @@ int fseek(FILE* stream, long int offset, int origin)
 
        BEFORE_ORIGINAL_FILE(fseek, LIBC);
        ret = fseekp(stream, offset, origin);
-       // AFTER_ORIGINAL_FILEP((unsigned int)offset, stream, FD_API_OTHER,
-       //              "%p, %ld, %d", stream, offset, origin);
        AFTER_PACK_ORIGINAL_FILEP(ret, (unsigned int)offset, stream, FD_API_OTHER,
                        "pxd", stream, offset, origin);
        return ret;
@@ -205,7 +186,6 @@ int fsetpos(FILE* stream, const fpos_t* pos)
 
        BEFORE_ORIGINAL_FILE(fsetpos, LIBC);
        ret = fsetposp(stream, pos);
-       // AFTER_ORIGINAL_FILEP(0, stream, FD_API_OTHER, "%p, %p", stream, pos);
        AFTER_PACK_ORIGINAL_FILEP(ret, 0, stream, FD_API_OTHER, "pp", stream, pos);
        return ret;
 }
@@ -219,8 +199,6 @@ long int ftell(FILE* stream)
        
        lret = ftellp(stream);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_LONG, lret, 0, stream, FD_API_OTHER, "%p", stream);
-
        AFTER_PACK_ORIGINAL_FILEP(lret, 0, stream, FD_API_OTHER, "p", stream);
 
        return lret;
@@ -233,8 +211,6 @@ void rewind(FILE* stream)
        BEFORE_ORIGINAL_FILE(rewind, LIBC);
 
        rewindp(stream);
-       
-       // AFTER_ORIGINAL_FILEP_RET(VT_NULL, NULL, 0, stream, FD_API_OTHER, "%p", stream);
 
        AFTER_PACK_ORIGINAL_FILEP(0, 0, stream, FD_API_OTHER, "p", stream);
 }
@@ -246,8 +222,6 @@ void clearerr(FILE* stream)
        BEFORE_ORIGINAL_FILE(clearerr, LIBC);
 
        clearerrp(stream);
-       
-       // AFTER_ORIGINAL_FILEP_RET(VT_NULL, NULL, 0, stream, FD_API_OTHER, "%p", stream);
 
        AFTER_PACK_ORIGINAL_FILEP(0, 0, stream, FD_API_OTHER, "p", stream);
 }
@@ -258,7 +232,6 @@ int feof(FILE* stream)
 
        BEFORE_ORIGINAL_FILE(feof, LIBC);
        ret = feofp(stream);
-       // AFTER_ORIGINAL_FILEP(0, stream, FD_API_OTHER, "%p", stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, 0, stream, FD_API_OTHER, "p", stream);
        return ret;
 }
@@ -269,7 +242,6 @@ int ferror(FILE* stream)
 
        BEFORE_ORIGINAL_FILE(ferror, LIBC);
        ret = ferrorp(stream);
-       // AFTER_ORIGINAL_FILEP(0, stream, FD_API_OTHER, "%p", stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, 0, stream, FD_API_OTHER, "p", stream);
        return ret;
 }
@@ -280,7 +252,6 @@ int fileno(FILE* stream)
 
        BEFORE_ORIGINAL_FILE(fileno, LIBC);
        ret = filenop(stream);
-       // AFTER_ORIGINAL_FILEP(0, stream, FD_API_OTHER, "%p", stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, 0, stream, FD_API_OTHER, "p", stream);
        return ret;
 }
@@ -293,8 +264,6 @@ void perror(const char* string)
 
        perrorp(string);
 
-       // AFTER_ORIGINAL_NOFD_RET(VT_NULL, NULL, 0, FD_API_OTHER, "%s", string);
-
        AFTER_PACK_ORIGINAL_NOFD(0, 0, FD_API_OTHER, "s", string);
 }
 
@@ -308,7 +277,6 @@ int vfprintf(FILE* stream, const char* format, va_list arg)
 
        BEFORE_ORIGINAL_FILE(vfprintf, LIBC);
        ret = vfprintfp(stream, format, arg);
-       // AFTER_ORIGINAL_FILEP(ret, stream, FD_API_WRITE, "%p, %s", stream, format);
        AFTER_PACK_ORIGINAL_FILEP(ret, ret, stream, FD_API_WRITE, "ps", stream, format);
        return ret;
 }
@@ -319,7 +287,6 @@ int vfscanf(FILE* stream, const char* format, va_list arg)
 
        BEFORE_ORIGINAL_FILE(vfscanf, LIBC);
        ret = vfscanfp(stream, format, arg);
-       // AFTER_ORIGINAL_FILEP(ret, stream, FD_API_READ, "%p, %s", stream, format);
        AFTER_PACK_ORIGINAL_FILEP(ret, ret, stream, FD_API_READ, "ps", stream, format);
        return ret;
 }
@@ -330,7 +297,6 @@ int fgetc(FILE* stream)
 
        BEFORE_ORIGINAL_FILE(fgetc, LIBC);
        ret = fgetcp(stream);
-       // AFTER_ORIGINAL_FILEP((ret == EOF ? 0 : 1), stream, FD_API_READ, "%p", stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, (ret == EOF ? 0 : 1), stream, FD_API_READ, "p", stream);
        return ret;
 }
@@ -345,9 +311,6 @@ char* fgets(char* str, int size, FILE* stream)
        
        cret = fgetsp(str, size, stream);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_STR, cret, (ret == NULL ? 0 : strlen(cret)),
-       //              stream, FD_API_READ, "%s, %d, %p", str, size, stream);
-
        AFTER_PACK_ORIGINAL_FILEP(cret, (ret == NULL ? 0 : strlen(cret)),
                        stream, FD_API_READ, "sdp", str, size, stream);
 
@@ -361,8 +324,6 @@ int fputc(int character, FILE* stream)
 
        BEFORE_ORIGINAL_FILE(fputc, LIBC);
        ret = fputcp(character, stream);
-       // AFTER_ORIGINAL_FILEP((ret == EOF ? 0 : 1), stream, FD_API_WRITE,
-       //              "%d, %p", character, stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, (ret == EOF ? 0 : 1), stream, FD_API_WRITE,
                        "dp", character, stream);
        return ret;
@@ -374,7 +335,6 @@ int fputs(const char* str, FILE* stream)
 
        BEFORE_ORIGINAL_FILE(fputs, LIBC);
        ret = fputsp(str, stream);
-       // AFTER_ORIGINAL_FILEP(ret, stream, FD_API_WRITE, "%s, %p", str, stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, ret, stream, FD_API_WRITE, "sp", str, stream);
        return ret;
 }
@@ -385,7 +345,6 @@ int getc(FILE* stream)
 
        BEFORE_ORIGINAL_FILE(getc, LIBC);
        ret = getcp(stream);
-       // AFTER_ORIGINAL_FILEP((ret == EOF ? 0 : 1), stream, FD_API_READ, "%p", stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, (ret == EOF ? 0 : 1), stream, FD_API_READ, "p", stream);
        return ret;
 }
@@ -396,8 +355,6 @@ int putc(int character, FILE* stream)
 
        BEFORE_ORIGINAL_FILE(putc, LIBC);
        ret = putcp(character, stream);
-       // AFTER_ORIGINAL_FILEP((ret == EOF ? 0 : 1), stream, FD_API_WRITE,
-       //              "%d, %p", character, stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, (ret == EOF ? 0 : 1), stream, FD_API_WRITE,
                        "dp", character, stream);
        return ret;
@@ -409,7 +366,6 @@ int ungetc(int character, FILE* stream)
 
        BEFORE_ORIGINAL_FILE(ungetc, LIBC);
        ret = ungetcp(character, stream);
-       // AFTER_ORIGINAL_FILEP(0, stream, FD_API_OTHER, "%d, %p", character, stream);
        AFTER_PACK_ORIGINAL_FILEP(ret, 0, stream, FD_API_OTHER, "dp", character, stream);
        return ret;
 }
@@ -422,9 +378,6 @@ size_t fread(void* ptr, size_t size, size_t count, FILE* stream)
        BEFORE_ORIGINAL_FILE(fread, LIBC);
 
        tret = freadp(ptr, size, count, stream);
-       
-       // AFTER_ORIGINAL_FILEP_RET(VT_SIZE_T, tret, 0, stream, FD_API_READ,
-       //              "%p, %u, %u, %p", ptr, size, count, stream);
 
        AFTER_PACK_ORIGINAL_FILEP(tret, 0, stream, FD_API_READ,
                        "pxxp", ptr, size, count, stream);      
@@ -441,9 +394,6 @@ size_t fwrite(const void* ptr, size_t size, size_t count, FILE* stream)
 
        tret = fwritep(ptr, size, count, stream);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_SIZE_T, tret, 0, stream, FD_API_WRITE,
-       //              "%p, %u, %u, %p", ptr, size, count, stream);
-
        AFTER_PACK_ORIGINAL_FILEP(tret, 0, stream, FD_API_WRITE,
                        "pxxp", ptr, size, count, stream);
 
@@ -463,7 +413,6 @@ int fprintf(FILE* stream, const char* format, ...)
        va_start(arg, format);
        ret = vfprintfp(stream, format, arg);
 
-       // AFTER_ORIGINAL_FILEP(ret, stream, FD_API_WRITE, "%p, %s, ...", stream, format);
        AFTER_PACK_ORIGINAL_FILEP(ret, ret, stream, FD_API_WRITE, "ps", stream, format);
        va_end(arg);
 
@@ -480,7 +429,6 @@ int fscanf(FILE* stream, const char* format, ...)
        va_start(arg, format);
        ret = vfscanfp(stream, format, arg);
 
-       // AFTER_ORIGINAL_FILEP(ret, stream, FD_API_READ, "%p, %s, ...", stream, format);
        AFTER_PACK_ORIGINAL_FILEP(ret, ret, stream, FD_API_READ, "ps", stream, format);
        va_end(arg);
 
@@ -498,7 +446,6 @@ int printf(const char* format, ...)
        va_start(arg, format);
        ret = vprintfp(format, arg);
 
-       // AFTER_ORIGINAL_NOFD(ret, FD_API_WRITE, "%s,...", format);
        AFTER_PACK_ORIGINAL_NOFD(ret, ret, FD_API_WRITE, "s", format);
        va_end(arg);
 
@@ -516,7 +463,6 @@ int scanf(const char* format, ...)
        va_start(arg, format);
        ret = vscanfp(format, arg);
 
-       // AFTER_ORIGINAL_NOFD(ret, FD_API_READ, "%s,...", format);
        AFTER_PACK_ORIGINAL_NOFD(ret, ret, FD_API_READ, "s", format);
        va_end(arg);
 
@@ -529,7 +475,6 @@ int getchar()
 
        BEFORE_ORIGINAL_FILE(getchar, LIBC);
        ret = getcharp();
-       // AFTER_ORIGINAL_NOFD((ret == EOF ? 0 : 1), FD_API_READ, "%s", "");
        AFTER_PACK_ORIGINAL_NOFD(ret, (ret == EOF ? 0 : 1), FD_API_READ, "s", "");
        return ret;
 }
@@ -540,7 +485,6 @@ int putchar(int c)
 
        BEFORE_ORIGINAL_FILE(putchar, LIBC);
        ret = putcharp(c);
-       // AFTER_ORIGINAL_NOFD((ret == EOF ? 0 : 1), FD_API_WRITE, "%d", c);
        AFTER_PACK_ORIGINAL_NOFD(ret, (ret == EOF ? 0 : 1), FD_API_WRITE, "d", c);
        return ret;
 }
@@ -553,8 +497,6 @@ char* gets(char* str)
        BEFORE_ORIGINAL_FILE(gets, LIBC);
 
        cret = getsp(str);
-       
-       // AFTER_ORIGINAL_NOFD_RET(VT_STR, cret, strlen(cret), FD_API_READ, "%s", str);
 
        AFTER_PACK_ORIGINAL_NOFD(cret, strlen(cret), FD_API_READ, "s", str);
 
@@ -568,7 +510,6 @@ int puts(const char* str)
 
        BEFORE_ORIGINAL_FILE(puts, LIBC);
        ret = putsp(str);
-       // AFTER_ORIGINAL_NOFD(ret, FD_API_WRITE, "%s", str);
        AFTER_PACK_ORIGINAL_NOFD(ret, ret, FD_API_WRITE, "s", str);
        return ret;
 }
@@ -583,8 +524,6 @@ char* tmpnam(char* str)
 
        cret = tmpnamp(str);
 
-       // AFTER_ORIGINAL_NOFD_RET(VT_STR, cret, 0, FD_API_OTHER, "%s", str);
-
        AFTER_PACK_ORIGINAL_NOFD(cret, 0, FD_API_OTHER, "s", str);
 
        return cret;
@@ -598,9 +537,6 @@ void setbuf(FILE* stream, char* buf)
 
        setbufp(stream, buf);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_NULL, NULL, 0, stream, FD_API_OTHER,
-       //              "%p, %p", stream, buf);
-
        AFTER_PACK_ORIGINAL_FILEP(0, 0, stream, FD_API_OTHER, "pp", stream, buf);
 }
 
@@ -612,9 +548,6 @@ void setbuffer(FILE* stream, char* buf, size_t size)
 
        setbufferp(stream, buf, size);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_NULL, NULL, size, stream, FD_API_OTHER,
-       //              "%p, %p, %u", stream, buf, size);
-
        AFTER_PACK_ORIGINAL_FILEP(0, size, stream, FD_API_OTHER,
                        "ppx", stream, buf, size);
 }
@@ -627,8 +560,6 @@ void setlinebuf(FILE* stream)
 
        setlinebufp(stream);
 
-       // AFTER_ORIGINAL_FILEP_RET(VT_NULL, NULL, 0, stream, FD_API_OTHER, "%p", stream);
-
        AFTER_PACK_ORIGINAL_FILEP(0, 0, stream, FD_API_OTHER, "p", stream);
 }
 
@@ -638,8 +569,6 @@ int setvbuf(FILE* stream, char* buf, int mode, size_t size)
 
        BEFORE_ORIGINAL_FILE(setvbuf, LIBC);
        ret = setvbufp(stream,buf,mode,size);
-       // AFTER_ORIGINAL_FILEP(size, stream, FD_API_OTHER,
-       //              "%p, %p, %d, %u", stream, buf, mode, size);
        AFTER_PACK_ORIGINAL_FILEP(ret, size, stream, FD_API_OTHER,
                        "ppdx", stream, buf, mode, size);
        return ret;