mirrors/binutils-gdb
0
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2024-11-27 03:54:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gprofng: use gprofng- prefix for gprofng binaries

Browse Source 
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  <vladimir.mezentsev@oracle.com>

	* 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.
This commit is contained in:
Vladimir Mezentsev 2024-10-30 21:18:39 -07:00
parent e0c182c3ac
commit d25ba4596e
20 changed files with 172 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gprofng/doc/gprofng-archive.texi
View File

@ -54,7 +54,7 @@
@ManPageStart{NAME} @ManPageStart{NAME}
@c man begin NAME @c man begin NAME
gp-archive - Archive the associated application binaries and sources for a gprofng-archive - Archive the associated application binaries and sources for a
gprofng experiment gprofng experiment
@c man end @c man end

2
gprofng/doc/gprofng-collect-app.texi
View File

@ -54,7 +54,7 @@
@ManPageStart{NAME} @ManPageStart{NAME}
@c man begin NAME @c man begin NAME
gp-collect-app - Collect performance data for the target program gprofng-collect-app - Collect performance data for the target program
@c man end @c man end
@ManPageEnd{} @ManPageEnd{}

2
gprofng/doc/gprofng-display-html.texi
View File

@ -54,7 +54,7 @@
@ManPageStart{NAME} @ManPageStart{NAME}
@c man begin NAME @c man begin NAME
gp-display-html - Generate an HTML based directory structure to browse the gprofng-display-html - Generate an HTML based directory structure to browse the
profiles profiles
@c man end @c man end

2
gprofng/doc/gprofng-display-src.texi
View File

@ -54,7 +54,7 @@
@ManPageStart{NAME} @ManPageStart{NAME}
@c man begin NAME @c man begin NAME
gp-display-src - Display the source code, optionally interleaved with the gprofng-display-src - Display the source code, optionally interleaved with the
disassembly of the target object disassembly of the target object
@c man end @c man end

2
gprofng/doc/gprofng-display-text.texi
View File

@ -54,7 +54,7 @@
@ManPageStart{NAME} @ManPageStart{NAME}
@c man begin NAME @c man begin NAME
gp-display-text - Display the performance data in plain text format gprofng-display-text - Display the performance data in plain text format
@c man end @c man end
@ManPageEnd{} @ManPageEnd{}

2
gprofng/doc/gprofng.texi
View File

@ -323,7 +323,7 @@ recommend to search for @code{gprofng-gui} how to obtain, install and use it.
@ManPageStart{SEE ALSO} @ManPageStart{SEE ALSO}
@c man begin SEEALSO @c man begin SEEALSO
gp-archive(1), gprofng-archive(1),
gprofng-collect-app(1), gprofng-collect-app(1),
@c -- gprofng-display-gui(1), @c -- gprofng-display-gui(1),
gprofng-display-html(1), gprofng-display-html(1),

4
gprofng/doc/gprofng_ug.texi
View File

@ -518,7 +518,7 @@ is illustrated below:
@verbatim @verbatim
$ gprofng display text test.1.er $ gprofng display text test.1.er
Warning: History and command editing is not supported on this system. Warning: History and command editing is not supported on this system.
(gp-display-text) quit (gprofng-display-text) quit
$ $
@end verbatim @end verbatim
@end smallexample @end smallexample
@ -1367,7 +1367,7 @@ marked with the @samp{<} and @samp{>} symbols.
Experiment: mxv.1.thr.er Experiment: mxv.1.thr.er
No errors No errors
No warnings No warnings
Archive command ` /usr/bin/gp-archive -n -a on --outfile Archive command ` /usr/bin/gprofng-archive -n -a on --outfile
<apath>/archive.log <apath>/mxv.1.thr.er' <apath>/archive.log <apath>/mxv.1.thr.er'
Target command (64-bit): './mxv-pthreads -m 8000 -n 4000 -t 1' Target command (64-bit): './mxv-pthreads -m 8000 -n 4000 -t 1'

4
gprofng/gp-display-html/Makefile.am
View File

@ -19,11 +19,11 @@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I . -I .. -I ../.. ACLOCAL_AMFLAGS = -I . -I .. -I ../..
bin_SCRIPTS = gp-display-html bin_SCRIPTS = gprofng-display-html
CLEANFILES = $(bin_SCRIPTS) CLEANFILES = $(bin_SCRIPTS)
do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/' do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/'
gp-display-html: gp-display-html.in Makefile gprofng-display-html: $(srcdir)/gp-display-html.in
$(do_subst) < $(srcdir)/gp-display-html.in > $@ $(do_subst) < $(srcdir)/gp-display-html.in > $@
chmod +x $@ chmod +x $@

4
gprofng/gp-display-html/Makefile.in
View File

@ -322,7 +322,7 @@ zlibdir = @zlibdir@
zlibinc = @zlibinc@ zlibinc = @zlibinc@
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I . -I .. -I ../.. ACLOCAL_AMFLAGS = -I . -I .. -I ../..
bin_SCRIPTS = gp-display-html bin_SCRIPTS = gprofng-display-html
CLEANFILES = $(bin_SCRIPTS) CLEANFILES = $(bin_SCRIPTS)
do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/' do_subst = sed -e 's/BINUTILS_VERSION/$(VERSION)/'
all: all-am all: all-am
@ -557,7 +557,7 @@ uninstall-am: uninstall-binSCRIPTS
.PRECIOUS: Makefile .PRECIOUS: Makefile
gp-display-html: gp-display-html.in Makefile gprofng-display-html: $(srcdir)/gp-display-html.in
$(do_subst) < $(srcdir)/gp-display-html.in > $@ $(do_subst) < $(srcdir)/gp-display-html.in > $@
chmod +x $@ chmod +x $@

12
gprofng/gp-display-html/gp-display-html.in
View File

@ -87,7 +87,7 @@ my $g_test_code = $FALSE;
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# GPROFNG commands and files used. # GPROFNG commands and files used.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
my $GP_DISPLAY_TEXT = "gp-display-text"; my $GP_DISPLAY_TEXT = "gprofng-display-text";
my $g_gp_output_file = $GP_DISPLAY_TEXT.".stdout.log"; my $g_gp_output_file = $GP_DISPLAY_TEXT.".stdout.log";
my $g_gp_error_logfile = $GP_DISPLAY_TEXT.".stderr.log"; my $g_gp_error_logfile = $GP_DISPLAY_TEXT.".stderr.log";
@ -195,7 +195,7 @@ my $thresh = 0;
# Define the driver command, tool name and version number. # Define the driver command, tool name and version number.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
$driver_cmd = "gprofng display html"; $driver_cmd = "gprofng display html";
$tool_name = "gp-display-html"; $tool_name = "gprofng-display-html";
#$binutils_version = "2.38.50"; #$binutils_version = "2.38.50";
$binutils_version = "2.43.0"; $binutils_version = "2.43.0";
$version_info = $tool_name . " GNU binutils version " . $binutils_version; $version_info = $tool_name . " GNU binutils version " . $binutils_version;
@ -1937,7 +1937,7 @@ sub check_availability_tool
my $target_cmd; my $target_cmd;
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Get the path to gp-display-text. # Get the path to gprofng-display-text.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
my ($error_occurred_ref, $gp_path_ref, $return_value_ref) = my ($error_occurred_ref, $gp_path_ref, $return_value_ref) =
find_path_to_gp_display_text ($location_gp_command_ref); find_path_to_gp_display_text ($location_gp_command_ref);
@ -1951,7 +1951,7 @@ sub check_availability_tool
if (not $error_occurred) if (not $error_occurred)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# All is well and gp-display-text has been located. # All is well and gprofng-display-text has been located.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
{ {
$g_path_to_tools = $return_value; $g_path_to_tools = $return_value;
@ -4655,7 +4655,7 @@ sub find_keyword_in_string
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Retrieve the absolute path that was used to execute the command. This path # Retrieve the absolute path that was used to execute the command. This path
# is used to execute gp-display-text later on. # is used to execute gprofng-display-text later on.
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
sub find_path_to_gp_display_text sub find_path_to_gp_display_text
{ {
@ -7843,7 +7843,7 @@ sub generate_html_function_blocks
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Get all the metrics available # Get all the metrics available
# #
# (gp-display-text) metric_list # (gprofng-display-text) metric_list
# Current metrics: e.totalcpu:i.totalcpu:e.cycles:e+insts:e+llm:name # Current metrics: e.totalcpu:i.totalcpu:e.cycles:e+insts:e+llm:name
# Current Sort Metric: Exclusive Total CPU Time ( e.totalcpu ) # Current Sort Metric: Exclusive Total CPU Time ( e.totalcpu )
# Available metrics: # Available metrics:

4
gprofng/libcollector/collector.c
View File

@ -1152,7 +1152,7 @@ __collector_SIGCHLD_signal_handler (int sig, siginfo_t *si, void *context)
* before the handler knows the value of mychild_pid. * before the handler knows the value of mychild_pid.
*/ */
if (calling_pid == mychild_pid) if (calling_pid == mychild_pid)
// er_archive has exited; so restore the user handler // gprofng_archive has exited; so restore the user handler
__collector_sigaction (SIGCHLD, &original_sigchld_sigaction, NULL); __collector_sigaction (SIGCHLD, &original_sigchld_sigaction, NULL);
else else
{ {
@ -1269,7 +1269,7 @@ __collector_close_experiment ()
if (project_home && archive_mode && __collector_strcmp (archive_mode, "off")) if (project_home && archive_mode && __collector_strcmp (archive_mode, "off"))
{ {
/* construct a command to launch it */ /* construct a command to launch it */
char *er_archive_name = "/bin/gp-archive"; char *er_archive_name = "/bin/gprofng-archive";
size_t cmdlen = CALL_UTIL (strlen)(project_home) + CALL_UTIL (strlen)(er_archive_name) + 1; size_t cmdlen = CALL_UTIL (strlen)(project_home) + CALL_UTIL (strlen)(er_archive_name) + 1;
char *command = (char*) alloca (cmdlen); char *command = (char*) alloca (cmdlen);
CALL_UTIL (snprintf)(command, cmdlen, "%s%s", project_home, er_archive_name); CALL_UTIL (snprintf)(command, cmdlen, "%s%s", project_home, er_archive_name);

5
gprofng/src/Application.cc
View File

@ -202,11 +202,7 @@ Application::check_args (int argc, char *argv[])
switch (opt) switch (opt)
{ {
case 'V': case 'V':
// Ruud
Application::print_version_info (); Application::print_version_info ();
/*
printf (NTXT ("GNU %s version %s\n"), get_basename (prog_name), VERSION);
*/
exit (0); exit (0);
default: default:
usage (); usage ();
@ -246,7 +242,6 @@ Application::set_progress (int percentage, const char *proc_str)
return 0; return 0;
} }
// Ruud
void void
Application::print_version_info () Application::print_version_info ()
{ {

52
gprofng/src/Experiment.cc
View File

@ -659,7 +659,7 @@ Experiment::ExperimentHandler::startElement (char*, char*, char *qName, Attribut
else if (strcmp (str, SP_JCMD_ARCHIVE) == 0) else if (strcmp (str, SP_JCMD_ARCHIVE) == 0)
{ {
StringBuilder sb; StringBuilder sb;
sb.sprintf (GTXT ("gp-archive run: XXXXXXX")); sb.sprintf (GTXT ("gprofng-archive run: XXXXXXX"));
exp->pprocq->append (new Emsg (CMSG_WARN, sb)); exp->pprocq->append (new Emsg (CMSG_WARN, sb));
} }
else if (strcmp (str, SP_JCMD_SAMPLE) == 0) else if (strcmp (str, SP_JCMD_SAMPLE) == 0)
@ -6481,14 +6481,14 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_
{ {
if (errno == EEXIST) if (errno == EEXIST)
return 0; return 0;
fprintf (stderr, GTXT ("gp-archive: unable to copy `%s': %s\n"), fprintf (stderr, GTXT ("gprofng-archive: unable to copy `%s': %s\n"),
name, STR (strerror (errno))); name, STR (strerror (errno)));
return 1; return 1;
} }
if (dbe_stat_file (name, NULL) != 0) if (dbe_stat_file (name, NULL) != 0)
{ {
fprintf (stderr, GTXT ("gp-archive: cannot access file `%s': %s\n"), fprintf (stderr, GTXT ("gprofng-archive: cannot access file `%s': %s\n"),
name, STR (strerror (errno))); name, STR (strerror (errno)));
close (fd_w); close (fd_w);
return 1; return 1;
@ -6497,7 +6497,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_
int fd_r = ::open64 (name, O_RDONLY); int fd_r = ::open64 (name, O_RDONLY);
if (fd_r == -1) if (fd_r == -1)
{ {
fprintf (stderr, GTXT ("gp-archive: unable to open `%s': %s\n"), fprintf (stderr, GTXT ("gprofng-archive: unable to open `%s': %s\n"),
name, strerror (errno)); name, strerror (errno));
close (fd_w); close (fd_w);
unlink (aname); unlink (aname);
@ -6517,7 +6517,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_
n1 = (int) write (fd_w, buf, n); n1 = (int) write (fd_w, buf, n);
if (n != n1) if (n != n1)
{ {
fprintf (stderr, GTXT ("gp-archive: unable to write %d bytes to `%s': %s\n"), fprintf (stderr, GTXT ("gprofng-archive: unable to write %d bytes to `%s': %s\n"),
n, aname, STR (strerror (errno))); n, aname, STR (strerror (errno)));
do_unlink = true; do_unlink = true;
break; break;
@ -6537,7 +6537,7 @@ Experiment::copy_file_to_archive (const char *name, const char *aname, int hide_
if (do_unlink) if (do_unlink)
{ {
if (!hide_msg) if (!hide_msg)
fprintf (stderr, GTXT ("gp-archive: remove %s\n"), aname); fprintf (stderr, GTXT ("gprofng-archive: remove %s\n"), aname);
unlink (aname); unlink (aname);
return 1; return 1;
} }
@ -6566,11 +6566,11 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
if (!name || !aname || !common_archive) if (!name || !aname || !common_archive)
{ {
if (!name) if (!name)
fprintf (stderr, GTXT ("gp-archive: Internal error: file name is NULL\n")); fprintf (stderr, GTXT ("gprofng-archive: Internal error: file name is NULL\n"));
if (!aname) if (!aname)
fprintf (stderr, GTXT ("gp-archive: Internal error: file name in archive is NULL\n")); fprintf (stderr, GTXT ("gprofng-archive: Internal error: file name in archive is NULL\n"));
if (!common_archive) if (!common_archive)
fprintf (stderr, GTXT ("gp-archive: Internal error: path to common archive is NULL\n")); fprintf (stderr, GTXT ("gprofng-archive: Internal error: path to common archive is NULL\n"));
return 1; return 1;
} }
// Check if file is already archived // Check if file is already archived
@ -6584,14 +6584,14 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
long size = pathconf (NTXT ("."), _PC_PATH_MAX); long size = pathconf (NTXT ("."), _PC_PATH_MAX);
if (size < 0) if (size < 0)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(\".\", _PC_PATH_MAX) failed\n")); fprintf (stderr, GTXT ("gprofng-archive: Fatal error: pathconf(\".\", _PC_PATH_MAX) failed\n"));
return 1; return 1;
} }
char *buf = (char *) xmalloc ((size_t) size); char *buf = (char *) xmalloc ((size_t) size);
char *ptr = getcwd (buf, (size_t) size); char *ptr = getcwd (buf, (size_t) size);
if (ptr == NULL) if (ptr == NULL)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot determine current directory\n")); fprintf (stderr, GTXT ("gprofng-archive: Fatal error: cannot determine current directory\n"));
free (buf); free (buf);
return 1; return 1;
} }
@ -6619,12 +6619,12 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
free (abs_aname); free (abs_aname);
if (NULL != errmsg) if (NULL != errmsg)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: %s\n"), errmsg); fprintf (stderr, GTXT ("gprofng-archive: Fatal error: %s\n"), errmsg);
free (errmsg); free (errmsg);
return 1; return 1;
} }
fprintf (stderr, fprintf (stderr,
GTXT ("gp-archive: Fatal error: get_cksum(%s) returned %d\n"), GTXT ("gprofng-archive: Fatal error: get_cksum(%s) returned %d\n"),
name, crcval); name, crcval);
return 1; return 1;
} }
@ -6636,7 +6636,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
free (cad); free (cad);
free (abs_aname); free (abs_aname);
fprintf (stderr, fprintf (stderr,
GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); GTXT ("gprofng-archive: Fatal error: unable to allocate memory\n"));
return 1; return 1;
} }
// Check if full name is not too long // Check if full name is not too long
@ -6644,7 +6644,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
long max = pathconf (cad, _PC_PATH_MAX); long max = pathconf (cad, _PC_PATH_MAX);
if ((max < 0) || (len <= 0)) if ((max < 0) || (len <= 0))
{ // unknown error { // unknown error
fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(%s, _PC_PATH_MAX) failed\n"), fprintf (stderr, GTXT ("gprofng-archive: Fatal error: pathconf(%s, _PC_PATH_MAX) failed\n"),
cad); cad);
free (abs_caname); free (abs_caname);
free (cad); free (cad);
@ -6659,7 +6659,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
// Yes, we can do it // Yes, we can do it
abs_caname[max - 1] = 0; abs_caname[max - 1] = 0;
if (!hide_msg) if (!hide_msg)
fprintf (stderr, GTXT ("gp-gp-archive: file path is too long - truncated:%s\n"), fprintf (stderr, GTXT ("gprofng-archive: file path is too long - truncated:%s\n"),
abs_caname); abs_caname);
} }
} }
@ -6669,7 +6669,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
max = pathconf (cad, _PC_NAME_MAX); max = pathconf (cad, _PC_NAME_MAX);
if ((max < 0) || (len <= 0)) if ((max < 0) || (len <= 0))
{ // unknown error { // unknown error
fprintf (stderr, GTXT ("gp-archive: Fatal error: pathconf(%s, _PC_NAME_MAX) failed\n"), fprintf (stderr, GTXT ("gprofng-archive: Fatal error: pathconf(%s, _PC_NAME_MAX) failed\n"),
cad); cad);
free (abs_caname); free (abs_caname);
free (cad); free (cad);
@ -6684,7 +6684,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
// Yes, we can do it // Yes, we can do it
cafname[max - 1] = 0; cafname[max - 1] = 0;
if (!hide_msg) if (!hide_msg)
fprintf (stderr, GTXT ("gp-archive: file name is too long - truncated:%s\n"), fprintf (stderr, GTXT ("gprofng-archive: file name is too long - truncated:%s\n"),
abs_caname); abs_caname);
} }
} }
@ -6699,7 +6699,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
res = copy_file_to_archive (name, t, hide_msg); // hide messages res = copy_file_to_archive (name, t, hide_msg); // hide messages
if (res != 0) if (res != 0)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot copy file %s to temporary file: %s\n"), fprintf (stderr, GTXT ("gprofng-archive: Fatal error: cannot copy file %s to temporary file: %s\n"),
name, t); name, t);
unlink (t); unlink (t);
free (t); free (t);
@ -6722,7 +6722,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
{ {
if (errno != EEXIST) if (errno != EEXIST)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: rename(%s, %s) returned error: %d\n"), fprintf (stderr, GTXT ("gprofng-archive: Fatal error: rename(%s, %s) returned error: %d\n"),
t, abs_caname, res); t, abs_caname, res);
unlink (t); unlink (t);
free (t); free (t);
@ -6746,7 +6746,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
char *rel_caname = dbe_sprintf ("%s/%s", common_archive, cafname); char *rel_caname = dbe_sprintf ("%s/%s", common_archive, cafname);
if (rel_caname == NULL) if (rel_caname == NULL)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); fprintf (stderr, GTXT ("gprofng-archive: Fatal error: unable to allocate memory\n"));
return 1; return 1;
} }
lname = get_relative_link (rel_caname, aname); lname = get_relative_link (rel_caname, aname);
@ -6756,7 +6756,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
{ {
if (abs_aname == NULL) if (abs_aname == NULL)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); fprintf (stderr, GTXT ("gprofng-archive: Fatal error: unable to allocate memory\n"));
return 1; return 1;
} }
lname = get_relative_link (abs_caname, abs_aname); lname = get_relative_link (abs_caname, abs_aname);
@ -6767,7 +6767,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
free (abs_aname); free (abs_aname);
if (lname == NULL) if (lname == NULL)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: unable to allocate memory\n")); fprintf (stderr, GTXT ("gprofng-archive: Fatal error: unable to allocate memory\n"));
return 1; return 1;
} }
// Create symbolic link: aname -> lname // Create symbolic link: aname -> lname
@ -6776,7 +6776,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
res = symlink (lname, aname); res = symlink (lname, aname);
if (res != 0) if (res != 0)
{ {
fprintf (stderr, GTXT ("gp-archive: Fatal error: symlink(%s, %s) returned error: %d (errno=%s)\n"), fprintf (stderr, GTXT ("gprofng-archive: Fatal error: symlink(%s, %s) returned error: %d (errno=%s)\n"),
lname, aname, res, strerror (errno)); lname, aname, res, strerror (errno));
free (abs_caname); free (abs_caname);
free (lname); free (lname);
@ -6788,7 +6788,7 @@ Experiment::copy_file_to_common_archive (const char *name, const char *aname,
} }
else else
{ {
fprintf (stderr, GTXT ("gp-archive: Internal error: file does not exist in common archive: %s\n"), fprintf (stderr, GTXT ("gprofng-archive: Internal error: file does not exist in common archive: %s\n"),
abs_caname); abs_caname);
res = 1; res = 1;
} }
@ -6814,7 +6814,7 @@ Experiment::copy_file (char *name, char *aname, int hide_msg, char *common_archi
common_archive, relative_path)) common_archive, relative_path))
return 0; return 0;
// Error. For now - fatal error. Message is already printed. // Error. For now - fatal error. Message is already printed.
fprintf (stderr, GTXT ("gp-archive: Fatal error: cannot copy file %s to common archive %s\n"), fprintf (stderr, GTXT ("gprofng-archive: Fatal error: cannot copy file %s to common archive %s\n"),
name, common_archive); name, common_archive);
return 1; return 1;
} }

32
gprofng/src/Makefile.am
View File

@ -111,7 +111,7 @@ AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \
-I.. -I$(srcdir) \ -I.. -I$(srcdir) \
-I$(srcdir)/../common \ -I$(srcdir)/../common \
-I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \
-I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) -I../../bfd -I$(srcdir)/../../bfd $(ZLIgp-C)
AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \
$(GPROFNG_NO_SWITCH_CFLAGS) $(GPROFNG_NO_SWITCH_CFLAGS)
AM_CXXFLAGS = $(AM_CFLAGS) AM_CXXFLAGS = $(AM_CFLAGS)
@ -152,25 +152,37 @@ dbedir = $(SYSCONFDIR)
dbe_DATA = $(srcdir)/gprofng.rc dbe_DATA = $(srcdir)/gprofng.rc
bin_PROGRAMS = gp-archive gp-collect-app gprofng gp-display-text gp-display-src bin_PROGRAMS = gprofng-archive gprofng-collect-app gprofng \
gprofng-display-text gprofng-display-src
gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc gprofng_archive_SOURCES = gp-archive.cc ArchiveExp.cc
gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gp_collect_app_SOURCES = gp-collect-app.cc checks.cc envsets.cc count.cc gprofng_collect_app_SOURCES = gp-collect-app.cc checks.cc envsets.cc count.cc
gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gprofng_SOURCES = gprofng.cc gprofng_SOURCES = gprofng.cc
gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gp_display_src_SOURCES = gp-display-src.cc gprofng_display_src_SOURCES = gp-display-src.cc
gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gp_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc gprofng_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc
gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
# Distribution involves building the binaries to generate the manpage, # Distribution involves building the binaries to generate the manpage,
# so ensure that the necessary libraries are built at dist time. # so ensure that the necessary libraries are built at dist time.
dist-hook: $(LIBGPROFNG) dist-hook: $(LIBGPROFNG)
$(srcdir)/DbeSession.cc: QLParser.tab.hh $(srcdir)/DbeSession.cc: QLParser.tab.hh
.PHONY: install-exec-local
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(bindir)
rm -f $(DESTDIR)$(bindir)/gp-{archive,collect-app,display-html,display-src,display-text}
ln -s gprofng-archive $(DESTDIR)$(bindir)/gp-archive
ln -s gprofng-collect-app $(DESTDIR)$(bindir)/gp-collect-app
ln -s gprofng-display-html $(DESTDIR)$(bindir)/gp-display-html
ln -s gprofng-display-src $(DESTDIR)$(bindir)/gp-display-src
ln -s gprofng-display-text $(DESTDIR)$(bindir)/gp-display-text

135
gprofng/src/Makefile.in
View File

@ -108,9 +108,9 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
bin_PROGRAMS = gp-archive$(EXEEXT) gp-collect-app$(EXEEXT) \ bin_PROGRAMS = gprofng-archive$(EXEEXT) gprofng-collect-app$(EXEEXT) \
gprofng$(EXEEXT) gp-display-text$(EXEEXT) \ gprofng$(EXEEXT) gprofng-display-text$(EXEEXT) \
gp-display-src$(EXEEXT) gprofng-display-src$(EXEEXT)
subdir = src subdir = src
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \ am__aclocal_m4_deps = $(top_srcdir)/../libtool.m4 \
@ -190,28 +190,28 @@ libgprofng_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \
$(AM_CXXFLAGS) $(CXXFLAGS) $(libgprofng_la_LDFLAGS) $(LDFLAGS) \ $(AM_CXXFLAGS) $(CXXFLAGS) $(libgprofng_la_LDFLAGS) $(LDFLAGS) \
-o $@ -o $@
PROGRAMS = $(bin_PROGRAMS) PROGRAMS = $(bin_PROGRAMS)
am_gp_archive_OBJECTS = gp-archive.$(OBJEXT) ArchiveExp.$(OBJEXT)
gp_archive_OBJECTS = $(am_gp_archive_OBJECTS)
gp_archive_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_gp_collect_app_OBJECTS = gp-collect-app.$(OBJEXT) checks.$(OBJEXT) \
envsets.$(OBJEXT) count.$(OBJEXT)
gp_collect_app_OBJECTS = $(am_gp_collect_app_OBJECTS)
gp_collect_app_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_gp_display_src_OBJECTS = gp-display-src.$(OBJEXT)
gp_display_src_OBJECTS = $(am_gp_display_src_OBJECTS)
gp_display_src_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_gp_display_text_OBJECTS = gp-display-text.$(OBJEXT) ipc.$(OBJEXT) \
ipcio.$(OBJEXT)
gp_display_text_OBJECTS = $(am_gp_display_text_OBJECTS)
gp_display_text_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_gprofng_OBJECTS = gprofng.$(OBJEXT) am_gprofng_OBJECTS = gprofng.$(OBJEXT)
gprofng_OBJECTS = $(am_gprofng_OBJECTS) gprofng_OBJECTS = $(am_gprofng_OBJECTS)
gprofng_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \ gprofng_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
am_gprofng_archive_OBJECTS = gp-archive.$(OBJEXT) ArchiveExp.$(OBJEXT)
gprofng_archive_OBJECTS = $(am_gprofng_archive_OBJECTS)
gprofng_archive_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_gprofng_collect_app_OBJECTS = gp-collect-app.$(OBJEXT) \
checks.$(OBJEXT) envsets.$(OBJEXT) count.$(OBJEXT)
gprofng_collect_app_OBJECTS = $(am_gprofng_collect_app_OBJECTS)
gprofng_collect_app_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_gprofng_display_src_OBJECTS = gp-display-src.$(OBJEXT)
gprofng_display_src_OBJECTS = $(am_gprofng_display_src_OBJECTS)
gprofng_display_src_DEPENDENCIES = $(LIBGPROFNG) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_gprofng_display_text_OBJECTS = gp-display-text.$(OBJEXT) \
ipc.$(OBJEXT) ipcio.$(OBJEXT)
gprofng_display_text_OBJECTS = $(am_gprofng_display_text_OBJECTS)
gprofng_display_text_DEPENDENCIES = $(LIBGPROFNG) \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
AM_V_P = $(am__v_P_@AM_V@) AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
am__v_P_0 = false am__v_P_0 = false
@ -264,12 +264,12 @@ AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@) am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
am__v_CXXLD_0 = @echo " CXXLD " $@; am__v_CXXLD_0 = @echo " CXXLD " $@;
am__v_CXXLD_1 = am__v_CXXLD_1 =
SOURCES = $(libgprofng_la_SOURCES) $(gp_archive_SOURCES) \ SOURCES = $(libgprofng_la_SOURCES) $(gprofng_SOURCES) \
$(gp_collect_app_SOURCES) $(gp_display_src_SOURCES) \ $(gprofng_archive_SOURCES) $(gprofng_collect_app_SOURCES) \
$(gp_display_text_SOURCES) $(gprofng_SOURCES) $(gprofng_display_src_SOURCES) $(gprofng_display_text_SOURCES)
DIST_SOURCES = $(libgprofng_la_SOURCES) $(gp_archive_SOURCES) \ DIST_SOURCES = $(libgprofng_la_SOURCES) $(gprofng_SOURCES) \
$(gp_collect_app_SOURCES) $(gp_display_src_SOURCES) \ $(gprofng_archive_SOURCES) $(gprofng_collect_app_SOURCES) \
$(gp_display_text_SOURCES) $(gprofng_SOURCES) $(gprofng_display_src_SOURCES) $(gprofng_display_text_SOURCES)
am__can_run_installinfo = \ am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \ case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \ n|no|NO) false;; \
@ -536,7 +536,7 @@ AM_CPPFLAGS = $(GPROFNG_CPPFLAGS) -DLOCALEDIR=\"$(LOCALEDIR)\" \
-I.. -I$(srcdir) \ -I.. -I$(srcdir) \
-I$(srcdir)/../common \ -I$(srcdir)/../common \
-I$(srcdir)/../../include -I$(srcdir)/../../opcodes \ -I$(srcdir)/../../include -I$(srcdir)/../../opcodes \
-I../../bfd -I$(srcdir)/../../bfd $(ZLIBINC) -I../../bfd -I$(srcdir)/../../bfd $(ZLIgp-C)
AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \ AM_CFLAGS = $(GPROFNG_CFLAGS) $(PTHREAD_CFLAGS) \
$(GPROFNG_NO_SWITCH_CFLAGS) $(GPROFNG_NO_SWITCH_CFLAGS)
@ -558,16 +558,16 @@ libgprofng_la_LIBADD = $(top_builddir)/../opcodes/libopcodes.la \
dbedir = $(SYSCONFDIR) dbedir = $(SYSCONFDIR)
dbe_DATA = $(srcdir)/gprofng.rc dbe_DATA = $(srcdir)/gprofng.rc
gp_archive_SOURCES = gp-archive.cc ArchiveExp.cc gprofng_archive_SOURCES = gp-archive.cc ArchiveExp.cc
gp_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_archive_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gp_collect_app_SOURCES = gp-collect-app.cc checks.cc envsets.cc count.cc gprofng_collect_app_SOURCES = gp-collect-app.cc checks.cc envsets.cc count.cc
gp_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_collect_app_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gprofng_SOURCES = gprofng.cc gprofng_SOURCES = gprofng.cc
gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gp_display_src_SOURCES = gp-display-src.cc gprofng_display_src_SOURCES = gp-display-src.cc
gp_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_display_src_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
gp_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc gprofng_display_text_SOURCES = gp-display-text.cc ipc.cc ipcio.cc
gp_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB) gprofng_display_text_LDADD = $(LIBGPROFNG) $(CLOCK_GETTIME_LINK) $(ZLIB)
all: $(BUILT_SOURCES) all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am $(MAKE) $(AM_MAKEFLAGS) all-am
@ -690,26 +690,26 @@ clean-binPROGRAMS:
echo " rm -f" $$list; \ echo " rm -f" $$list; \
rm -f $$list rm -f $$list
gp-archive$(EXEEXT): $(gp_archive_OBJECTS) $(gp_archive_DEPENDENCIES) $(EXTRA_gp_archive_DEPENDENCIES)
@rm -f gp-archive$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gp_archive_OBJECTS) $(gp_archive_LDADD) $(LIBS)
gp-collect-app$(EXEEXT): $(gp_collect_app_OBJECTS) $(gp_collect_app_DEPENDENCIES) $(EXTRA_gp_collect_app_DEPENDENCIES)
@rm -f gp-collect-app$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gp_collect_app_OBJECTS) $(gp_collect_app_LDADD) $(LIBS)
gp-display-src$(EXEEXT): $(gp_display_src_OBJECTS) $(gp_display_src_DEPENDENCIES) $(EXTRA_gp_display_src_DEPENDENCIES)
@rm -f gp-display-src$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gp_display_src_OBJECTS) $(gp_display_src_LDADD) $(LIBS)
gp-display-text$(EXEEXT): $(gp_display_text_OBJECTS) $(gp_display_text_DEPENDENCIES) $(EXTRA_gp_display_text_DEPENDENCIES)
@rm -f gp-display-text$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gp_display_text_OBJECTS) $(gp_display_text_LDADD) $(LIBS)
gprofng$(EXEEXT): $(gprofng_OBJECTS) $(gprofng_DEPENDENCIES) $(EXTRA_gprofng_DEPENDENCIES) gprofng$(EXEEXT): $(gprofng_OBJECTS) $(gprofng_DEPENDENCIES) $(EXTRA_gprofng_DEPENDENCIES)
@rm -f gprofng$(EXEEXT) @rm -f gprofng$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gprofng_OBJECTS) $(gprofng_LDADD) $(LIBS) $(AM_V_CXXLD)$(CXXLINK) $(gprofng_OBJECTS) $(gprofng_LDADD) $(LIBS)
gprofng-archive$(EXEEXT): $(gprofng_archive_OBJECTS) $(gprofng_archive_DEPENDENCIES) $(EXTRA_gprofng_archive_DEPENDENCIES)
@rm -f gprofng-archive$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gprofng_archive_OBJECTS) $(gprofng_archive_LDADD) $(LIBS)
gprofng-collect-app$(EXEEXT): $(gprofng_collect_app_OBJECTS) $(gprofng_collect_app_DEPENDENCIES) $(EXTRA_gprofng_collect_app_DEPENDENCIES)
@rm -f gprofng-collect-app$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gprofng_collect_app_OBJECTS) $(gprofng_collect_app_LDADD) $(LIBS)
gprofng-display-src$(EXEEXT): $(gprofng_display_src_OBJECTS) $(gprofng_display_src_DEPENDENCIES) $(EXTRA_gprofng_display_src_DEPENDENCIES)
@rm -f gprofng-display-src$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gprofng_display_src_OBJECTS) $(gprofng_display_src_LDADD) $(LIBS)
gprofng-display-text$(EXEEXT): $(gprofng_display_text_OBJECTS) $(gprofng_display_text_DEPENDENCIES) $(EXTRA_gprofng_display_text_DEPENDENCIES)
@rm -f gprofng-display-text$(EXEEXT)
$(AM_V_CXXLD)$(CXXLINK) $(gprofng_display_text_OBJECTS) $(gprofng_display_text_LDADD) $(LIBS)
mostlyclean-compile: mostlyclean-compile:
-rm -f *.$(OBJEXT) -rm -f *.$(OBJEXT)
@ -1027,7 +1027,8 @@ install-dvi: install-dvi-am
install-dvi-am: install-dvi-am:
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES install-exec-am: install-binPROGRAMS install-exec-local \
install-libLTLIBRARIES
install-html: install-html-am install-html: install-html-am
@ -1079,15 +1080,15 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dbeDATA \
distclean-tags distdir dvi dvi-am html html-am info info-am \ distclean-tags distdir dvi dvi-am html html-am info info-am \
install install-am install-binPROGRAMS install-data \ install install-am install-binPROGRAMS install-data \
install-data-am install-dbeDATA install-dvi install-dvi-am \ install-data-am install-dbeDATA install-dvi install-dvi-am \
install-exec install-exec-am install-html install-html-am \ install-exec install-exec-am install-exec-local install-html \
install-info install-info-am install-libLTLIBRARIES \ install-html-am install-info install-info-am \
install-man install-pdf install-pdf-am install-ps \ install-libLTLIBRARIES install-man install-pdf install-pdf-am \
install-ps-am install-strip installcheck installcheck-am \ install-ps install-ps-am install-strip installcheck \
installdirs maintainer-clean maintainer-clean-generic \ installcheck-am installdirs maintainer-clean \
mostlyclean mostlyclean-compile mostlyclean-generic \ maintainer-clean-generic mostlyclean mostlyclean-compile \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
uninstall-am uninstall-binPROGRAMS uninstall-dbeDATA \ tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-libLTLIBRARIES uninstall-dbeDATA uninstall-libLTLIBRARIES
.PRECIOUS: Makefile .PRECIOUS: Makefile
@ -1115,6 +1116,16 @@ dist-hook: $(LIBGPROFNG)
$(srcdir)/DbeSession.cc: QLParser.tab.hh $(srcdir)/DbeSession.cc: QLParser.tab.hh
.PHONY: install-exec-local
install-exec-local:
$(mkinstalldirs) $(DESTDIR)$(bindir)
rm -f $(DESTDIR)$(bindir)/gp-{archive,collect-app,display-html,display-src,display-text}
ln -s gprofng-archive $(DESTDIR)$(bindir)/gp-archive
ln -s gprofng-collect-app $(DESTDIR)$(bindir)/gp-collect-app
ln -s gprofng-display-html $(DESTDIR)$(bindir)/gp-display-html
ln -s gprofng-display-src $(DESTDIR)$(bindir)/gp-display-src
ln -s gprofng-display-text $(DESTDIR)$(bindir)/gp-display-text
# Tell versions [3.59,3.63) of GNU make to not export all variables. # Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded. # Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: .NOEXPORT:

11
gprofng/src/gp-archive.cc
View File

@ -139,11 +139,8 @@ er_archive::usage ()
"\n" "\n"
"See also:\n" "See also:\n"
"\n" "\n"
"gprofng(1), gp-collect-app(1), gp-display-html(1), gp-display-src(1), gp-display-text(1)\n")); "gprofng(1), gprofng-collect-app(1), gprofng-display-html(1), "
// Ruud "gprofng-display-src(1), gprofng-display-text(1)\n"));
/*
fprintf (stderr, GTXT ("GNU %s version %s\n"), get_basename (prog_name), VERSION);
*/
exit (1); exit (1);
} }
@ -617,11 +614,7 @@ er_archive::check_args (int argc, char *argv[])
break; break;
} }
case 'V': case 'V':
// Ruud
Application::print_version_info (); Application::print_version_info ();
/*
printf (GTXT ("GNU %s version %s\n"), get_basename (prog_name), VERSION);
*/
exit (0); exit (0);
case 'w': case 'w':
whoami = optarg; whoami = optarg;

18
gprofng/src/gp-collect-app.cc
View File

@ -1231,12 +1231,7 @@ collect::do_flag (const char *flags)
disabled = 1; disabled = 1;
if (verbose != 1) if (verbose != 1)
{ {
// Ruud
Application::print_version_info (); Application::print_version_info ();
/*
dbe_write (2, NTXT ("GNU %s version %s\n"),
get_basename (prog_name), VERSION);
*/
verbose = 1; verbose = 1;
} }
break; break;
@ -1251,22 +1246,12 @@ collect::do_flag (const char *flags)
case 'v': case 'v':
if (verbose != 1) if (verbose != 1)
{ {
// Ruud
Application::print_version_info (); Application::print_version_info ();
/*
dbe_write (2, NTXT ("GNU %s version %s\n"),
get_basename (prog_name), VERSION);
*/
verbose = 1; verbose = 1;
} }
break; break;
case 'V': case 'V':
// Ruud
Application::print_version_info (); Application::print_version_info ();
/*
dbe_write (2, NTXT ("GNU %s version %s\n"),
get_basename (prog_name), VERSION);
*/
/* no further processing.... */ /* no further processing.... */
exit (0); exit (0);
} }
@ -1495,7 +1480,8 @@ collect::usage ()
"\n" "\n"
"See also:\n" "See also:\n"
"\n" "\n"
"gprofng(1), gp-archive(1), gp-display-html(1), gp-display-src(1), gp-display-text(1)\n")); "gprofng(1), gprofng-archive(1), gprofng-display-html(1), "
"gpgprofng-display-src(1), gprofng-display-text(1)\n"));
} }
void void

7
gprofng/src/gp-display-src.cc
View File

@ -171,7 +171,8 @@ er_src::usage ()
"\n" "\n"
"See also:\n" "See also:\n"
"\n" "\n"
"gprofng(1), gp-archive(1), gp-collect-app(1), gp-display-html(1), gp-display-text(1)\n")); "gprofng(1), gprofng-archive(1), gprofng-collect-app(1), "
"gprofng-display-html(1), gprofng-display-text(1)\n"));
/* /*
printf (GTXT ("Usage: %s [OPTION] a.out/.so/.o/.class\n\n"), whoami); printf (GTXT ("Usage: %s [OPTION] a.out/.so/.o/.class\n\n"), whoami);
printf (GTXT (" -func List all the functions from the given object\n" printf (GTXT (" -func List all the functions from the given object\n"
@ -312,11 +313,7 @@ er_src::proc_cmd (CmdType cmd_type, bool first, char *arg1,
break; break;
case VERSION_cmd: case VERSION_cmd:
if (out_file != stdout) if (out_file != stdout)
// Ruud
Application::print_version_info (); Application::print_version_info ();
/*
fprintf (out_file, "GNU %s version %s\n", get_basename (prog_name), VERSION);
*/
break; break;
default: default:
fprintf (stderr, GTXT ("Invalid option")); fprintf (stderr, GTXT ("Invalid option"));

3
gprofng/src/gp-display-text.cc
View File

@ -253,7 +253,8 @@ er_print::usage ()
"\n" "\n"
"See also:\n" "See also:\n"
"\n" "\n"
"gprofng(1), gp-archive(1), gp-collect-app(1), gp-display-html(1), gp-display-src(1)\n")); "gprofng(1), gprofng-archive(1), gprofng-collect-app(1), "
"gprofng-display-html(1), gprofng-display-src(1)\n"));
} }
int // returns count of experiments read int // returns count of experiments read

33
gprofng/src/gprofng.cc
View File

@ -94,7 +94,7 @@ Gprofng::usage ()
"\n" "\n"
"The man pages for the commands below can be viewed using the command name with\n" "The man pages for the commands below can be viewed using the command name with\n"
"\"gprofng\" replaced by \"gp\" and the spaces replaced by a dash (\"-\"). For\n" "\"gprofng\" replaced by \"gp\" and the spaces replaced by a dash (\"-\"). For\n"
"example the man page name for \"gprofng collect app\" is \"gp-collect-app\".\n" "example the man page name for \"gprofng collect app\" is \"gprofng-collect-app\".\n"
"\n" "\n"
"The following combination of commands and keywords are supported:\n" "The following combination of commands and keywords are supported:\n"
"\n" "\n"
@ -154,7 +154,8 @@ Gprofng::usage ()
"\n" "\n"
"See also:\n" "See also:\n"
"\n" "\n"
"gp-archive(1), gp-collect-app(1), gp-display-html(1), gp-display-src(1), gp-display-text(1)\n")); "gprofng-archive(1), gprofng-collect-app(1), gprofng-display-html(1), "
"gprofng-display-src(1), gprofng-display-text(1)\n"));
/* /*
printf ( GTXT ( printf ( GTXT (
@ -181,13 +182,13 @@ Gprofng::exec_cmd (char *tool_name, int argc, char **argv)
const char *keyword; const char *keyword;
const char *app_name; const char *app_name;
} app_names [] = { } app_names [] = {
{ "archive", NULL, "gp-archive"}, { "archive", NULL, "gprofng-archive"},
{ "collect", "app", "gp-collect-app"}, { "collect", "app", "gprofng-collect-app"},
{ "collect", "kernel", "gp-collect-kernel"}, { "collect", "kernel", "gprofng-collect-kernel"},
{ "display", "text", "gp-display-text"}, { "display", "text", "gprofng-display-text"},
{ "display", "gui", "gp-display-gui"}, { "display", "gui", "gprofng-display-gui"},
{ "display", "html", "gp-display-html"}, { "display", "html", "gprofng-display-html"},
{ "display", "src", "gp-display-src"}, { "display", "src", "gprofng-display-src"},
{ NULL, NULL} { NULL, NULL}
}; };
@ -239,7 +240,7 @@ Gprofng::exec_cmd (char *tool_name, int argc, char **argv)
app_names[first].keyword); app_names[first].keyword);
else else
arr[n++] = dbe_sprintf ("--whoami=%s %s", whoami, tool_name); arr[n++] = dbe_sprintf ("--whoami=%s %s", whoami, tool_name);
if (strcmp (aname, "gp-display-gui") == 0) if (strcmp (aname, "gprofng-display-gui") == 0)
{ {
if (access (exe_name, X_OK | F_OK) != 0) if (access (exe_name, X_OK | F_OK) != 0)
{ // gprofng GUI can be installed to the other directory. { // gprofng GUI can be installed to the other directory.
@ -247,6 +248,18 @@ Gprofng::exec_cmd (char *tool_name, int argc, char **argv)
printf ("gprofng: Cannot find '%s'\n", exe_name); printf ("gprofng: Cannot find '%s'\n", exe_name);
free (exe_name); free (exe_name);
exe_name = get_realpath (aname); // Use $PATH to find gprofng GUI exe_name = get_realpath (aname); // Use $PATH to find gprofng GUI
if (*exe_name != '/')
{ // New gprofng-gui is not installed. Try to find the old one.
char *nm = get_realpath ("gp-display-gui");
if (*nm == '/')
{
if (verbose)
printf ("gprofng: New gprofng GUI is not installed.\n"
"Use the old one '%s'\n", nm);
free (exe_name);
exe_name = nm;
}
}
} }
arr[n++] = dbe_sprintf ("--gprofngdir=%.*s", arr[n++] = dbe_sprintf ("--gprofngdir=%.*s",
(int) (get_basename (pname) - pname), pname); (int) (get_basename (pname) - pname), pname);