[PATCH v2] examples: Use GLib event loop impl in events.stp

Update the events stap example because the event loop impl is replaced by GLib based event loop impl after commit 55fe8110. Signed-off-by: Han Han <hhan@redhat.com> --- examples/systemtap/events.stp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp index fd4fe4664d..016e2ca048 100644 --- a/examples/systemtap/events.stp +++ b/examples/systemtap/events.stp @@ -89,44 +89,34 @@ probe begin { print_ts("begin"); } -probe libvirt.event_poll.add_handle { +probe libvirt.event_glib.add_handle { print_ts(sprintf("%d + handle %d %d %d", pid(), watch, fd, events)); } -probe libvirt.event_poll.remove_handle { +probe libvirt.event_glib.remove_handle { print_ts(sprintf("%d - handle %d", pid(), watch)); } -probe libvirt.event_poll.update_handle { +probe libvirt.event_glib.update_handle { if (showUpdates) print_ts(sprintf("%d * handle %d %d", pid(), watch, events)); } -probe libvirt.event_poll.purge_handle { - print_ts(sprintf("%d ! handle %d", pid(), watch)); -} -probe libvirt.event_poll.dispatch_handle { +probe libvirt.event_glib.dispatch_handle { if (showDispatch) print_ts(sprintf("%d > handle %d %d", pid(), watch, events)); } -probe libvirt.event_poll.add_timeout { +probe libvirt.event_glib.add_timeout { print_ts(sprintf("%d + timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.remove_timeout { +probe libvirt.event_glib.remove_timeout { print_ts(sprintf("%d - timeout %d", pid(), timer)); } -probe libvirt.event_poll.update_timeout { +probe libvirt.event_glib.update_timeout { if (showUpdates) print_ts(sprintf("%d * timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.purge_timeout { - print_ts(sprintf("%d ! timeout %d", pid(), timer)); -} -probe libvirt.event_poll.dispatch_timeout { +probe libvirt.event_glib.dispatch_timeout { if (showDispatch) print_ts(sprintf("%d > timeout %d", pid(), timer)); } -probe libvirt.event_poll.run { - if (showIter) - print_ts(sprintf("%d ~ %d %d", pid(), nfds, timeout)); -} -- 2.27.0

ping On Sun, Jul 26, 2020 at 7:33 PM Han Han <hhan@redhat.com> wrote:
Update the events stap example because the event loop impl is replaced by GLib based event loop impl after commit 55fe8110.
Signed-off-by: Han Han <hhan@redhat.com> --- examples/systemtap/events.stp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp index fd4fe4664d..016e2ca048 100644 --- a/examples/systemtap/events.stp +++ b/examples/systemtap/events.stp @@ -89,44 +89,34 @@ probe begin { print_ts("begin"); }
-probe libvirt.event_poll.add_handle { +probe libvirt.event_glib.add_handle { print_ts(sprintf("%d + handle %d %d %d", pid(), watch, fd, events)); } -probe libvirt.event_poll.remove_handle { +probe libvirt.event_glib.remove_handle { print_ts(sprintf("%d - handle %d", pid(), watch)); } -probe libvirt.event_poll.update_handle { +probe libvirt.event_glib.update_handle { if (showUpdates) print_ts(sprintf("%d * handle %d %d", pid(), watch, events)); } -probe libvirt.event_poll.purge_handle { - print_ts(sprintf("%d ! handle %d", pid(), watch)); -} -probe libvirt.event_poll.dispatch_handle { +probe libvirt.event_glib.dispatch_handle { if (showDispatch) print_ts(sprintf("%d > handle %d %d", pid(), watch, events)); }
-probe libvirt.event_poll.add_timeout { +probe libvirt.event_glib.add_timeout { print_ts(sprintf("%d + timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.remove_timeout { +probe libvirt.event_glib.remove_timeout { print_ts(sprintf("%d - timeout %d", pid(), timer)); } -probe libvirt.event_poll.update_timeout { +probe libvirt.event_glib.update_timeout { if (showUpdates) print_ts(sprintf("%d * timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.purge_timeout { - print_ts(sprintf("%d ! timeout %d", pid(), timer)); -}
-probe libvirt.event_poll.dispatch_timeout { +probe libvirt.event_glib.dispatch_timeout { if (showDispatch) print_ts(sprintf("%d > timeout %d", pid(), timer)); }
-probe libvirt.event_poll.run { - if (showIter) - print_ts(sprintf("%d ~ %d %d", pid(), nfds, timeout)); -} -- 2.27.0
-- Best regards, ----------------------------------- Han Han Senior Quality Engineer Redhat. Email: hhan@redhat.com Phone: +861065339333

On Sun, Jul 26, 2020 at 07:33:12PM +0800, Han Han wrote:
Update the events stap example because the event loop impl is replaced by GLib based event loop impl after commit 55fe8110.
Signed-off-by: Han Han <hhan@redhat.com> --- examples/systemtap/events.stp | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp index fd4fe4664d..016e2ca048 100644 --- a/examples/systemtap/events.stp +++ b/examples/systemtap/events.stp @@ -89,44 +89,34 @@ probe begin { print_ts("begin"); }
-probe libvirt.event_poll.add_handle { +probe libvirt.event_glib.add_handle { print_ts(sprintf("%d + handle %d %d %d", pid(), watch, fd, events)); } -probe libvirt.event_poll.remove_handle { +probe libvirt.event_glib.remove_handle { print_ts(sprintf("%d - handle %d", pid(), watch)); } -probe libvirt.event_poll.update_handle { +probe libvirt.event_glib.update_handle { if (showUpdates) print_ts(sprintf("%d * handle %d %d", pid(), watch, events)); } -probe libvirt.event_poll.purge_handle { - print_ts(sprintf("%d ! handle %d", pid(), watch)); -} -probe libvirt.event_poll.dispatch_handle { +probe libvirt.event_glib.dispatch_handle { if (showDispatch) print_ts(sprintf("%d > handle %d %d", pid(), watch, events)); }
-probe libvirt.event_poll.add_timeout { +probe libvirt.event_glib.add_timeout { print_ts(sprintf("%d + timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.remove_timeout { +probe libvirt.event_glib.remove_timeout { print_ts(sprintf("%d - timeout %d", pid(), timer)); } -probe libvirt.event_poll.update_timeout { +probe libvirt.event_glib.update_timeout { if (showUpdates) print_ts(sprintf("%d * timeout %d %d", pid(), timer, frequency)); } -probe libvirt.event_poll.purge_timeout { - print_ts(sprintf("%d ! timeout %d", pid(), timer)); -}
-probe libvirt.event_poll.dispatch_timeout { +probe libvirt.event_glib.dispatch_timeout { if (showDispatch) print_ts(sprintf("%d > timeout %d", pid(), timer)); }
-probe libvirt.event_poll.run { - if (showIter) - print_ts(sprintf("%d ~ %d %d", pid(), nfds, timeout)); -}
This leaves a trailing blank line which breaks "syntax-check" tests. I've trimmed that before pushing. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
participants (2)
-
Daniel P. Berrangé
-
Han Han