Skip to content

Commit d25ba45

Browse files
author
Vladimir Mezentsev
committedNov 1, 2024
gprofng: use gprofng- prefix for gprofng binaries
gprofng application names have a gp- prefix (gp-display-text, gp-archive, etc.). But our man pages use the gprofng- prefix (gprofng-display-text, gprofng-archive, etc.). I renamed the gprofng binaries and temporarily created the gp-* links for compatibility with the old gprofng-gui. We plan to remove these links in version 2.46. gprofng/ChangeLog 2024-10-31 Vladimir Mezentsev <[email protected]> * doc/gprofng-archive.texi: Rename gprofng application names. * doc/gprofng-collect-app.texi: Likewise. * doc/gprofng-display-html.texi: Likewise. * doc/gprofng-display-src.texi: Likewise. * doc/gprofng-display-text.texi: Likewise. * doc/gprofng.texi: Likewise. * doc/gprofng_ug.texi: Likewise. * gp-display-html/Makefile.am: Likewise. * gp-display-html/gp-display-html.in: Likewise. * libcollector/collector.c: Likewise. * src/Application.cc: Likewise. * src/Experiment.cc: Likewise. * src/Makefile.am: Likewise. * src/gp-archive.cc: Likewise. * src/gp-collect-app.cc: Likewise. * src/gp-display-src.cc: Likewise. * src/gp-display-text.cc: Likewise. * src/gprofng.cc: Likewise. * src/Makefile.in: Rebuild. * gp-display-html/Makefile.in: Rebuild.
1 parent e0c182c commit d25ba45

20 files changed

+171
-163
lines changed
 

‎gprofng/doc/gprofng-archive.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@ManPageStart{NAME}
5555
@c man begin NAME
5656

57-
gp-archive - Archive the associated application binaries and sources for a
57+
gprofng-archive - Archive the associated application binaries and sources for a
5858
gprofng experiment
5959

6060
@c man end

‎gprofng/doc/gprofng-collect-app.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@ManPageStart{NAME}
5555
@c man begin NAME
5656

57-
gp-collect-app - Collect performance data for the target program
57+
gprofng-collect-app - Collect performance data for the target program
5858

5959
@c man end
6060
@ManPageEnd{}

‎gprofng/doc/gprofng-display-html.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@ManPageStart{NAME}
5555
@c man begin NAME
5656

57-
gp-display-html - Generate an HTML based directory structure to browse the
57+
gprofng-display-html - Generate an HTML based directory structure to browse the
5858
profiles
5959

6060
@c man end

‎gprofng/doc/gprofng-display-src.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@ManPageStart{NAME}
5555
@c man begin NAME
5656

57-
gp-display-src - Display the source code, optionally interleaved with the
57+
gprofng-display-src - Display the source code, optionally interleaved with the
5858
disassembly of the target object
5959

6060
@c man end

‎gprofng/doc/gprofng-display-text.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
@ManPageStart{NAME}
5555
@c man begin NAME
5656

57-
gp-display-text - Display the performance data in plain text format
57+
gprofng-display-text - Display the performance data in plain text format
5858

5959
@c man end
6060
@ManPageEnd{}

‎gprofng/doc/gprofng.texi

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ recommend to search for @code{gprofng-gui} how to obtain, install and use it.
323323
@ManPageStart{SEE ALSO}
324324
@c man begin SEEALSO
325325

326-
gp-archive(1),
326+
gprofng-archive(1),
327327
gprofng-collect-app(1),
328328
@c -- gprofng-display-gui(1),
329329
gprofng-display-html(1),

‎gprofng/doc/gprofng_ug.texi

+2-2
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ is illustrated below:
518518
@verbatim
519519
$ gprofng display text test.1.er
520520
Warning: History and command editing is not supported on this system.
521-
(gp-display-text) quit
521+
(gprofng-display-text) quit
522522
$
523523
@end verbatim
524524
@end smallexample
@@ -1367,7 +1367,7 @@ marked with the @samp{<} and @samp{>} symbols.
13671367
Experiment: mxv.1.thr.er
13681368
No errors
13691369
No warnings
1370-
Archive command ` /usr/bin/gp-archive -n -a on --outfile
1370+
Archive command ` /usr/bin/gprofng-archive -n -a on --outfile
13711371
<apath>/archive.log <apath>/mxv.1.thr.er'
13721372
13731373
Target command (64-bit): './mxv-pthreads -m 8000 -n 4000 -t 1'

‎gprofng/gp-display-html/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
AUTOMAKE_OPTIONS = foreign
2020
ACLOCAL_AMFLAGS = -I . -I .. -I ../..
2121

22-
bin_SCRIPTS = gp-display-html
22+
bin_SCRIPTS = gprofng-display-html
2323
CLEANFILES = $(bin_SCRIPTS)
2424

2525
do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/'
2626

27-
gp-display-html: gp-display-html.in Makefile
27+
gprofng-display-html: $(srcdir)/gp-display-html.in
2828
$(do_subst) < $(srcdir)/gp-display-html.in > $@
2929
chmod +x $@

‎gprofng/gp-display-html/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ zlibdir = @zlibdir@
322322
zlibinc = @zlibinc@
323323
AUTOMAKE_OPTIONS = foreign
324324
ACLOCAL_AMFLAGS = -I . -I .. -I ../..
325-
bin_SCRIPTS = gp-display-html
325+
bin_SCRIPTS = gprofng-display-html
326326
CLEANFILES = $(bin_SCRIPTS)
327327
do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/'
328328
all: all-am
@@ -557,7 +557,7 @@ uninstall-am: uninstall-binSCRIPTS
557557
.PRECIOUS: Makefile
558558

559559

560-
gp-display-html: gp-display-html.in Makefile
560+
gprofng-display-html: $(srcdir)/gp-display-html.in
561561
$(do_subst) < $(srcdir)/gp-display-html.in > $@
562562
chmod +x $@
563563

‎gprofng/gp-display-html/gp-display-html.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ my $g_test_code = $FALSE;
8787
#------------------------------------------------------------------------------
8888
# GPROFNG commands and files used.
8989
#------------------------------------------------------------------------------
90-
my $GP_DISPLAY_TEXT = "gp-display-text";
90+
my $GP_DISPLAY_TEXT = "gprofng-display-text";
9191

9292
my $g_gp_output_file = $GP_DISPLAY_TEXT.".stdout.log";
9393
my $g_gp_error_logfile = $GP_DISPLAY_TEXT.".stderr.log";
@@ -195,7 +195,7 @@ my $thresh = 0;
195195
# Define the driver command, tool name and version number.
196196
#------------------------------------------------------------------------------
197197
$driver_cmd = "gprofng display html";
198-
$tool_name = "gp-display-html";
198+
$tool_name = "gprofng-display-html";
199199
#$binutils_version = "2.38.50";
200200
$binutils_version = "2.43.0";
201201
$version_info = $tool_name . " GNU binutils version " . $binutils_version;
@@ -1937,7 +1937,7 @@ sub check_availability_tool
19371937
my $target_cmd;
19381938

19391939
#------------------------------------------------------------------------------
1940-
# Get the path to gp-display-text.
1940+
# Get the path to gprofng-display-text.
19411941
#------------------------------------------------------------------------------
19421942
my ($error_occurred_ref, $gp_path_ref, $return_value_ref) =
19431943
find_path_to_gp_display_text ($location_gp_command_ref);
@@ -1951,7 +1951,7 @@ sub check_availability_tool
19511951

19521952
if (not $error_occurred)
19531953
#------------------------------------------------------------------------------
1954-
# All is well and gp-display-text has been located.
1954+
# All is well and gprofng-display-text has been located.
19551955
#------------------------------------------------------------------------------
19561956
{
19571957
$g_path_to_tools = $return_value;
@@ -4655,7 +4655,7 @@ sub find_keyword_in_string
46554655

46564656
#------------------------------------------------------------------------------
46574657
# Retrieve the absolute path that was used to execute the command. This path
4658-
# is used to execute gp-display-text later on.
4658+
# is used to execute gprofng-display-text later on.
46594659
#------------------------------------------------------------------------------
46604660
sub find_path_to_gp_display_text
46614661
{
@@ -7843,7 +7843,7 @@ sub generate_html_function_blocks
78437843
#------------------------------------------------------------------------------
78447844
# Get all the metrics available
78457845
#
7846-
# (gp-display-text) metric_list
7846+
# (gprofng-display-text) metric_list
78477847
# Current metrics: e.totalcpu:i.totalcpu:e.cycles:e+insts:e+llm:name
78487848
# Current Sort Metric: Exclusive Total CPU Time ( e.totalcpu )
78497849
# Available metrics:

‎gprofng/libcollector/collector.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,7 @@ __collector_SIGCHLD_signal_handler (int sig, siginfo_t *si, void *context)
11521152
* before the handler knows the value of mychild_pid.
11531153
*/
11541154
if (calling_pid == mychild_pid)
1155-
// er_archive has exited; so restore the user handler
1155+
// gprofng_archive has exited; so restore the user handler
11561156
__collector_sigaction (SIGCHLD, &original_sigchld_sigaction, NULL);
11571157
else
11581158
{
@@ -1269,7 +1269,7 @@ __collector_close_experiment ()
12691269
if (project_home && archive_mode && __collector_strcmp (archive_mode, "off"))
12701270
{
12711271
/* construct a command to launch it */
1272-
char *er_archive_name = "/bin/gp-archive";
1272+
char *er_archive_name = "/bin/gprofng-archive";
12731273
size_t cmdlen = CALL_UTIL (strlen)(project_home) + CALL_UTIL (strlen)(er_archive_name) + 1;
12741274
char *command = (char*) alloca (cmdlen);
12751275
CALL_UTIL (snprintf)(command, cmdlen, "%s%s", project_home, er_archive_name);

‎gprofng/src/Application.cc

-5
Original file line numberDiff line numberDiff line change
@@ -202,11 +202,7 @@ Application::check_args (int argc, char *argv[])
202202
switch (opt)
203203
{
204204
case 'V':
205-
// Ruud
206205
Application::print_version_info ();
207-
/*
208-
printf (NTXT ("GNU %s version %s\n"), get_basename (prog_name), VERSION);
209-
*/
210206
exit (0);
211207
default:
212208
usage ();
@@ -246,7 +242,6 @@ Application::set_progress (int percentage, const char *proc_str)
246242
return 0;
247243
}
248244

249-
// Ruud
250245
void
251246
Application::print_version_info ()
252247
{

0 commit comments

Comments
 (0)