This is an archive of the discontinued LLVM Phabricator instance.

Differential D49559

[XRay] Remove scheduling dependency in fork_basic_logging.cc
ClosedPublic

Authored by Maknee on Jul 19 2018, 10:34 AM.

Details

Reviewers
dberris
ormris
Commits
rG1486d5c6e217: Reapply "[XRay] Remove scheduling dependency in fork_basic_logging.cc"
rG3810b23ffa62: [XRay] Remove scheduling dependency in fork_basic_logging.cc
rL337745: Reapply "[XRay] Remove scheduling dependency in fork_basic_logging.cc"
rCRT337745: Reapply "[XRay] Remove scheduling dependency in fork_basic_logging.cc"
rL337724: [XRay] Remove scheduling dependency in fork_basic_logging.cc
rCRT337724: [XRay] Remove scheduling dependency in fork_basic_logging.cc
Summary

Continuation of https://reviews.llvm.org/D49501

Second part of the test has an scheduling order when there shouldn't be.

Diff Detail

Event Timeline

Maknee created this revision.Jul 19 2018, 10:34 AM
ormris added a comment.Jul 19 2018, 11:01 AM

LG on my end. @dberris ?

ormris accepted this revision.Jul 19 2018, 11:03 AM
This revision is now accepted and ready to land.Jul 19 2018, 11:03 AM
dberris accepted this revision.Jul 19 2018, 3:32 PM

LGTM -- Thanks @Maknee!

TWeaver added a subscriber: TWeaver.Jul 23 2018, 3:12 AM
This comment was removed by TWeaver.
Maknee closed this revision.Jul 23 2018, 9:21 AM
Maknee reopened this revision.EditedJul 23 2018, 10:35 AM

@dberris Could you commit this revision? I'm having some trouble trying to commit the revision

Thanks

Never mind. I managed to commit the revision.

This revision is now accepted and ready to land.Jul 23 2018, 10:35 AM
Closed by commit rCRT337724: [XRay] Remove scheduling dependency in fork_basic_logging.cc (authored by Maknee). · Explain WhyJul 23 2018, 11:43 AM
This revision was automatically updated to reflect the committed changes.
Herald added subscribers: Restricted Project, llvm-commits. · View Herald TranscriptJul 23 2018, 11:43 AM
Maknee reopened this revision.Jul 23 2018, 12:44 PM

@ormris
@dberris

It seems like I have committed the changes to the wrong directory accidentally -- making the build bot fail.

Would it be possible to revert the commit?

This revision is now accepted and ready to land.Jul 23 2018, 12:44 PM
Maknee mentioned this in rL337733: Landed XRay patch (D49559) in incorrect directory. Reverting changes. .Jul 23 2018, 1:07 PM
Maknee mentioned this in rCRT337733: Landed XRay patch (D49559) in incorrect directory. Reverting changes. .
Maknee updated this revision to Diff 156864.Jul 23 2018, 1:29 PM

Added back changes (were lost from commit)

Closed by commit rCRT337745: Reapply "[XRay] Remove scheduling dependency in fork_basic_logging.cc" (authored by ormris). · Explain WhyJul 23 2018, 2:22 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
test/
xray/
TestCases/
Posix/
8 lines

Diff 156881

test/xray/TestCases/Posix/fork_basic_logging.cc

Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Linesint main()
return 0; return 0;
} }
// Make sure we know which thread is the parent process // Make sure we know which thread is the parent process
// TRACE-DAG: - { type: 0, func-id: [[LSGT:[0-9]+]], function: {{.*log_syscall_gettid.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS1:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[LSGT:[0-9]+]], function: {{.*log_syscall_gettid.*}}, cpu: {{.*}}, thread: [[THREAD1:[0-9]+]], process: [[PROCESS1:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}} }
// TRACE-DAG: - { type: 0, func-id: [[PPOC:[0-9]+]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-enter, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[PPOC:[0-9]+]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-enter, tsc: {{[0-9]+}} }
// //
// The parent will print its pid first // The parent will print its pid
// TRACE-DAG: - { type: 0, func-id: [[PPTARG:[0-9]+]], function: {{.*print_parent_tid.*}}, args: [ [[THREAD1]] ], cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-enter-arg, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[PPTARG:[0-9]+]], function: {{.*print_parent_tid.*}}, args: [ [[THREAD1]] ], cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-enter-arg, tsc: {{[0-9]+}} }
// TRACE-DAG: - { type: 0, func-id: [[PPTARG]], function: {{.*print_parent_tid.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-exit, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[PPTARG]], function: {{.*print_parent_tid.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-exit, tsc: {{[0-9]+}} }
// //
// TRACE: - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}} } // TRACE-DAG - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD1]], process: [[PROCESS1]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}} }
// TRACE-DAG: - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS2:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD2:[0-9]+]], process: [[PROCESS2:[0-9]+]], kind: function-enter, tsc: {{[0-9]+}} }
// //
// The child will print its pid now // The child will print its pid
// TRACE-DAG: - { type: 0, func-id: [[PCTARG:[0-9]+]], function: {{.*print_child_tid.*}}, args: [ [[THREAD2]] ], cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-enter-arg, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[PCTARG:[0-9]+]], function: {{.*print_child_tid.*}}, args: [ [[THREAD2]] ], cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-enter-arg, tsc: {{[0-9]+}} }
// TRACE-DAG: - { type: 0, func-id: [[PCTARG]], function: {{.*print_child_tid.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-exit, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[PCTARG]], function: {{.*print_child_tid.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-exit, tsc: {{[0-9]+}} }
// //
// TRACE: - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}} } // TRACE-DAG: - { type: 0, func-id: [[PPOC]], function: {{.*print_parent_or_child.*}}, cpu: {{.*}}, thread: [[THREAD2]], process: [[PROCESS2]], kind: function-{{exit|tail-exit}}, tsc: {{[0-9]+}} }