Eliminated the upper bound on the number of client-side mutexes.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7500

diff --git a/exp-drd/drd_clientobj.c b/exp-drd/drd_clientobj.c
new file mode 100644 (file)
index 0000000..f5ef669
--- /dev/null
+++ b/exp-drd/drd_clientobj.c
@@ -0,0 +1,166 @@
+/*
+  This file is part of drd, a data race detector.
+
+  Copyright (C) 2006-2008 Bart Van Assche
+  bart.vanassche@gmail.com
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+  02111-1307, USA.
+
+  The GNU General Public License is contained in the file COPYING.
+*/
+
+
+#include "drd_clientobj.h"
+#include "drd_suppression.h"
+#include "pub_tool_basics.h"
+#include "pub_tool_libcassert.h"
+#include "pub_tool_libcbase.h"
+#include "pub_tool_libcprint.h"  // VG_(message)()
+#include "pub_tool_mallocfree.h"
+#include "pub_tool_oset.h"
+
+
+// Local variables.
+
+static OSet* s_clientobj;
+
+
+// Function definitions.
+
+/** Initialize the client object set. */
+void drd_clientobj_init(void)
+{
+  tl_assert(s_clientobj == 0);
+  s_clientobj = VG_(OSetGen_Create)(0, 0, VG_(malloc), VG_(free));
+  tl_assert(s_clientobj);
+}
+
+/** Free the memory allocated for the client object set.
+ *  @pre Client object set is empty.
+ */
+void drd_clientobj_cleanup(void)
+{
+  tl_assert(s_clientobj);
+  tl_assert(VG_(OSetGen_Size)(s_clientobj) == 0);
+  VG_(OSetGen_Destroy)(s_clientobj);
+  s_clientobj = 0;
+}
+
+/** Return the data associated with the client object at client address addr
+ *  and that has object type t. Return 0 if there is no client object in the
+ *  set with the specified start address.
+ */
+DrdClientobj* drd_clientobj_get(const Addr addr, const ObjType t)
+{
+  DrdClientobj* p;
+  p = VG_(OSetGen_Lookup)(s_clientobj, &addr);
+  if (p && p->any.type == t)
+    return p;
+  return 0;
+}
+
+/** Return true if and only if the address range of any client object overlaps
+ *  with the specified address range.
+ */
+Bool drd_clientobj_present(const Addr a1, const Addr a2)
+{
+  DrdClientobj *p;
+
+  tl_assert(a1 < a2);
+  VG_(OSetGen_ResetIter)(s_clientobj);
+  for ( ; (p = VG_(OSetGen_Next)(s_clientobj)) != 0; )
+  {
+    if ((a1 <= p->any.a1 && p->any.a1 < a2)
+        || (a1 < p->any.a2 && p->any.a2 <= a2))
+    {
+      return True;  
+    }
+  }
+  return False;
+}
+
+/** Add state information for the client object at client address addr and
+ *  of type t. Suppress data race reports on the address range [addr,addr+size[.
+ *  @pre No other client object is present in the address range [addr,addr+size[.
+ */
+DrdClientobj*
+drd_clientobj_add(const Addr a1, const Addr a2, const ObjType t)
+{
+  DrdClientobj* p;
+
+  tl_assert(a1 < a2 && a1 + 4096 > a2);
+  tl_assert(! drd_clientobj_present(a1, a2));
+  tl_assert(VG_(OSetGen_Lookup)(s_clientobj, &a1) == 0);
+  p = VG_(OSetGen_AllocNode)(s_clientobj, sizeof(*p));
+  VG_(memset)(p, 0, sizeof(*p));
+  p->any.a1   = a1;
+  p->any.a2   = a2;
+  p->any.type = t;
+  VG_(OSetGen_Insert)(s_clientobj, p);
+  tl_assert(VG_(OSetGen_Lookup)(s_clientobj, &a1) == p);
+  drd_start_suppression(p->any.a1, p->any.a2, "client object");
+  return p;
+}
+
+Bool drd_clientobj_remove(const Addr addr)
+{
+  DrdClientobj* p;
+
+  p = VG_(OSetGen_Remove)(s_clientobj, &addr);
+  if (p)
+  {
+#if 0
+    VG_(message)(Vg_DebugMsg, "removing client obj [%p,%p[\n",
+                 p->any.a1, p->any.a2);
+#endif
+    tl_assert(VG_(OSetGen_Lookup)(s_clientobj, &addr) == 0);
+    drd_finish_suppression(p->any.a1, p->any.a2);
+    tl_assert(p->any.cleanup);
+    (*p->any.cleanup)(p);
+    VG_(OSetGen_FreeNode)(s_clientobj, p);
+    return True;
+  }
+  return False;
+}
+
+void drd_clientobj_stop_using_mem(const Addr a1, const Addr a2)
+{
+  DrdClientobj* p;
+  tl_assert(s_clientobj);
+  VG_(OSetGen_ResetIter)(s_clientobj);
+  for ( ; (p = VG_(OSetGen_Next)(s_clientobj)) != 0; )
+  {
+    if ((a1 <= p->any.a1 && p->any.a1 < a2)
+        || (a1 < p->any.a2 && p->any.a2 <= a2))
+    {
+      drd_clientobj_remove(p->any.a1);
+    }
+  }
+}
+
+void drd_clientobj_resetiter(void)
+{
+  VG_(OSetGen_ResetIter)(s_clientobj);
+}
+
+DrdClientobj* drd_clientobj_next(const ObjType t)
+{
+  DrdClientobj* p;
+  while ((p = VG_(OSetGen_Next)(s_clientobj)) != 0 && p->any.type != t)
+    ;
+  return p;
+}
+

diff --git a/exp-drd/drd_clientobj.h b/exp-drd/drd_clientobj.h
new file mode 100644 (file)
index 0000000..972495a
--- /dev/null
+++ b/exp-drd/drd_clientobj.h
@@ -0,0 +1,83 @@
+/*
+  This file is part of drd, a data race detector.
+
+  Copyright (C) 2006-2008 Bart Van Assche
+  bart.vanassche@gmail.com
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU General Public License as
+  published by the Free Software Foundation; either version 2 of the
+  License, or (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+  02111-1307, USA.
+
+  The GNU General Public License is contained in the file COPYING.
+*/
+
+
+#ifndef __DRD_CLIENTOBJ_H
+#define __DRD_CLIENTOBJ_H
+
+
+#include "drd_clientreq.h"   /* MutexT */
+#include "drd_thread.h"      /* DrdThreadId */
+#include "pub_tool_basics.h"
+
+
+// Forward declarations.
+
+union drd_clientobj;
+
+
+// Type definitions.
+
+typedef enum { ClientMutex, } ObjType;
+
+struct any
+{
+  Addr    a1;
+  Addr    a2;
+  ObjType type;
+  void    (*cleanup)(union drd_clientobj*);
+};
+
+struct mutex_info
+{
+  Addr        a1;
+  Addr        a2;
+  ObjType     type;
+  void        (*cleanup)(union drd_clientobj*);
+  MutexT      mutex_type;      // pthread_mutex_t or pthread_spinlock_t.
+  int         recursion_count; // 0 if free, >= 1 if locked.
+  DrdThreadId owner;           // owner if locked, last owner if free.
+  VectorClock vc;              // vector clock associated with last unlock.
+};
+
+typedef union drd_clientobj
+{
+  struct any        any;
+  struct mutex_info mutex;
+} DrdClientobj;
+
+
+// Function declarations.
+
+void drd_clientobj_init(void);
+void drd_clientobj_cleanup(void);
+DrdClientobj* drd_clientobj_get(const Addr addr, const ObjType t);
+Bool drd_clientobj_present(const Addr a1, const Addr a2);
+DrdClientobj* drd_clientobj_add(const Addr a1, const Addr a2, const ObjType t);
+Bool drd_clientobj_remove(const Addr addr);
+void drd_clientobj_stop_using_mem(const Addr a1, const Addr a2);
+void drd_clientobj_resetiter(void);
+DrdClientobj* drd_clientobj_next(const ObjType t);
+
+#endif /* __DRD_CLIENTOBJ_H */