Skip to content

Commit 0d0d1a5

Browse files
jfevold-bbgGitHub Enterprise
authored andcommitted
Revert "Include guid in BSLS_REVIEW (via cheapstack) (#4725)" (#4765)
This reverts commit 2c52f74.
1 parent aa37bcf commit 0d0d1a5

File tree

5 files changed

+0
-301
lines changed

5 files changed

+0
-301
lines changed

groups/bsl/bsls/bsls_stackaddressutil.cpp

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ BSLS_IDENT("$Id$ $CSID$")
66

77
#include <bsls_bsltestutil.h>
88
#include <bsls_platform.h>
9-
#include <bsls_stackaddressutil_plinktimestamp.h>
109
#include <bsls_types.h>
1110
#include <assert.h>
1211
#include <stdio.h>
@@ -267,78 +266,6 @@ uintptr_t getStackOffset()
267266
} // close unnamed namespace
268267

269268

270-
namespace {
271-
272-
const char *getPwhatVar(const char *const tag)
273-
// Return the 'pwhat' variable with the specified 'tag'. The behavior is
274-
// undefined unless 'tag' is a non-empty null-terminated string. Return
275-
// '0' if the 'plink_timestamp___' global variable does not contain the
276-
// 'tag' or is not well formed.
277-
{
278-
// This is a modified version of 'sysutil_pwhat_getvar', adjusted to not
279-
// use additional static data and to be more resilient if
280-
// 'plink_timestamp___' is not formed as expected.
281-
282-
assert(0 != tag);
283-
284-
size_t taglength = strlen(tag);
285-
assert(taglength > 0);
286-
287-
// Assume that 'plink_timestamp___' is a '0'-terminated list of
288-
// '0'-terminated strings. Each string should roughly match the regular
289-
// expression '[^]]*] (?<tag>[A-Z]+) *: (?<value>.*)'.
290-
291-
for (int i = 0; 0 != plink_timestamp___[i]; ++i) {
292-
293-
// search through '[^]]*]'
294-
const char *p = strchr(plink_timestamp___[i], ']');
295-
if (0 == p) {
296-
continue;
297-
}
298-
++p;
299-
300-
// make sure the next character is ' '
301-
if (' ' != *p) {
302-
continue;
303-
}
304-
++p;
305-
306-
// see if the desired 'tag' is next
307-
if (0 != strncmp(p,tag,taglength)) {
308-
continue;
309-
}
310-
p += taglength;
311-
312-
// identify if ' *:' is next and advance past the ':'
313-
switch (*p) {
314-
case ' ': {
315-
p = strchr(p,':');
316-
} break;
317-
case ':': {
318-
} break;
319-
default: {
320-
// this is an invalid line or a tag that has the requested tag as a
321-
// prefix.
322-
continue;
323-
} break;
324-
}
325-
++p;
326-
327-
// make sure the next character is ' ' (again)
328-
if (' ' != *p) {
329-
continue;
330-
}
331-
++p;
332-
333-
// the remaining part of this string is the value for the requested
334-
// 'tag'
335-
return p; // RETURN
336-
}
337-
338-
return 0;
339-
}
340-
341-
} // close unnamed namespace
342269

343270
namespace BloombergLP {
344271

@@ -678,16 +605,6 @@ void StackAddressUtil::formatCheapStack(char *output,
678605
return; // RETURN
679606
}
680607

681-
const char *guid = getPwhatVar("GUID");
682-
if (0 != guid && 0 != *guid) {
683-
printed = snprintf(out, rem, "-g %s ", guid);
684-
out += printed;
685-
rem -= printed;
686-
if (printed < 0 || rem <= 0) {
687-
return; // RETURN
688-
}
689-
}
690-
691608
#if defined(BSLS_PLATFORM_OS_AIX)
692609
// On AIX cheapstack expects the stack addresses to be offset based on
693610
// where the text segment was actually loaded - see DRQS 19990260, DRQS

groups/bsl/bsls/bsls_stackaddressutil_plinktimestamp.cpp

Lines changed: 0 additions & 37 deletions
This file was deleted.

groups/bsl/bsls/bsls_stackaddressutil_plinktimestamp.h

Lines changed: 0 additions & 42 deletions
This file was deleted.

groups/bsl/bsls/bsls_stackaddressutil_plinktimestamp.t.cpp

Lines changed: 0 additions & 138 deletions
This file was deleted.

groups/bsl/bsls/package/bsls.mem

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@ bsls_review
7373
bsls_review_macroreset
7474
bsls_spinlock
7575
bsls_stackaddressutil
76-
bsls_stackaddressutil_plinktimestamp
7776
bsls_stopwatch
7877
bsls_systemclocktype
7978
bsls_systemtime

0 commit comments

Comments
 (0)