Renamed coregrind.h to pub_core_clreq.h and introduced pub_tool_clreq.h to

be consistent with the module naming scheme.

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

diff --git a/coregrind/Makefile.am b/coregrind/Makefile.am
index 9002f0e59299348ca60c67430eaae0b92d938ee4..8846c9c7e90c49601f72f83f34745b099dd629ba 100644 (file)
--- a/coregrind/Makefile.am
+++ b/coregrind/Makefile.am
@@ -48,11 +48,11 @@ noinst_PROGRAMS += vgpreload_core-ppc64-linux.so
 endif
 
 noinst_HEADERS = \
-       coregrind.h             \
        pub_core_aspacemgr.h    \
        pub_core_basics.h       \
        pub_core_basics_asm.h   \
        pub_core_clientstate.h  \
+       pub_core_clreq.h        \
        pub_core_commandline.h  \
        pub_core_coredump.h     \
        pub_core_cpuid.h        \

diff --git a/coregrind/m_replacemalloc/vg_replace_malloc.c b/coregrind/m_replacemalloc/vg_replace_malloc.c
index e6db6afb3f116df59865da86b546107fef1a8aa1..0465e99166a4ed56bf7f1b95f28931b20a391aa2 100644 (file)
--- a/coregrind/m_replacemalloc/vg_replace_malloc.c
+++ b/coregrind/m_replacemalloc/vg_replace_malloc.c
@@ -44,10 +44,9 @@
    traces, so we want the name to be (hopefully!) meaningful to users.
    ------------------------------------------------------------------ */
 
-#include "valgrind.h"               // for VALGRIND_NON_SIMD_CALL[12]
-#include "coregrind.h"              // for VALGRIND_INTERNAL_PRINTF
-
 #include "pub_core_basics.h"
+#include "pub_core_clreq.h"         // for VALGRIND_INTERNAL_PRINTF,
+                                    //   VALGRIND_NON_SIMD_CALL[12]
 #include "pub_core_debuginfo.h"     // needed for pub_core_redir.h :(
 #include "pub_core_mallocfree.h"    // for VG_MIN_MALLOC_SZB, VG_AR_CLIENT
 #include "pub_core_redir.h"         // for VG_REPLACE_FUNCTION

diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 5e9539cb854fbd7b339afd91cce51f693f78a63e..bd08fe6db3fdd8280c7a79c8ca13dabf65032281 100644 (file)
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -57,12 +57,10 @@
    way back for the moment, until we do an OS port in earnest...]
  */
 
-#include "valgrind.h"   // for VG_USERREQ__*
-#include "coregrind.h"  // for VG_USERREQ__*
-
 #include "pub_core_basics.h"
 #include "pub_core_threadstate.h"
 #include "pub_core_aspacemgr.h"
+#include "pub_core_clreq.h"         // for VG_USERREQ__*
 #include "pub_core_dispatch.h"
 #include "pub_core_errormgr.h"      // For VG_(get_n_errs_found)()
 #include "pub_core_libcbase.h"

diff --git a/coregrind/coregrind.h b/coregrind/pub_core_clreq.h
similarity index 88%
rename from coregrind/coregrind.h
rename to coregrind/pub_core_clreq.h
index 8f3b9847be00721ca7392f55caae3c939d165b41..3db9e81fbd0497938c09399a65b957aeffa57452 100644 (file)
--- a/coregrind/coregrind.h
+++ b/coregrind/pub_core_clreq.h
@@ -1,6 +1,6 @@
 
 /*--------------------------------------------------------------------*/
-/*--- Internal client requests.                        coregrind.h ---*/
+/*--- Internal client requests.                   pub_core_clreq.h ---*/
 /*--------------------------------------------------------------------*/
 
 /*
@@ -28,16 +28,14 @@
    The GNU General Public License is contained in the file COPYING.
 */
 
-#ifndef __COREGRIND_H
-#define __COREGRIND_H
+#ifndef __PUB_CORE_CLREQ_H
+#define __PUB_CORE_CLREQ_H
 
 //--------------------------------------------------------------------
-// PURPOSE: This file is the counterpart to valgrind.h.  It contains
-// the client requests that are internal to Valgrind, and not to be seen
-// by client programs.
+// PURPOSE: This module defined client requests.
 //--------------------------------------------------------------------
 
-#include <stdarg.h>
+#include "pub_tool_clreq.h"
 
 // The strange choice of values here is due to historical reasons -- there
 // used to be many more internal client requests.
@@ -73,7 +71,7 @@ int VALGRIND_INTERNAL_PRINTF(char *format, ...)
 }
 
 
-#endif   // __COREGRIND_H
+#endif   // __PUB_CORE_CLREQ_H
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/

diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c
index b6254bc83c10014f09d54f8bf543a2489898cfd9..fb3dcd488d15fdba83b4d99dad723f4580d74972 100644 (file)
--- a/coregrind/vg_preloaded.c
+++ b/coregrind/vg_preloaded.c
@@ -42,10 +42,8 @@
    originates from Valgrind.
    ------------------------------------------------------------------ */
 
-#include "valgrind.h"
-#include "coregrind.h"
-
 #include "pub_core_basics.h"
+#include "pub_core_clreq.h"
 #include "pub_core_debuginfo.h"  // Needed for pub_core_redir.h
 #include "pub_core_redir.h"      // For VG_NOTIFY_ON_LOAD
 

diff --git a/include/Makefile.am b/include/Makefile.am
index 536bc112303d3833de0ccd96f79bdf9ea69b9c25..4fb93cb254ef37310a8fab4a1587384e9d228bf1 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -6,6 +6,7 @@ incinc_HEADERS = \
        pub_tool_basics_asm.h           \
        pub_tool_aspacemgr.h            \
        pub_tool_clientstate.h          \
+       pub_tool_clreq.h                \
        pub_tool_cpuid.h                \
        pub_tool_debuginfo.h            \
        pub_tool_errormgr.h             \

diff --git a/include/pub_tool_clreq.h b/include/pub_tool_clreq.h
new file mode 100644 (file)
index 0000000..c9a5688
--- /dev/null
+++ b/include/pub_tool_clreq.h
@@ -0,0 +1,40 @@
+
+/*--------------------------------------------------------------------*/
+/*--- Client requests.                            pub_tool_clreq.h ---*/
+/*--------------------------------------------------------------------*/
+
+/*
+   This file is part of Valgrind, a dynamic binary instrumentation
+   framework.
+
+   Copyright (C) 2000-2005 Julian Seward
+      jseward@acm.org
+
+   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 __PUB_TOOL_CLREQ_H
+#define __PUB_TOOL_CLREQ_H
+
+#include "valgrind.h"
+
+#endif   // __PUB_TOOL_CLREQ_H
+
+/*--------------------------------------------------------------------*/
+/*--- end                                                          ---*/
+/*--------------------------------------------------------------------*/