Author: tim.bunce
Date: Fri Oct 17 03:42:37 2008
New Revision: 525

Modified:
    trunk/t/test30-fork.0.p
    trunk/t/test30-fork.0.rdt
    trunk/t/test30-fork.0.x
    trunk/t/test30-fork.1.rdt
    trunk/t/test30-fork.1.x

Log:
Simplify the fork test code.


Modified: trunk/t/test30-fork.0.p
==============================================================================
--- trunk/t/test30-fork.0.p     (original)
+++ trunk/t/test30-fork.0.p     Fri Oct 17 03:42:37 2008
@@ -1,26 +1,22 @@
-sub foo {
-  print "in sub foo\n";
-  bar();
+sub prefork {
+  print "in sub prefork\n";
+  other();
  }

-sub bar {
-  print "in sub bar\n";
+sub other {
+  print "in sub other\n";
  }

-sub baz {
-  print "in sub baz\n";
-  bar();
-  bar();
-  bar();
-  foo();
+sub postfork {
+  print "in sub postfork\n";
+  other();
  }

-bar();
+prefork();

  fork;

-bar();
-baz();
-foo();
+postfork();
+other();

  wait;

Modified: trunk/t/test30-fork.0.rdt
==============================================================================
--- trunk/t/test30-fork.0.rdt   (original)
+++ trunk/t/test30-fork.0.rdt   Fri Oct 17 03:42:37 2008
@@ -5,51 +5,41 @@
  attribute     perl_version    0
  attribute     ticks_per_sec   0
  attribute     xs_version      0
-fid_block_time 1       2       [ 0 4 ]
-fid_block_time 1       7       [ 0 7 ]
-fid_block_time 1       11      [ 0 5 ]
-fid_block_time 1       18      [ 0 1 ]
+fid_block_time 1       2       [ 0 2 ]
+fid_block_time 1       7       [ 0 3 ]
+fid_block_time 1       11      [ 0 2 ]
+fid_block_time 1       15      [ 0 1 ]
+fid_block_time 1       17      [ 0 1 ]
+fid_block_time 1       19      [ 0 1 ]
  fid_block_time        1       20      [ 0 1 ]
  fid_block_time        1       22      [ 0 1 ]
-fid_block_time 1       23      [ 0 1 ]
-fid_block_time 1       24      [ 0 1 ]
-fid_block_time 1       26      [ 0 1 ]
  fid_fileinfo  1       [ /.../test30-fork.0.p   1 2 0 0 ]
-fid_line_time  1       2       [ 0 2 ]
-fid_line_time  1       3       [ 0 2 ]
-fid_line_time  1       7       [ 0 7 ]
+fid_line_time  1       2       [ 0 1 ]
+fid_line_time  1       3       [ 0 1 ]
+fid_line_time  1       7       [ 0 3 ]
  fid_line_time 1       11      [ 0 1 ]
  fid_line_time 1       12      [ 0 1 ]
-fid_line_time  1       13      [ 0 1 ]
-fid_line_time  1       14      [ 0 1 ]
  fid_line_time 1       15      [ 0 1 ]
-fid_line_time  1       18      [ 0 1 ]
+fid_line_time  1       17      [ 0 1 ]
+fid_line_time  1       19      [ 0 1 ]
  fid_line_time 1       20      [ 0 1 ]
  fid_line_time 1       22      [ 0 1 ]
-fid_line_time  1       23      [ 0 1 ]
-fid_line_time  1       24      [ 0 1 ]
-fid_line_time  1       26      [ 0 1 ]
-fid_sub_time   1       2       [ 0 4 ]
-fid_sub_time   1       7       [ 0 7 ]
-fid_sub_time   1       11      [ 0 5 ]
-fid_sub_time   1       18      [ 0 1 ]
+fid_sub_time   1       2       [ 0 2 ]
+fid_sub_time   1       7       [ 0 3 ]
+fid_sub_time   1       11      [ 0 2 ]
+fid_sub_time   1       15      [ 0 1 ]
+fid_sub_time   1       17      [ 0 1 ]
+fid_sub_time   1       19      [ 0 1 ]
  fid_sub_time  1       20      [ 0 1 ]
  fid_sub_time  1       22      [ 0 1 ]
-fid_sub_time   1       23      [ 0 1 ]
-fid_sub_time   1       24      [ 0 1 ]
-fid_sub_time   1       26      [ 0 1 ]
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
-sub_caller     main::bar       1       12      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       13      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       14      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       18      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       22      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       3       [ 2 0 0 0 0 0 0 ]
-sub_caller     main::baz       1       23      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::foo       1       15      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::foo       1       24      [ 1 0 0 0 0 0 0 ]
-sub_subinfo    main::bar       [ 1 6 8 7 0 0 0 0 ]
-sub_subinfo    main::baz       [ 1 10 16 1 0 0 0 0 ]
-sub_subinfo    main::foo       [ 1 1 4 2 0 0 0 0 ]
+sub_caller     main::other     1       12      [ 1 0 0 0 0 0 0 ]
+sub_caller     main::other     1       20      [ 1 0 0 0 0 0 0 ]
+sub_caller     main::other     1       3       [ 1 0 0 0 0 0 0 ]
+sub_caller     main::postfork  1       19      [ 1 0 0 0 0 0 0 ]
+sub_caller     main::prefork   1       15      [ 1 0 0 0 0 0 0 ]
+sub_subinfo    main::other     [ 1 6 8 3 0 0 0 0 ]
+sub_subinfo    main::postfork  [ 1 10 13 1 0 0 0 0 ]
+sub_subinfo    main::prefork   [ 1 1 4 1 0 0 0 0 ]

Modified: trunk/t/test30-fork.0.x
==============================================================================
--- trunk/t/test30-fork.0.x     (original)
+++ trunk/t/test30-fork.0.x     Fri Oct 17 03:42:37 2008
@@ -1,29 +1,25 @@
  # Profile data generated by Devel::NYTProf::Reader
  # More information at http://search.cpan.org/dist/Devel-NYTProf/
  # Format: time,calls,time/call,code
-0,0,0,sub foo {
-0,2,0,print "in sub foo\n";
-0,2,0,bar();
+0,0,0,sub prefork {
+0,1,0,print "in sub prefork\n";
+0,1,0,other();
  0,0,0,}
  0,0,0,
-0,0,0,sub bar {
-0,7,0,print "in sub bar\n";
+0,0,0,sub other {
+0,3,0,print "in sub other\n";
  0,0,0,}
  0,0,0,
-0,0,0,sub baz {
-0,1,0,print "in sub baz\n";
-0,1,0,bar();
-0,1,0,bar();
-0,1,0,bar();
-0,1,0,foo();
+0,0,0,sub postfork {
+0,1,0,print "in sub postfork\n";
+0,1,0,other();
  0,0,0,}
  0,0,0,
-0,1,0,bar();
+0,1,0,prefork();
  0,0,0,
  0,1,0,fork;
  0,0,0,
-0,1,0,bar();
-0,1,0,baz();
-0,1,0,foo();
+0,1,0,postfork();
+0,1,0,other();
  0,0,0,
  0,1,0,wait;

Modified: trunk/t/test30-fork.1.rdt
==============================================================================
--- trunk/t/test30-fork.1.rdt   (original)
+++ trunk/t/test30-fork.1.rdt   Fri Oct 17 03:42:37 2008
@@ -5,47 +5,32 @@
  attribute     perl_version    0
  attribute     ticks_per_sec   0
  attribute     xs_version      0
-fid_block_time 1       2       [ 0 4 ]
-fid_block_time 1       7       [ 0 6 ]
-fid_block_time 1       11      [ 0 5 ]
+fid_block_time 1       7       [ 0 2 ]
+fid_block_time 1       11      [ 0 2 ]
+fid_block_time 1       17      [ 0 1 ]
+fid_block_time 1       19      [ 0 1 ]
  fid_block_time        1       20      [ 0 1 ]
  fid_block_time        1       22      [ 0 1 ]
-fid_block_time 1       23      [ 0 1 ]
-fid_block_time 1       24      [ 0 1 ]
-fid_block_time 1       26      [ 0 1 ]
  fid_fileinfo  1       [ /.../test30-fork.0.p   1 2 0 0 ]
-fid_line_time  1       2       [ 0 2 ]
-fid_line_time  1       3       [ 0 2 ]
-fid_line_time  1       7       [ 0 6 ]
+fid_line_time  1       7       [ 0 2 ]
  fid_line_time 1       11      [ 0 1 ]
  fid_line_time 1       12      [ 0 1 ]
-fid_line_time  1       13      [ 0 1 ]
-fid_line_time  1       14      [ 0 1 ]
-fid_line_time  1       15      [ 0 1 ]
+fid_line_time  1       17      [ 0 1 ]
+fid_line_time  1       19      [ 0 1 ]
  fid_line_time 1       20      [ 0 1 ]
  fid_line_time 1       22      [ 0 1 ]
-fid_line_time  1       23      [ 0 1 ]
-fid_line_time  1       24      [ 0 1 ]
-fid_line_time  1       26      [ 0 1 ]
-fid_sub_time   1       2       [ 0 4 ]
-fid_sub_time   1       7       [ 0 6 ]
-fid_sub_time   1       11      [ 0 5 ]
+fid_sub_time   1       7       [ 0 2 ]
+fid_sub_time   1       11      [ 0 2 ]
+fid_sub_time   1       17      [ 0 1 ]
+fid_sub_time   1       19      [ 0 1 ]
  fid_sub_time  1       20      [ 0 1 ]
  fid_sub_time  1       22      [ 0 1 ]
-fid_sub_time   1       23      [ 0 1 ]
-fid_sub_time   1       24      [ 0 1 ]
-fid_sub_time   1       26      [ 0 1 ]
  profile_modes fid_block_time  block
  profile_modes fid_line_time   line
  profile_modes fid_sub_time    sub
-sub_caller     main::bar       1       12      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       13      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       14      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       22      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::bar       1       3       [ 2 0 0 0 0 0 0 ]
-sub_caller     main::baz       1       23      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::foo       1       15      [ 1 0 0 0 0 0 0 ]
-sub_caller     main::foo       1       24      [ 1 0 0 0 0 0 0 ]
-sub_subinfo    main::bar       [ 1 6 8 6 0 0 0 0 ]
-sub_subinfo    main::baz       [ 1 10 16 1 0 0 0 0 ]
-sub_subinfo    main::foo       [ 1 1 4 2 0 0 0 0 ]
+sub_caller     main::other     1       12      [ 1 0 0 0 0 0 0 ]
+sub_caller     main::other     1       20      [ 1 0 0 0 0 0 0 ]
+sub_caller     main::postfork  1       19      [ 1 0 0 0 0 0 0 ]
+sub_subinfo    main::other     [ 1 6 8 2 0 0 0 0 ]
+sub_subinfo    main::postfork  [ 1 10 13 1 0 0 0 0 ]
+sub_subinfo    main::prefork   [ 1 1 4 0 0 0 0 0 ]

Modified: trunk/t/test30-fork.1.x
==============================================================================
--- trunk/t/test30-fork.1.x     (original)
+++ trunk/t/test30-fork.1.x     Fri Oct 17 03:42:37 2008
@@ -1,29 +1,25 @@
  # Profile data generated by Devel::NYTProf::Reader
  # More information at http://search.cpan.org/dist/Devel-NYTProf/
  # Format: time,calls,time/call,code
-0,0,0,sub foo {
-0,2,0,print "in sub foo\n";
-0,2,0,bar();
+0,0,0,sub prefork {
+0,0,0,print "in sub prefork\n";
+0,0,0,other();
  0,0,0,}
  0,0,0,
-0,0,0,sub bar {
-0,6,0,print "in sub bar\n";
+0,0,0,sub other {
+0,2,0,print "in sub other\n";
  0,0,0,}
  0,0,0,
-0,0,0,sub baz {
-0,1,0,print "in sub baz\n";
-0,1,0,bar();
-0,1,0,bar();
-0,1,0,bar();
-0,1,0,foo();
+0,0,0,sub postfork {
+0,1,0,print "in sub postfork\n";
+0,1,0,other();
  0,0,0,}
  0,0,0,
-0,0,0,bar();
+0,0,0,prefork();
  0,0,0,
  0,1,0,fork;
  0,0,0,
-0,1,0,bar();
-0,1,0,baz();
-0,1,0,foo();
+0,1,0,postfork();
+0,1,0,other();
  0,0,0,
  0,1,0,wait;

--~--~---------~--~----~------------~-------~--~----~
You've received this message because you are subscribed to
the Devel::NYTProf Development User group.

Group hosted at:  http://groups.google.com/group/develnytprof-dev
Project hosted at:  http://perl-devel-nytprof.googlecode.com
CPAN distribution:  http://search.cpan.org/dist/Devel-NYTProf

To post, email:  [email protected]
To unsubscribe, email:  [EMAIL PROTECTED]
-~----------~----~----~----~------~----~------~--~---

Reply via email to