/
valgrind.diff
179 lines (169 loc) · 4.65 KB
/
valgrind.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
diff --git a/Makefile.am b/Makefile.am
index 08db83401..cfcd7679f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,6 +14,8 @@ TOOLS = \
lackey \
none
+TOOLS += verrou
+
EXP_TOOLS = \
exp-bbv
diff --git a/README b/README
index 511027ae9..0f32e73ea 100644
--- a/README
+++ b/README
@@ -1,3 +1,25 @@
+Specific instructions for Verrou
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You are currently looking at a version of valgrind which has been patched to
+contain the verrou tool. Please look at specific instructions contained in the file:
+
+ verrou/README.md
+
+or the verrou github page:
+
+ https://github.com/edf-hpc/verrou
+
+
+For the very impatient, you should probably run the following commands:
+
+ ./autogen.sh
+ ./configure --enable-only64bit --prefix=PREFIX
+ make
+ make install
+ source PREFIX/env.sh
+
+
Release notes for Valgrind
~~~~~~~~~~~~~~~~~~~~~~~~~~
If you are building a binary package of Valgrind for distribution,
diff --git a/configure.ac b/configure.ac
index b86e80220..f67bafdf1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@
m4_define([v_major_ver], [3])
m4_define([v_minor_ver], [23])
m4_define([v_micro_ver], [0])
-m4_define([v_suffix_ver], [])
+m4_define([v_suffix_ver], [verrou-dev])
m4_define([v_rel_date], ["26 Apr 2024"])
m4_define([v_version],
m4_if(v_suffix_ver, [],
@@ -5604,6 +5604,10 @@ AM_CONDITIONAL(HAVE_THRD_CREATE, test x$ac_cxx_have_thrd_create = xyes)
+# Verrou
+m4_include(verrou/configure.ac)
+
+
#----------------------------------------------------------------------------
# Ok. We're done checking.
#----------------------------------------------------------------------------
@@ -5630,6 +5634,8 @@ AC_CONFIG_FILES([
auxprogs/Makefile
mpi/Makefile
coregrind/Makefile
+ verrou/Makefile
+ verrou/tests/Makefile
memcheck/Makefile
memcheck/tests/Makefile
memcheck/tests/common/Makefile
diff --git a/docs/lib/vg_basic.css b/docs/lib/vg_basic.css
index 49367fed2..6dc3e5f7e 100644
--- a/docs/lib/vg_basic.css
+++ b/docs/lib/vg_basic.css
@@ -65,3 +65,39 @@ blockquote {
border: solid 1px #ffde84;
}
+div.note,
+div.warning {
+ margin-left: 0 !important;
+ margin-right: 0 !important;
+ border-radius: 4px;
+ padding: 1em;
+}
+
+div.note h3,
+div.warning h3 {
+ font-size: 100%;
+ font-weight: bold;
+ margin-top: 0;
+}
+
+div.note p,
+div.warning p {
+ margin: 0;
+}
+
+div.note {
+ background-color: #d9edf7;
+ border: 1px solid #bce8f1;
+}
+div.note, div.note h3 {
+ color: #31708f;
+}
+
+div.warning {
+ background-color: #fcf8e3;
+ border: 1px solid #faebcc;
+}
+
+div.warning, div.warning h3 {
+ color: #8a6d3b;
+}
diff --git a/docs/xml/manpages-index.xml b/docs/xml/manpages-index.xml
index 17a81c99f..2086f49eb 100644
--- a/docs/xml/manpages-index.xml
+++ b/docs/xml/manpages-index.xml
@@ -78,6 +78,27 @@
parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
</chapter>
+<!-- verrou_dd -->
+<chapter>
+<title>verrou_dd</title>
+<xi:include href="../../verrou/docs/verrou_dd-manpage.xml"
+ parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+
+<!-- post_verrou_dd -->
+<chapter>
+<title>post_verrou_dd</title>
+<xi:include href="../../verrou/docs/verrou_postdd-manpage.xml"
+ parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+
+<!-- verrou_plot_stat -->
+<chapter>
+<title>verrou_plot_stat</title>
+<xi:include href="../../verrou/docs/verrou_plotstat-manpage.xml"
+ parse="xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+</chapter>
+
</book>
</set>
diff --git a/docs/xml/manual.xml b/docs/xml/manual.xml
index 518be2964..5929b16a5 100644
--- a/docs/xml/manual.xml
+++ b/docs/xml/manual.xml
@@ -40,6 +40,8 @@
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="../../lackey/docs/lk-manual.xml" parse="xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="../../verrou/docs/vr-manual.xml" parse="xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="../../none/docs/nl-manual.xml" parse="xml"
xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="../../exp-bbv/docs/bbv-manual.xml" parse="xml"
diff --git a/docs/xml/valgrind-manpage.xml b/docs/xml/valgrind-manpage.xml
index 5c16c6eb3..4e2f1bb52 100644
--- a/docs/xml/valgrind-manpage.xml
+++ b/docs/xml/valgrind-manpage.xml
@@ -235,6 +235,9 @@ system: <filename>&vg-docs-path;</filename>, or online:
xmlns:xi="http://www.w3.org/2001/XInclude" />
</refsect1>
+<xi:include href="../../verrou/docs/valgrind-manpage.xml"
+ xmlns:xi="http://www.w3.org/2001/XInclude" />
+
<refsect1 id="see_also">
<title>See Also</title>