commit 141a7ed46d0a2d104c73c20c18941aacd2241881
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 21 17:28:10 2010 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 21 17:28:10 2010 +0000
tree 789840e5ea19acb1840a574735c98103a90eb457
parent ea2a03ce907b2a34a24032a6c76551efb7455dc2

Resynchronized client requests with the latest version of TSan's header file
<dynamic_annotations.h>.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11096 a5019735-40e9-0310-863c-91ae7b9d1cf9

drd/drd_error.c

diff --git a/drd/drd_error.c b/drd/drd_error.c
index 607c32b..e2fd583 100644
--- a/drd/drd_error.c
+++ b/drd/drd_error.c
@@ -385,7 +385,7 @@
       VG_(pp_ExeContext)(VG_(get_error_where)(e));
       break;
    }
-   case UnimpClReq: {
+   case UnimpHgClReq: {
       UnimpClReqInfo* uicr =(UnimpClReqInfo*)(VG_(get_error_extra)(e));
       VG_(message)(Vg_UserMsg,
                    "The annotation macro %s has not yet been implemented in"
@@ -394,6 +394,15 @@
       VG_(pp_ExeContext)(VG_(get_error_where)(e));
       break;
    }
+   case UnimpDrdClReq: {
+      UnimpClReqInfo* uicr =(UnimpClReqInfo*)(VG_(get_error_extra)(e));
+      VG_(message)(Vg_UserMsg,
+                   "The annotation macro %s has not yet been implemented in"
+                   " <valgrind/drd.h>\n",
+                   uicr->descr);
+      VG_(pp_ExeContext)(VG_(get_error_where)(e));
+      break;
+   }
    default:
       VG_(message)(Vg_UserMsg,
                    "%s\n",
@@ -431,7 +440,9 @@
       return sizeof(GenericErrInfo);
    case InvalidThreadId:
       return sizeof(InvalidThreadIdInfo);
-   case UnimpClReq:
+   case UnimpHgClReq:
+      return sizeof(UnimpClReqInfo);
+   case UnimpDrdClReq:
       return sizeof(UnimpClReqInfo);
    default:
       tl_assert(False);
@@ -474,8 +485,10 @@
       skind = GenericErr;
    else if (VG_(strcmp)(name, STR_InvalidThreadId) == 0)
       skind = InvalidThreadId;
-   else if (VG_(strcmp)(name, STR_UnimpClReq) == 0)
-      skind = UnimpClReq;
+   else if (VG_(strcmp)(name, STR_UnimpHgClReq) == 0)
+      skind = UnimpHgClReq;
+   else if (VG_(strcmp)(name, STR_UnimpDrdClReq) == 0)
+      skind = UnimpDrdClReq;
    else
       return False;
 
@@ -522,7 +535,8 @@
    case HoldtimeErr:  return VGAPPEND(STR_, HoldtimeErr);
    case GenericErr:   return VGAPPEND(STR_, GenericErr);
    case InvalidThreadId: return VGAPPEND(STR_, InvalidThreadId);
-   case UnimpClReq:   return VGAPPEND(STR_, UnimpClReq);
+   case UnimpHgClReq:  return VGAPPEND(STR_, UnimpHgClReq);
+   case UnimpDrdClReq: return VGAPPEND(STR_, UnimpDrdClReq);
    default:
       tl_assert(0);
    }