diff options
author | Dave Brolley <brolley@redhat.com> | 2009-05-05 14:01:51 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-05-05 14:01:51 -0400 |
commit | f80f9e60d170329f4c3210d28914daa732ce0a48 (patch) | |
tree | bf7c5142c22a35aa8b56adfcd4812873a0b2efca /testsuite/systemtap.syscall/alarm.c | |
parent | b03d329d5ad9d22d684b61859971a7b12b5e5104 (diff) | |
parent | 7c4e9d57761b10058d36756df3b39039e292812d (diff) | |
download | systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.tar.gz systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.tar.xz systemtap-steved-f80f9e60d170329f4c3210d28914daa732ce0a48.zip |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts:
modsign.cxx
runtime/staprun/modverify.c
runtime/staprun/staprun_funcs.c
stap-authorize-server-cert
stap-authorize-signing-cert
stap-serverd
systemtap.spec
Diffstat (limited to 'testsuite/systemtap.syscall/alarm.c')
-rw-r--r--[-rwxr-xr-x] | testsuite/systemtap.syscall/alarm.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/testsuite/systemtap.syscall/alarm.c b/testsuite/systemtap.syscall/alarm.c index 7cb17164..6f1bedce 100755..100644 --- a/testsuite/systemtap.syscall/alarm.c +++ b/testsuite/systemtap.syscall/alarm.c @@ -20,36 +20,36 @@ int main() alarm(1); #ifdef __ia64__ - // setitimer (ITIMER_REAL, \[0.000000,1.000000\], XXXX) = 0 + //staptest// setitimer (ITIMER_REAL, \[0.000000,1.000000\], XXXX) = 0 #else - // alarm (1) = 0 + //staptest// alarm (1) = 0 #endif pause(); #ifdef __ia64__ - // rt_sigsuspend () = + //staptest// rt_sigsuspend () = #else - // pause () = + //staptest// pause () = #endif alarm(0); #ifdef __ia64__ - // setitimer (ITIMER_REAL, \[0.000000,0.000000\], XXXX) = 0 + //staptest// setitimer (ITIMER_REAL, \[0.000000,0.000000\], XXXX) = 0 #else - // alarm (0) = 0 + //staptest// alarm (0) = 0 #endif sleep(1); - // nanosleep (\[1.000000000\], XXXX) = 0 + //staptest// nanosleep (\[1.000000000\], XXXX) = 0 usleep(1234); - // nanosleep (\[0.001234000\], 0x[0]+) = 0 + //staptest// nanosleep (\[0.001234000\], 0x[0]+) = 0 nanosleep(&t, &rem); - // nanosleep (\[0.000000789\], XXXX) = 0 + //staptest// nanosleep (\[0.000000789\], XXXX) = 0 nanosleep(&t, NULL); - // nanosleep (\[0.000000789\], 0x[0]+) = 0 + //staptest// nanosleep (\[0.000000789\], 0x[0]+) = 0 return 0; } |