[libvirt] [PATCH 2/3] virtestmock: Initialize symbols from stat() and its friends

Michal Privoznik posted 3 patches 6 years, 9 months ago
[libvirt] [PATCH 2/3] virtestmock: Initialize symbols from stat() and its friends
Posted by Michal Privoznik 6 years, 9 months ago
Introduced by ff376c6283c97.

Previously, init_syms() was called from stat() mock and its
friends. This is crucial because checkPath() might call
printFile() which in turn calls real_fopen(). But if stat() or
one of its friends is the first function called then because of
lacking init_syms() call no real_* is initialized.

The other thing is that we really want the recorded action to be
"stat" instead of __FUNCTION__ because there's no good in
recording that it was __xstat64 who touched some file.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
---
 tests/virtestmock.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/virtestmock.c b/tests/virtestmock.c
index bc62312444..ad6958ac87 100644
--- a/tests/virtestmock.c
+++ b/tests/virtestmock.c
@@ -190,7 +190,9 @@ int access(const char *path, int mode)
 }
 
 
-#define VIR_MOCK_STAT_HOOK CHECK_PATH(path)
+#define VIR_MOCK_STAT_HOOK \
+    init_syms(); \
+    checkPath(path, "stat")
 
 #include "virmockstathelpers.c"
 
-- 
2.21.0

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 2/3] virtestmock: Initialize symbols from stat() and its friends
Posted by Martin Kletzander 6 years, 9 months ago
On Mon, May 06, 2019 at 04:34:07PM +0200, Michal Privoznik wrote:
>Introduced by ff376c6283c97.
>
>Previously, init_syms() was called from stat() mock and its
>friends. This is crucial because checkPath() might call
>printFile() which in turn calls real_fopen(). But if stat() or
>one of its friends is the first function called then because of
>lacking init_syms() call no real_* is initialized.
>
>The other thing is that we really want the recorded action to be
>"stat" instead of __FUNCTION__ because there's no good in
>recording that it was __xstat64 who touched some file.
>
>Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
>---
> tests/virtestmock.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/tests/virtestmock.c b/tests/virtestmock.c
>index bc62312444..ad6958ac87 100644
>--- a/tests/virtestmock.c
>+++ b/tests/virtestmock.c
>@@ -190,7 +190,9 @@ int access(const char *path, int mode)
> }
>
>
>-#define VIR_MOCK_STAT_HOOK CHECK_PATH(path)
>+#define VIR_MOCK_STAT_HOOK \
>+    init_syms(); \
>+    checkPath(path, "stat")
>

Just for the cleanliness of things, I would prefer the macro to be written as a
single block:

do {
    init_syms(); \
    checkPath(path, "stat")
while (0)

even when it is not used like that (at least not yet).

ACK either way.

> #include "virmockstathelpers.c"
>
>-- 
>2.21.0
>
>--
>libvir-list mailing list
>libvir-list@redhat.com
>https://www.redhat.com/mailman/listinfo/libvir-list
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list