RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 16-Jun-2017 13:00:06 Branch: rpm-5_4 Handle: 2017061611000600 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmeio.c Log: - rpmeio: haul out a load of trash. Summary: Revision Changes Path 1.1.2.4 +36 -188 rpm/rpmio/rpmeio.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/rpmio/rpmeio.c ============================================================================ $ cvs diff -u -r1.1.2.3 -r1.1.2.4 rpmeio.c --- rpm/rpmio/rpmeio.c 16 Jun 2017 06:14:09 -0000 1.1.2.3 +++ rpm/rpmio/rpmeio.c 16 Jun 2017 11:00:06 -0000 1.1.2.4 @@ -91,10 +91,17 @@ if (req->size) PRINT(zu, size); +#ifdef DYING if (req->ptr1) PRINT(p, ptr1); if (req->ptr2) PRINT(p, ptr2); +#else + if (req->ptr1) + fprintf(fp, "%25s: %p %s\n", "ptr1", req->ptr1, (char *)req->ptr1); + if (req->ptr2) + fprintf(fp, "%25s: %p %s\n", "ptr2", req->ptr2, (char *)req->ptr2); +#endif if (req->nv1 != 0.0) PRINT(f, nv1); @@ -111,7 +118,7 @@ #ifdef DYING PRINT(d, errorno); #else - if (req->errorno) + if (req->result < 0 && req->errorno) fprintf(fp, "%25s: %d %s\n", "errorno", REQ_ERRNO(req), strerror(REQ_ERRNO(req))); #endif @@ -125,8 +132,8 @@ PRINT(hhx, cancelled); if (req->flags) PRINT(hhx, flags); - if (req->pri) - PRINT(hhx, pri); + if (!(req->pri == 0 || req->pri == 4)) + PRINT(hhx, pri); #ifdef NOTYET if (req->data) @@ -276,6 +283,26 @@ { rpmeio eio = (rpmeio) (((rpmioItem)req) - 1); SPEW("--> %s(%p) eio %p\n", __FUNCTION__, req, eio); + + /* XXX wipe variables to shorten rpmeioDumpREQ() spewage. */ + req->next = NULL; + req->result = 0; + req->errorno = 0; + + req->pri = 0; + req->flags = 0; + req->ptr1 = NULL; + req->ptr2 = NULL; + + req->nv1 = 0.0; + req->nv2 = 0.0; + req->offs = 0; + req->size = 0; + req->int1 = 0; + req->int2 = 0; + req->int3 = 0; + req->finish = NULL; + req->destroy = NULL; rpmeioDumpREQ(__FUNCTION__, req, NULL); do { @@ -584,6 +611,8 @@ data = "fchown"; // req = eio_fchown(fdno, uid, gid, pri, cb, data); req->int1 = fdno; + req->int2 = uid; + req->int3 = gid; break; case EIO_SYNC: cb = rpmeioCB; @@ -704,7 +733,7 @@ case EIO_READDIR: path = va_arg(ap, const char *); flags = va_arg(ap, int); - cb = rpmeioCB_open; + cb = rpmeioCB_readdir; data = "readdir"; // req = eio_readdir(path, flags, pri, cb, data); req->flags |= EIO_FLAG_PTR1_FREE; @@ -809,6 +838,7 @@ break; case EIO_MKDIR: path = va_arg(ap, const char *); + mode = va_arg(ap, mode_t); cb = rpmeioCB; data = "mkdir"; // req = eio_mkdir(path, mode, pri, cb, data); @@ -904,6 +934,8 @@ // eio->req.grp_prev = NULL; // eio->req.grp_next = NULL; +rpmeioDumpREQ(__FUNCTION__, req, NULL); + exit: SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); @@ -926,12 +958,8 @@ /*==============================================================*/ eio_req *Eio_wd_open (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req * req = eio_wd_open(path, pri, cb, data); -#else eio_req * req = rpmeioReq(EIO_WD_OPEN, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; @@ -939,540 +967,360 @@ eio_req *Eio_wd_close (eio_wd wd, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_wd_close(wd, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_WD_CLOSE, wd, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_nop (int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_nop(pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_NOP, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_busy (eio_tstamp delay, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_busy(delay, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_BUSY, delay, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_sync (int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_sync(pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_SYNC, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_fsync (int fd, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_fsync(fd, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FSYNC, fd, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_fdatasync (int fd, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_fdatasync(fd, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FDATASYNC, fd, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_syncfs (int fd, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_syncfs(fd, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_SYNC, fd, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_msync (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_msync(addr, length, flags, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_MSYNC, addr, length, flags, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_mtouch (void *addr, size_t length, int flags, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_mtouch(addr, length, flags, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_MTOUCH, addr, length, flags, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_mlock (void *addr, size_t length, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_mlock(addr, length, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_MLOCK, addr, length, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_mlockall (int flags, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_mlockall(flags, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_MLOCKALL, flags, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_sync_file_range (int fd, off_t offset, size_t nbytes, unsigned int flags, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_sync_file_range(fd, offset, nbytes, flags, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_SYNC_FILE_RANGE, fd, offset, nbytes, flags, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_fallocate (int fd, int mode, off_t offset, size_t len, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_fallocate(fd, mode, offset, len, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FALLOCATE, fd, mode, offset, len, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_close (int fd, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_close(fd, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_CLOSE, fd, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_readahead (int fd, off_t offset, size_t length, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_readahead(fd, offset, length, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_READAHEAD, fd, offset, length, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_seek (int fd, off_t offset, int whence, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_seek(fd, offset, whence, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_SEEK, fd, offset, whence, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_read (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_read(fd, buf, length, offset, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_READ, fd, buf, length, offset, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_write (int fd, void *buf, size_t length, off_t offset, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_write(fd, buf, length, offset, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_WRITE, fd, buf, length, offset, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_fstat (int fd, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_fstat(fd, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FSTAT, fd, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_fstatvfs (int fd, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_fstatvfs(fd, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FSTATVFS, fd, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_futime (int fd, eio_tstamp atime, eio_tstamp mtime, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_futime(fd, atime, mtime, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FUTIME, fd, atime, mtime, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_ftruncate (int fd, off_t offset, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_ftruncate(fd, offset, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FTRUNCATE, fd, offset, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_fchmod (int fd, mode_t mode, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_fchmod(fd, mode, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FCHMOD, fd, mode, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_fchown (int fd, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_fchown(fd, uid, gid, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_FCHOWN, fd, uid, gid, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_dup2 (int fd, int fd2, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_dup2(fd, fd2, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_DUP2, fd, fd2, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_sendfile (int out_fd, int in_fd, off_t in_offset, size_t length, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_sendfile(out_fd, in_fd, in_offset, length, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_SENDFILE, out_fd, in_fd, in_offset, length, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_open (const char *path, int flags, mode_t mode, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_open(path, flags, mode, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_OPEN, path, flags, mode, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_utime (const char *path, eio_tstamp atime, eio_tstamp mtime, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_utime(path, atime, mtime, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_UTIME, path, atime, mtime, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_truncate (const char *path, off_t offset, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_truncate(path, offset, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_TRUNCATE, path, offset, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_chown (const char *path, eio_uid_t uid, eio_gid_t gid, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_chown(path, uid, gid, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_CHOWN, path, uid, gid, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_chmod (const char *path, mode_t mode, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_chmod(path, mode, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_CHMOD, path, mode, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_mkdir (const char *path, mode_t mode, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_mkdir(path, mode, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_MKDIR, path, mode, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_readdir (const char *path, int flags, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_readdir(path, flags, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_READDIR, path, flags, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_rmdir (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_rmdir(path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_RMDIR, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_unlink (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_unlink(path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_UNLINK, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_readlink (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_readlink(path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_READLINK, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_realpath (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_realpath(path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_REALPATH, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_stat (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_stat(path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_STAT, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_lstat (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_lstat(path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_LSTAT, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_statvfs (const char *path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_statvfs(path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_STATVFS, path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_mknod (const char *path, mode_t mode, dev_t dev, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_mknod(path, mode, dev, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_MKNOD, path, mode, dev, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_link (const char *path, const char *new_path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_link(path, new_path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_LINK, path, new_path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_symlink (const char *path, const char *new_path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_symlink(path, new_path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_SYMLINK, path, new_path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_rename (const char *path, const char *new_path, int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_rename(path, new_path, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_RENAME, path, new_path, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } eio_req *Eio_custom (void (*execute)(eio_req *), int pri, eio_cb cb, void *data) { -#ifdef DYING - eio_req *req = eio_custom(execute, pri, cb, data); -#else eio_req *req = rpmeioReq(EIO_CUSTOM, execute, pri, cb, data); Eio_submit(req); -#endif /* DYING */ SPEW("<-- %s(%s|%p) req %p\n", __FUNCTION__, REQ_TYPE(req), REQ_DATA(req), req); return req; } @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
