Get rid of kludgey and non-functional PID caching in the printing
mechanism.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11046 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_libcprint.c b/coregrind/m_libcprint.c
index 8cde39a..1c28d18 100644
--- a/coregrind/m_libcprint.c
+++ b/coregrind/m_libcprint.c
@@ -374,15 +374,13 @@
leftmost column? */
/* Current message kind - changes from call to call */
VgMsgKind kind;
- /* PID; acquired just once and stays constant */
- Int my_pid;
/* destination */
OutputSink* sink;
}
vmessage_buf_t;
static vmessage_buf_t vmessage_buf
- = { "", 0, True, Vg_UserMsg, -1, &VG_(log_output_sink) };
+ = { "", 0, True, Vg_UserMsg, &VG_(log_output_sink) };
// Adds a single char to the buffer. We aim to have at least 128
@@ -430,7 +428,7 @@
b->buf[b->buf_used++] = tmp[i];
}
- VG_(sprintf)(tmp, "%d", b->my_pid);
+ VG_(sprintf)(tmp, "%d", VG_(getpid)());
tmp[sizeof(tmp)-1] = 0;
for (i = 0; tmp[i]; i++)
b->buf[b->buf_used++] = tmp[i];
@@ -468,15 +466,6 @@
of preamble is emitted at each \n. */
b->kind = kind;
- /* Cache the results of getpid just once, so we don't have to call
- getpid once for each line of text output. */
- b->my_pid = -1; /* LATER: cacheing is confusing in presence of fork(),
- disable for now. */
- if (UNLIKELY(b->my_pid == -1)) {
- b->my_pid = VG_(getpid)();
- vg_assert(b->my_pid >= 0);
- }
-
ret = VG_(debugLog_vprintf) ( add_to__vmessage_buf,
b, format, vargs );