Option --dump-every-bb now takes a 64bit value on user

request. Update/clarify documentation.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5806

diff --git a/callgrind/clo.c b/callgrind/clo.c
index 184fed1068cb016206fadf4f6a254f9b600d4b58..bd6d02a63df2ae8ae2caded3cd66a64fc52118e5 100644 (file)
--- a/callgrind/clo.c
+++ b/callgrind/clo.c
@@ -618,7 +618,7 @@ Bool CLG_(process_cmd_line_option)(Char* arg)
        CLG_(clo).dump_bb = False;
 
    else if (0 == VG_(strncmp)(arg, "--dump-every-bb=", 16))
-        CLG_(clo).dump_every_bb = (Int)VG_(atoll)(&arg[16]);
+        CLG_(clo).dump_every_bb = (ULong)VG_(atoll)(&arg[16]);
 
 
    else if (0 == VG_(strcmp)(arg, "--collect-alloc=yes"))

diff --git a/callgrind/docs/cl-manual.xml b/callgrind/docs/cl-manual.xml
index 6c8797f42272ef724e7a1e8742777d7a4be6d0c8..068dedeba825e89942256ae4be6c49ea7e9a4c84 100644 (file)
--- a/callgrind/docs/cl-manual.xml
+++ b/callgrind/docs/cl-manual.xml
@@ -235,9 +235,7 @@ callgrind.out.<emphasis>pid</emphasis>.<emphasis>part</emphasis>-<emphasis>threa
       <para><command>Periodic dumping after execution of a specified
       number of basic blocks</command>. For this, use the command line
       option <option><xref linkend="opt.dump-every-bb"/>=count</option>.
-      The resultion of the internal basic block counter of Valgrind is
-      only rough, so you should at least specify a interval of 50000
-      basic blocks.</para>
+      </para>
     </listitem>
 
     <listitem>
@@ -539,7 +537,11 @@ be executed. For interactive control use
       <option><![CDATA[--dump-every-bb=<count> [default: 0, never] ]]></option>
     </term>
     <listitem>
-      <para>Dump profile data each &lt;count&gt; basic blocks</para>
+      <para>Dump profile data every &lt;count&gt; basic blocks.
+      Whether a dump is needed is only checked when Valgrinds internal
+      scheduler is run. Therefore, the minimum setting useful is about 100000.
+      The count is a 64-bit value to make long dump periods possible.
+      </para>
     </listitem>
   </varlistentry>
 

diff --git a/callgrind/global.h b/callgrind/global.h
index a1033923d2951714c84ef35378fdd0ab7aaca3b4..abef4c9fce4abeb894ea0ba948182ba7325f45a7 100644 (file)
--- a/callgrind/global.h
+++ b/callgrind/global.h
@@ -70,7 +70,7 @@ struct _CommandLineOptions {
   Bool dump_bbs;         /* Dump basic block information? */
   
   /* Dump generation options */
-  Int dump_every_bb;     /* Dump every xxx BBs. */
+  ULong dump_every_bb;     /* Dump every xxx BBs. */
   
   /* Collection options */
   Bool separate_threads; /* Separate threads in dump? */

diff --git a/callgrind/threads.c b/callgrind/threads.c
index eda9d0c46f753c25f51ca7887564f0d28c6b21d4..9626cd2eb6aaab4e5a47ad837ae6e3a6180e4deb 100644 (file)
--- a/callgrind/threads.c
+++ b/callgrind/threads.c
@@ -182,7 +182,7 @@ void CLG_(run_thread)(ThreadId tid)
 
     if (CLG_(clo).dump_every_bb >0) {
        if (CLG_(stat).bb_executions - bbs_done > CLG_(clo).dump_every_bb) {
-           VG_(sprintf)(buf, "--dump-every-bb=%d", CLG_(clo).dump_every_bb);
+           VG_(sprintf)(buf, "--dump-every-bb=%llu", CLG_(clo).dump_every_bb);
           CLG_(dump_profile)(buf, False);
            bbs_done = CLG_(stat).bb_executions;
        }