2 files changed, 46 insertions, 55 deletions
diff --git a/examples/ChangeLog b/examples/ChangeLog
index c1bf2238..99fc6928 100644
--- a/examples/ChangeLog
+++ b/examples/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-29  Frank Ch. Eigler  <fche@elastic.org>
+
+	* nettop.stp: Reorganize array usage to minimize contention.
+
 2007-11-19  Frank Ch. Eigler  <fche@elastic.org>
 
 	* iostat-scsi.stp: Adopt "!" probe point flag.
diff --git a/examples/nettop.stp b/examples/nettop.stp
index 1310f5b4..6bcc7f39 100755
--- a/examples/nettop.stp
+++ b/examples/nettop.stp
@@ -1,55 +1,42 @@
-#! /usr/bin/env stap
-
-global ifxmit, ifrecv, ifdevs, ifpid, execname, user
-
-probe netdev.transmit
-{
-        p = pid()
-        execname[p] = execname()
-        user[p] = uid()
-        ifdevs[p, dev_name] = dev_name
-        ifxmit[p, dev_name] <<< length
-        ifpid[p, dev_name] ++
-}
-
-probe netdev.receive
-{
-        p = pid()
-        execname[p] = execname()
-        user[p] = uid()
-        ifdevs[p, dev_name] = dev_name
-        ifrecv[p, dev_name] <<< length
-        ifpid[p, dev_name] ++
-}
-
-
-function print_activity()
-{
-        printf("%5s %5s %-7s %7s %7s %7s %7s %-15s\n",
-                "PID", "UID", "DEV", "XMIT_PK", "RECV_PK",
-                "XMIT_KB", "RECV_KB", "COMMAND")
-
-        foreach ([pid, dev] in ifpid-) {
-                n_xmit = @count(ifxmit[pid, dev])
-                n_recv = @count(ifrecv[pid, dev])
-                printf("%5d %5d %-7s %7d %7d %7d %7d %-15s\n",
-                        pid, user[pid], dev, n_xmit, n_recv,
-                        n_xmit ? @sum(ifxmit[pid, dev])/1024 : 0,
-                        n_recv ? @sum(ifrecv[pid, dev])/1024 : 0,
-                        execname[pid])
-        }
-
-        print("\n")
-
-        delete execname
-        delete user
-        delete ifdevs
-        delete ifxmit
-        delete ifrecv
-        delete ifpid
-}
-
-probe timer.ms(5000)
-{
-        print_activity()
-}
+#! /usr/bin/env stap
+
+global ifxmit, ifrecv
+
+probe netdev.transmit
+{
+        ifxmit[pid(), dev_name, execname(), uid()] <<< length
+}
+
+probe netdev.receive
+{
+        ifrecv[pid(), dev_name, execname(), uid()] <<< length
+}
+
+
+function print_activity()
+{
+        printf("%5s %5s %-7s %7s %7s %7s %7s %-15s\n",
+                "PID", "UID", "DEV", "XMIT_PK", "RECV_PK",
+                "XMIT_KB", "RECV_KB", "COMMAND")
+
+        foreach ([pid, dev, exec, uid] in ifrecv-) {
+                n_xmit = @count(ifxmit[pid, dev, exec, uid])
+                n_recv = @count(ifrecv[pid, dev, exec, uid])
+                printf("%5d %5d %-7s %7d %7d %7d %7d %-15s\n",
+                        pid, uid, dev, n_xmit, n_recv,
+                        n_xmit ? @sum(ifxmit[pid, dev, exec, uid])/1024 : 0,
+                        n_recv ? @sum(ifrecv[pid, dev, exec, uid])/1024 : 0,
+                        exec)
+        }
+
+        print("\n")
+
+        delete ifxmit
+        delete ifrecv
+}
+
+probe timer.ms(5000), end, error
+{
+        print_activity()
+}
+