[Libraw1394-cvslog] rev 172 - in trunk: . src

[SVN U. <dde...@li...>]

Author: ddennedy
Date: 2007-05-29 22:11:30 -0700 (Tue, 29 May 2007)
New Revision: 172

Modified:
   trunk/configure.ac
   trunk/src/readwrite.c
Log:
Apply patch from Jon Schewe <jon...@ho...> to make valgrind happy. Adds --with-valgrind configure option.

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2007-02-17 02:30:13 UTC (rev 171)
+++ trunk/configure.ac	2007-05-30 05:11:30 UTC (rev 172)
@@ -24,6 +24,11 @@
 AC_SUBST(lt_revision)
 AC_SUBST(lt_age)
 
+dnl Check to see if valgrind is available
+AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind],[compile with valgrind support]))
+if test x$with_valgrind = xyes ; then
+    AC_CHECK_HEADERS(valgrind/valgrind.h)
+fi
 
 #CFLAGS=${CFLAGS:-"-Wall"}
 AC_OUTPUT([

Modified: trunk/src/readwrite.c
===================================================================
--- trunk/src/readwrite.c	2007-02-17 02:30:13 UTC (rev 171)
+++ trunk/src/readwrite.c	2007-05-30 05:11:30 UTC (rev 172)
@@ -30,7 +30,16 @@
 #include "kernel-raw1394.h"
 #include "raw1394_private.h"
 
+#if HAVE_VALGRIND_VALGRIND_H
+# include <valgrind/memcheck.h>
+# ifndef VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE
+#  define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(m, n) do {} while(0)
+# endif
+#else
+# define VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(m, n) do {} while(0)
+#endif
 
+
 int raw1394_start_read(struct raw1394_handle *handle, nodeid_t node,
                        nodeaddr_t addr, size_t length, quadlet_t *buffer,
                        unsigned long tag)
@@ -218,13 +227,16 @@
                                         &sd };                            \
         int err = 0
 
-#define SYNCFUNC_BODY                                 \
+#define SYNCFUNC_BODY_WO_RETURN                       \
         while (!sd.done) {                            \
                 if (err < 0) return err;              \
                 err = raw1394_loop_iterate(handle);   \
         }                                             \
         handle->err = sd.errcode;                     \
-        errno = raw1394_errcode_to_errno(sd.errcode); \
+        errno = raw1394_errcode_to_errno(sd.errcode);
+
+#define SYNCFUNC_BODY                                 \
+        SYNCFUNC_BODY_WO_RETURN                       \
         return (errno ? -1 : 0)
 
 int raw1394_read(struct raw1394_handle *handle, nodeid_t node, nodeaddr_t addr,
@@ -235,7 +247,12 @@
         err = raw1394_start_read(handle, node, addr, length, buffer, 
                                  (unsigned long)&rh);
 
-        SYNCFUNC_BODY;
+        SYNCFUNC_BODY_WO_RETURN;
+        if(!errno) {
+          VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(buffer, length);
+        }
+           
+        return (errno ? -1 : 0);
 }
 
 int raw1394_write(struct raw1394_handle *handle, nodeid_t node, nodeaddr_t addr,
@@ -258,7 +275,12 @@
         err = raw1394_start_lock(handle, node, addr, extcode, data, arg, result,
                                  (unsigned long)&rh);
 
-        SYNCFUNC_BODY;
+        SYNCFUNC_BODY_WO_RETURN;
+        if(!errno) {
+          VALGRIND_MAKE_MEM_DEFINED_IF_ADDRESSABLE(result, sizeof(quadlet_t));
+        }
+           
+        return (errno ? -1 : 0);
 }
 
 int raw1394_lock64(struct raw1394_handle *handle, nodeid_t node, nodeaddr_t addr,