|
From: <sv...@va...> - 2006-10-01 17:12:56
|
Author: sewardj
Date: 2006-10-01 18:12:50 +0100 (Sun, 01 Oct 2006)
New Revision: 6115
Log:
Track changes of type SysRes; also renaming wibble.
Modified:
branches/AIX5/callgrind/command.c
branches/AIX5/callgrind/dump.c
branches/AIX5/callgrind/global.h
branches/AIX5/callgrind/main.c
branches/AIX5/callgrind/sim.c
Modified: branches/AIX5/callgrind/command.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/callgrind/command.c 2006-10-01 17:11:17 UTC (rev 6114)
+++ branches/AIX5/callgrind/command.c 2006-10-01 17:12:50 UTC (rev 6115)
@@ -108,7 +108,7 @@
}
}
if (!res.isError)
- fd =3D (Int) res.val;
+ fd =3D (Int) res.res;
if (fd>=3D0) {
Char buf[512];
Int i;
@@ -176,7 +176,7 @@
* to not confuse it with our special value -2
*/
if (res.isError) fd =3D -1;
- else fd =3D (Int) res.val;
+ else fd =3D (Int) res.res;
=20
return fd;
}
@@ -366,7 +366,7 @@
=20
res =3D VG_(open)(current_command_file, VKI_O_RDONLY,0);
if (!res.isError) {
- fd =3D (Int) res.val;
+ fd =3D (Int) res.res;
bytesRead =3D VG_(read)(fd,cmdBuffer,500);
cmdBuffer[500] =3D 0; /* no command overrun please */
VG_(close)(fd);
Modified: branches/AIX5/callgrind/dump.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/callgrind/dump.c 2006-10-01 17:11:17 UTC (rev 6114)
+++ branches/AIX5/callgrind/dump.c 2006-10-01 17:12:50 UTC (rev 6115)
@@ -1293,7 +1293,7 @@
file_err();
}
}
- fd =3D (Int) res.val;
+ fd =3D (Int) res.res;
=20
CLG_DEBUG(2, " new_dumpfile '%s'\n", filename);
=20
@@ -1551,7 +1551,7 @@
=20
p++;
}
- =20
+
close_dumpfile(print_buf, print_fd, CLG_(current_tid));
if (array) VG_(free)(array);
=20
@@ -1602,7 +1602,6 @@
=20
print_bbccs(trigger, only_current_thread);
=20
-
bbs_done =3D CLG_(stat).bb_executions++;
=20
if (VG_(clo_verbosity) > 1)
@@ -1707,7 +1706,7 @@
file_err();=20
}
}
- if (!res.isError) VG_(close)( (Int)res.val );
+ if (!res.isError) VG_(close)( (Int)res.res );
=20
*dir =3D base_directory;
*file =3D filename;
Modified: branches/AIX5/callgrind/global.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/callgrind/global.h 2006-10-01 17:11:17 UTC (rev 6114)
+++ branches/AIX5/callgrind/global.h 2006-10-01 17:12:50 UTC (rev 6115)
@@ -8,6 +8,7 @@
#define CLG_GLOBAL
=20
#include "pub_tool_basics.h"
+#include "pub_tool_vki.h"
#include "pub_tool_debuginfo.h"
#include "pub_tool_libcbase.h"
#include "pub_tool_libcassert.h"
Modified: branches/AIX5/callgrind/main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/callgrind/main.c 2006-10-01 17:11:17 UTC (rev 6114)
+++ branches/AIX5/callgrind/main.c 2006-10-01 17:12:50 UTC (rev 6115)
@@ -924,11 +924,11 @@
/* pop all remaining items from CallStack for correct sum
*/
CLG_(forall_threads)(unwind_thread);
- =20
+
CLG_(dump_profile)(0, False);
- =20
+
CLG_(finish_command)();
- =20
+
if (VG_(clo_verbosity) =3D=3D 0) return;
=20
/* Hash table stats */
Modified: branches/AIX5/callgrind/sim.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/AIX5/callgrind/sim.c 2006-10-01 17:11:17 UTC (rev 6114)
+++ branches/AIX5/callgrind/sim.c 2006-10-01 17:12:50 UTC (rev 6115)
@@ -1637,7 +1637,7 @@
return;
=20
bad:
- VG_(bad_option)(orig_opt);
+ VG_(err_bad_option)(orig_opt);
}
=20
/* Check for command line option for cache configuration.
|