[PROTO] Backport unused probe removal

Change-Id: I0ef30b0d08d4482b399a5cc0d6b3bf4c697f079c
See-also: 02637c31710324818e36a0455c6f79c0def786ea
Signed-off-by: Dmitry Bogatov <d.bogatov@samsung.com>

diff --git a/probe_file/da_io_posix.c b/probe_file/da_io_posix.c
index e194243..50e0f40 100755 (executable)
--- a/probe_file/da_io_posix.c
+++ b/probe_file/da_io_posix.c
@@ -143,36 +143,6 @@ int close(int fd)
        return ret;
 }
 
-int access(const char *path, int amode)
-{
-       static int (*accessp)(const char *path, int amode);
-
-       BEFORE_ORIGINAL_FILE(access, LIBC);
-       _filepath = (char*)path;
-
-       ret = accessp(path, amode);
-
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_access,
-                                ret, 0, FD_API_PERMISSION, "sd", path, amode);
-
-       return ret;
-}
-
-int faccessat(int fd, const char *path, int amode, int flag)
-{
-       static int (*faccessatp)(int fd, const char *path, int amode, int flag);
-
-       BEFORE_ORIGINAL_FILE(faccessat, LIBC);
-       _filepath = (char*)path;
-
-       ret = faccessatp(fd, path, amode, flag);
-
-       AFTER_PACK_ORIGINAL_FD(API_ID_faccessat,
-                                  ret, 0, fd, FD_API_PERMISSION, "dsdd", fd, path, amode, flag);
-
-       return ret;
-}
-
 off_t lseek(int fd, off_t offset, int whence)
 {
        static int (*lseekp)(int fd, off_t offset, int whence);
@@ -217,20 +187,7 @@ int fdatasync(int fd)
        return ret;
 }
 
-int truncate(const char *path, off_t length)
-{
-       static int (*truncatep)(const char *path, off_t length);
-
-       BEFORE_ORIGINAL_FILE(truncate, LIBC);
-       _filepath = (char*)path;
-
-       ret = truncatep(path, length);
 
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_truncate,
-                                ret, (unsigned int)length, FD_API_DIRECTORY, "sx", path, length);
-
-       return ret;
-}
 
 int ftruncate(int fd, off_t length)
 {
@@ -246,121 +203,19 @@ int ftruncate(int fd, off_t length)
        return ret;
 }
 
-#if 1
-//not return FD, only make file
-int mkfifo(const char *path, mode_t mode)
-{
-       static int (*mkfifop)(const char *path, mode_t mode);
-
-       BEFORE_ORIGINAL_FILE(mkfifo, LIBC);
-       _filepath = (char*)path;
-
-       ret = mkfifop(path, mode);
-
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_mkfifo,
-                                ret, 0, FD_API_OTHER, "sd", path, mode);
-
-       return ret;
-}
-
-int mkfifoat(int fd, const char *path, mode_t mode)
-{
-       static int (*mkfifoatp)(int fd, const char *path, mode_t mode);
-
-       BEFORE_ORIGINAL_FILE(mkfifoat, LIBC);
-       _filepath = (char*)path;
-
-       ret = mkfifoatp(fd, path, mode);
-
-       AFTER_PACK_ORIGINAL_FD(API_ID_mkfifoat,
-                                  ret, 0, fd, FD_API_OTHER, "dsd", fd, path, mode);
-
-       return ret;
-}
-
-int mknod(const char *path, mode_t mode, dev_t dev)
-{
-       static int (*mknodp)(const char *path, mode_t mode, dev_t dev);
-
-       BEFORE_ORIGINAL_FILE(mknod, LIBC);
-       _filepath = (char*)path;
-
-       ret = mknodp(path, mode, dev);
-
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_mknod,
-                                ret, 0, FD_API_OTHER,
-                                "sdx", path, mode, (unsigned long int)dev);
-
-       return ret;
-}
-
-int mknodat(int fd, const char *path, mode_t mode, dev_t dev)
-{
-       static int (*mknodatp)(int fd, const char *path, mode_t mode, dev_t dev);
-
-       BEFORE_ORIGINAL_FILE(mknodat, LIBC);
-       _filepath = (char*)path;
-
-       ret = mknodatp(fd,path, mode,dev);
-
-       AFTER_PACK_ORIGINAL_FD(API_ID_mknodat,
-                                  ret, 0, fd, FD_API_OTHER,
-                       "dsdx", fd, path, mode, (unsigned long int)dev);
-
-       return ret;
-}
-#endif
-
-// ****************************************************************
-// File Permission APIs
-// ****************************************************************
-int chown(const char *path, uid_t owner, gid_t group)
-{
-       static int (*chownp)(const char *path, uid_t owner, gid_t group);
-
-       BEFORE_ORIGINAL_FILE(chown, LIBC);
-       _filepath = (char*)path;
-       ret = chownp(path, owner, group);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_chown,
-                                ret, 0, FD_API_PERMISSION, "sdd", path, owner, group);
-       return ret;
-}
-
-int fchownat(int fd, const char *path, uid_t owner, gid_t group, int flag)
-{
-       static int (*fchownatp)(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_PACK_ORIGINAL_FD(API_ID_fchownat,
-                                  ret, 0, fd, FD_API_PERMISSION,
-                                  "dsddd", fd, path, owner, group, flag);
-       return ret;
-}
-
 int fchown(int fd, uid_t owner, gid_t group)
 {
-       static int (*fchownp)(int fd, uid_t owner, gid_t group);
+       static int (*fchownp)(int fd, uid_t owner, gid_t group);
 
-       BEFORE_ORIGINAL_FILE(fchown, LIBC);
-       ret = fchownp(fd, owner, group);
-       AFTER_PACK_ORIGINAL_FD(API_ID_fchown,
-                                  ret, 0, fd, FD_API_PERMISSION, "ddd", fd, owner, group);
-       return ret;
+       BEFORE_ORIGINAL_FILE(fchown, LIBC);
+       ret = fchownp(fd, owner, group);
+       AFTER_PACK_ORIGINAL_FD(API_ID_fchown, ret, 0, fd, FD_API_PERMISSION, 
+                             "ddd", fd, owner, group);
+       return ret;
 }
 
-int lchown(const char *path, uid_t owner, gid_t group)
-{
-       static int (*lchownp)(const char *path, uid_t owner, gid_t group);
 
-       BEFORE_ORIGINAL_FILE(lchown, LIBC);
-       _filepath = (char*)path;
-       ret = lchownp(path, owner, group);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_lchown,
-                                ret, 0, FD_API_PERMISSION, "sdd", path, owner, group);
-       return ret;
-}
+
 
 int lockf(int fd, int function, off_t size)
 {
@@ -374,30 +229,7 @@ int lockf(int fd, int function, off_t size)
        return ret;
 }
 
-int chmod(const char *path, mode_t mode)
-{
-       static int (*chmodp)(const char *path, mode_t mode);
-
-       BEFORE_ORIGINAL_FILE(chmod, LIBC);
-       _filepath = (char*)path;
-       ret = chmodp(path, mode);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_chmod,
-                                ret, 0, FD_API_PERMISSION, "sd", path, mode);
-       return ret;
-}
-
-int fchmodat(int fd, const char *path, mode_t mode, int flag)
-{
-       static int (*fchmodatp)(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_PACK_ORIGINAL_FD(API_ID_fchmodat,
-                                  ret,0, fd, FD_API_PERMISSION,
-                                  "dsdd", fd, path, mode, flag);
-       return ret;
-}
 
 int fchmod(int fd, mode_t mode)
 {
@@ -514,282 +346,12 @@ ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
 }
 #endif
 
-// *****************************************************************
-// Directory I/O
-// *****************************************************************
-
-int rmdir(const char *path)
-{
-       static int (*rmdirp)(const char *path);
-
-       BEFORE_ORIGINAL_FILE(rmdir, LIBC);
-       _filepath = (char*)path;
-       ret = rmdirp(path);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_rmdir,
-                                ret, 0, FD_API_DIRECTORY, "s", path);
-       return ret;
-}
-
-int fchdir(int fd)
-{
-       static int (*fchdirp)(int fd);
-
-       BEFORE_ORIGINAL_FILE(fchdir, LIBC);
-       ret = fchdirp(fd);
-       AFTER_PACK_ORIGINAL_FD(API_ID_fchdir,
-                                  ret, 0, fd, FD_API_DIRECTORY, "d", fd);
-       return ret;
-}
-
-int chdir(const char *path)
-{
-       static int (*chdirp)(const char *path);
-
-       BEFORE_ORIGINAL_FILE(chdir, LIBC);
-       _filepath = (char*)path;
-       ret = chdirp(path);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_chdir,
-                                ret, 0, FD_API_DIRECTORY, "s", path);
-       return ret;
-}
-
-int link(const char *path1, const char *path2)
-{
-       static int (*linkp)(const char *path1, const char *path2);
-
-       BEFORE_ORIGINAL_FILE(link, LIBC);
-       _filepath = (char*)path1;
-       ret = linkp(path1, path2);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_link,
-                                ret, 0, FD_API_DIRECTORY, "ss", path1, path2);
-       return ret;
-}
-
-int linkat(int fd1, const char *path1, int fd2, const char *path2, int flag)
-{
-       static int (*linkatp)(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_PACK_ORIGINAL_FD(API_ID_linkat,
-                                  ret, 0, fd2, FD_API_DIRECTORY,
-                                  "dsdsd", fd1, path2, fd2, path2, flag);
-       return ret;
-}
-
-int unlink(const char *path)
-{
-       static int (*unlinkp)(const char *path);
-
-       BEFORE_ORIGINAL_FILE(unlink, LIBC);
-       _filepath = (char*)path;
-       ret = unlinkp(path);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_unlink,
-                                ret, 0, FD_API_DIRECTORY, "s", path);
-       return ret;
-}
-
-int unlinkat(int fd, const char *path, int flag)
-{
-       static int (*unlinkatp)(int fd, const char *path, int flag);
-
-       BEFORE_ORIGINAL_FILE(unlinkat, LIBC);
-       _filepath = (char*)path;
-       ret = unlinkatp(fd, path, flag);
-       AFTER_PACK_ORIGINAL_FD(API_ID_unlinkat,
-                                  ret, 0, fd, FD_API_DIRECTORY, "dsd", fd, path, flag);
-       return ret;
-}
-
-int symlink(const char *path1, const char *path2)
-{
-       static int (*symlinkp)(const char *path1, const char *path2);
-
-       BEFORE_ORIGINAL_FILE(symlink, LIBC);
-       _filepath = (char*)path1;
-       ret = symlinkp(path1, path2);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_symlink,
-                                ret, 0, FD_API_DIRECTORY, "ss", path1, path2);
-       return ret;
-}
-
-int symlinkat(const char *path1, int fd, const char *path2)
-{
-       static int (*symlinkatp)(const char *path1, int fd, const char *path2);
-
-       BEFORE_ORIGINAL_FILE(symlinkat, LIBC);
-       _filepath = (char*)path1;
-       ret = symlinkatp(path1, fd, path2);
-       AFTER_PACK_ORIGINAL_FD(API_ID_symlinkat,
-                                  ret, 0, fd, FD_API_DIRECTORY, "sds", path1, fd, path2);
-       return ret;
-}
-
-ssize_t readlink(const char* path, char* buf, size_t bufsize)
-{
-       static int (*readlinkp)(const char* path, char* buf, size_t bufsize);
-       ssize_t sret;
-
-       BEFORE_ORIGINAL_FILE(readlink, LIBC);
-       _filepath = (char*)path;
-
-       sret = readlinkp(path, buf, bufsize);
-
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_readlink,
-                                sret, bufsize, FD_API_DIRECTORY,
-                                "ssx", path, buf, bufsize);
-
-       return sret;
-}
-
-ssize_t readlinkat(int fd, const char * path, char * buf, size_t bufsize)
-{
-       static int (*readlinkatp)(int fd, const char * path, char * buf, size_t bufsize);
-       ssize_t sret;
-
-       BEFORE_ORIGINAL_FILE(readlinkat, LIBC);
-       _filepath = (char*)path;
-
-       sret = readlinkatp(fd, path, buf, bufsize);
-
-       AFTER_PACK_ORIGINAL_FD(API_ID_readlinkat,
-                                  sret, bufsize, fd, FD_API_DIRECTORY,
-                                  "dssx", fd, path, buf, bufsize);
-
-       return sret;
-}
-
-int mkdir(const char *path, mode_t mode)
-{
-       static int (*mkdirp)(const char *path, mode_t mode);
-
-       BEFORE_ORIGINAL_FILE(mkdir, LIBC);
-       _filepath = (char*)path;
-       ret = mkdirp(path, mode);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_mkdir,
-                                ret, 0, FD_API_DIRECTORY, "sd", path, mode);
-       return ret;
-}
-
-int mkdirat(int fd, const char *path, mode_t mode)
-{
-       static int (*mkdiratp)(int fd, const char *path, mode_t mode);
-
-       BEFORE_ORIGINAL_FILE(mkdirat, LIBC);
-       _filepath = (char*)path;
-       ret = mkdiratp(fd, path, mode);
-       AFTER_PACK_ORIGINAL_FD(API_ID_mkdirat,
-                                  ret, 0, fd, FD_API_DIRECTORY, "dsd", fd, path, mode);
-       return ret;
-}
-
-int closedir(DIR *dirp)
-{
-       static int (*closedirp)(DIR *dirp);
-
-       BEFORE_ORIGINAL_FILE(closedir, LIBC);
-       ret = closedirp(dirp);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_closedir,
-                                ret, 0, FD_API_DIRECTORY, "p", dirp);
-       return ret;
-}
-
-DIR *fdopendir(int fd)
-{
-       static DIR* (*fdopendirp)(int fd);
-       DIR* dret;
-
-       BEFORE_ORIGINAL_FILE(fdopendir, LIBC);
-
-       dret = fdopendirp(fd);
-
-       AFTER_PACK_ORIGINAL_FD(API_ID_fdopendir,
-                                  dret, 0, fd, FD_API_DIRECTORY, "d", fd);
-
-       return dret;
-}
-
-DIR *opendir(const char *dirname)
-{
-       static DIR* (*opendirp)(const char *dirname);
-       DIR* dret;
-
-       BEFORE_ORIGINAL_FILE(opendir, LIBC);
-       _filepath = (char*)dirname;
 
-       dret = opendirp(dirname);
 
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_opendir,
-                                dret, 0, FD_API_DIRECTORY, "s", dirname);
 
-       return dret;
-}
-
-struct dirent *readdir(DIR *dirp)
-{
-       static struct dirent* (*readdirp)(DIR *dirp);
-       struct dirent* dret;
 
-       BEFORE_ORIGINAL_FILE(readdir, LIBC);
 
-       dret = readdirp(dirp);
 
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_readdir,
-                                dret, 0, FD_API_DIRECTORY, "p", dirp);
-
-       return dret;
-}
-
-int readdir_r(DIR * dirp, struct dirent * entry, struct dirent ** result)
-{
-       static int (*readdir_rp)(DIR * dirp, struct dirent * entry, struct dirent ** result);
-
-       BEFORE_ORIGINAL_FILE(readdir_r, LIBC);
-       ret = readdir_rp(dirp, entry, result);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_readdir_r,
-                                ret, 0, FD_API_DIRECTORY, "ppp", dirp, entry, result);
-       return ret;
-}
-
-void rewinddir(DIR *dirp)
-{
-       static void (*rewinddirp)(DIR *dirp);
-
-       BEFORE_ORIGINAL_FILE(rewinddir, LIBC);
-
-       rewinddirp(dirp);
-       
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_rewinddir,
-                                0, 0, FD_API_DIRECTORY, "p", dirp);
-}
-
-void seekdir(DIR *dirp, long loc)
-{
-       static void (*seekdirp)(DIR *dirp, long loc);
-
-       BEFORE_ORIGINAL_FILE(seekdir, LIBC);
-
-       seekdirp(dirp, loc);
-
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_seekdir,
-                                0, 0, FD_API_DIRECTORY, "px", dirp, loc);
-}
-
-long telldir(DIR *dirp)
-{
-       static int (*telldirp)(DIR *dirp);
-       long lret;
-
-       BEFORE_ORIGINAL_FILE(telldir, LIBC);
-
-       lret = telldirp(dirp);
-
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_telldir,
-                                lret, 0, FD_API_DIRECTORY, "p", dirp);
-
-       return lret;
-}
 
 // *****************************************************************
 // File Attributes APIs
@@ -855,44 +417,8 @@ int fstat(int fd, struct stat *buf)
        AFTER_PACK_ORIGINAL_FD(ret, 0, fd, FD_API_OTHER, "dp", fd, buf);
        return ret;
 }
-
-int stat(const char * path, struct stat * buf)
-{
-       static int (*statp)(const char * path, struct stat * buf);
-
-       BEFORE_ORIGINAL_FILE(stat, LIBC);
-       _filepath = (char*)path;
-       ret = statp(path, buf);
-       AFTER_PACK_ORIGINAL_NOFD(ret, 0, FD_API_OTHER, "sp", path, buf);
-       return ret;
-}
-
 #endif
 
-int fstatat(int fd, const char * path, struct stat * buf, int flag)
-{
-       static int (*fstatatp)(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_PACK_ORIGINAL_FD(API_ID_fstatat,
-                                  ret, 0, fd, FD_API_OTHER, "dspd", fd, path, buf, flag);
-       return ret;
-}
-
-int lstat(const char * path, struct stat * buf)
-{
-       static int (*lstatp)(const char * path, struct stat * buf);
-
-       BEFORE_ORIGINAL_FILE(lstat, LIBC);
-       _filepath = (char*)path;
-       ret = lstatp(path, buf);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_lstat,
-                                ret, 0, FD_API_OTHER, "sp", path, buf);
-       return ret;
-}
-
 int futimens(int fd, const struct timespec times[2])
 {
        static int (*futimensp)(int fd, const struct timespec times[2]);
@@ -903,41 +429,3 @@ int futimens(int fd, const struct timespec times[2])
                                   ret, 0, fd, FD_API_OTHER, "dp", fd, times);
        return ret;
 }
-
-int utimensat(int fd, const char *path, const struct timespec times[2], int flag)
-{
-       static int (*utimensatp)(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_PACK_ORIGINAL_FD(API_ID_utimensat,
-                                  ret, 0, fd, FD_API_OTHER, "dspd", fd, path, times, flag);
-       return ret;
-}
-
-int utimes(const char *path, const struct timeval times[2])
-{
-       static int (*utimesp)(const char *path, const struct timeval times[2]);
-
-       BEFORE_ORIGINAL_FILE(utimes, LIBC);
-       _filepath = (char*)path;
-       ret = utimesp(path, times);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_utimes,
-                                ret, 0, FD_API_OTHER, "sp", path, times);
-       return ret;
-}
-
-int utime(const char *path, const struct utimbuf *times)
-{
-       static int (*utimep)(const char *path, const struct utimbuf *times);
-
-       BEFORE_ORIGINAL_FILE(utime, LIBC);
-       _filepath = (char*)path;
-       ret = utimep(path, times);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_utime,
-                                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 4880bee..6060e37 100644 (file)
--- a/probe_file/da_io_stdc.c
+++ b/probe_file/da_io_stdc.c
@@ -133,30 +133,6 @@ int fclose(FILE* stream)
        return ret;
 }
 
-int remove(const char* filename)
-{
-       static int (*removep)(const char* filename);
-
-       BEFORE_ORIGINAL_FILE(remove, LIBC);
-       _filepath = (char*)filename;
-       ret = removep(filename);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_remove,
-                                ret, 0, FD_API_DIRECTORY, "s", filename);
-       return ret;
-}
-
-int rename(const char* oldname, const char* newname)
-{
-       static int (*renamep)(const char* oldname, const char* newname);
-
-       BEFORE_ORIGINAL_FILE(rename, LIBC);
-       _filepath = (char*)newname;
-       ret = renamep(oldname, newname);
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_rename,
-                                ret, 0, FD_API_DIRECTORY, "ss", oldname, newname);
-       return ret;
-}
-
 FILE * tmpfile ( void )
 {
        static FILE* (*tmpfilep) ( void );
@@ -276,17 +252,7 @@ int fileno(FILE* stream)
        return ret;
 }
 
-void perror(const char* string)
-{
-       static void (*perrorp)(const char* string);
-
-       BEFORE_ORIGINAL_FILE(perror, LIBC);
-
-       perrorp(string);
 
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_perror,
-                                0, 0, FD_API_OTHER, "s", string);
-}
 
 // *******************************************************************
 // File read / write APIs
@@ -606,20 +572,7 @@ int puts(const char* str)
 }
 #endif
 
-char* tmpnam(char* str)
-{
-       static char* (*tmpnamp)(char* str);
-       char* cret;
 
-       BEFORE_ORIGINAL_FILE(tmpnam, LIBC);
-
-       cret = tmpnamp(str);
-
-       AFTER_PACK_ORIGINAL_NOFD(API_ID_tmpnam,
-                                cret, 0, FD_API_OTHER, "s", str);
-
-       return cret;
-}
 
 void setbuf(FILE* stream, char* buf)
 {