From 788fc8d7f1645dc62ba361a927379ec0ac5859fa Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 14 Aug 2012 16:27:19 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/dbg-out | 20 ++++++++++++++++++-- patches/refresh-temp | 28 ---------------------------- 3 files changed, 21 insertions(+), 34 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index daea672a..31aa0f3c 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: ec53487537c7e91851bc8b1ea37ff4bc9b6aff2b -Head: 60e923166b9099175c6c911b47a4b0806361529e +Previous: 07c6fe4a6eb21b822ae07cbdb877e9ef65fc600e +Head: 07aabaed268d5247984df4c175f30891742c3b9c Applied: real-close: 3409f8d6af187d25c63a5d1f8ee8bff5f14555e2 dup2: ca5813e7cf95dee5933fc417e4a34d26f2b01824 @@ -9,8 +9,7 @@ Applied: fork-connect: a50a83fb4e574a2cc435bba1abf6f9df3d0cc7a6 sendfile: 9073427ddddfa2f7c93d0ac4a6da9844cb7d2960 fstat: 54cd7a8f0be1f0af69828c837846f64661ca2c14 - dbg-out: d7654d12e4759c274f2695be817f24b23ef6edc0 - refresh-temp: 60e923166b9099175c6c911b47a4b0806361529e + dbg-out: 07aabaed268d5247984df4c175f30891742c3b9c Unapplied: dbg: 0c269855776d3001e37da8c8afe283c20e1d6cd6 waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8 diff --git a/patches/dbg-out b/patches/dbg-out index 12dfad05..9d03cef0 100644 --- a/patches/dbg-out +++ b/patches/dbg-out @@ -1,5 +1,5 @@ Bottom: 758d450afd5a63013c7540fa171eea46bb810c1a -Top: 67eec87fa9af69af71c0117c513e627fc1ccd969 +Top: 2d92ae89cbff3b1eccae9de8b9718649004e2453 Author: Sean Hefty Date: 2012-08-07 21:30:48 -0700 @@ -8,7 +8,7 @@ support for debug prints --- diff --git a/src/preload.c b/src/preload.c -index ec62e69..8770161 100644 +index ec62e69..efdb414 100644 --- a/src/preload.c +++ b/src/preload.c @@ -50,6 +50,8 @@ @@ -147,3 +147,19 @@ index ec62e69..8770161 100644 + fflush(fout); return newfd; } + +@@ -1042,6 +1076,7 @@ int __fxstat64(int ver, int socket, struct stat64 *buf) + { + // int fd, ret; + ++ fprintf(fout, "%s\n", __func__); fflush(fout); + // if (fd_get(socket, &fd) == fd_rsocket) { + // ret = real.fxstat64(ver, socket, buf); + // if (!ret) +@@ -1055,5 +1090,6 @@ int __fxstat64(int ver, int socket, struct stat64 *buf) + + int __fxstat(int ver, int socket, struct stat *buf) + { ++ fprintf(fout, "%s\n", __func__); fflush(fout); + return real.fxstat(ver, socket, buf); + } diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 28497ae8..00000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,28 +0,0 @@ -Bottom: 67eec87fa9af69af71c0117c513e627fc1ccd969 -Top: 2d92ae89cbff3b1eccae9de8b9718649004e2453 -Author: Sean Hefty -Date: 2012-08-14 16:27:19 -0700 - -Refresh of dbg-out - ---- - -diff --git a/src/preload.c b/src/preload.c -index 8770161..efdb414 100644 ---- a/src/preload.c -+++ b/src/preload.c -@@ -1076,6 +1076,7 @@ int __fxstat64(int ver, int socket, struct stat64 *buf) - { - // int fd, ret; - -+ fprintf(fout, "%s\n", __func__); fflush(fout); - // if (fd_get(socket, &fd) == fd_rsocket) { - // ret = real.fxstat64(ver, socket, buf); - // if (!ret) -@@ -1089,5 +1090,6 @@ int __fxstat64(int ver, int socket, struct stat64 *buf) - - int __fxstat(int ver, int socket, struct stat *buf) - { -+ fprintf(fout, "%s\n", __func__); fflush(fout); - return real.fxstat(ver, socket, buf); - } -- 2.46.0