773* driver/signal.c: Put in the missing assembler code for i386.

Author: dtrace4linux

.release

@@ -1,3 +1,3 @@
-date=Sun Aug 19 16:05:24 BST 2012
-release=dtrace-20120819
-build=419
+date=Mon Aug 20 22:03:17 BST 2012
+release=dtrace-20120820
+build=420

Changes

@@ -1,5 +1,15 @@
+Mon Aug 20 22:03:03 2012  fox
+
+     773* driver/signal.c: Put in the missing assembler code for i386.
+
 Sun Aug 19 16:05:01 2012  fox
 
+     772* scripts/dt.pl: Rename to dt.
+
+     771* scripts/dt.pl: Add 'dt func <pid>'
+
+     770* archive: 1.0145
+
      769* libproc/common/Pcontrol.c: Some changes to Pxcreate to handle
           parent/child sync with a forked child from 'dtrace -c cmd'.
 

Status.txt

@@ -31,8 +31,7 @@ Working Features
     not yet ready in Linux/dtrace (eg cannot run standard scripts like
     iosnoop.d or other scripts out there).
   o vminfo provider - probes for the stats in /proc/vmstats
-  o PID provider (dtrace -n pidNNN:::). Needs to be more thoroughly
-    verified.
+  o PID provider (dtrace -n pidNNN:::).
 
 Partially Working / Not yet quality controlled:
 

archive.sh

@@ -1,6 +1,6 @@
 NAME=dtrace
 MAJ_VERSION=1
-MIN_VERSION=0144
+MIN_VERSION=0145
 EXCLUDE="*.ko *.o .git"
 EXCLUDE_DIRS="build-"
-#date Sat Aug 11 10:05:53 BST 2012
+#date Sun Aug 19 17:57:46 BST 2012

driver/fbt_linux.c

@@ -399,6 +399,10 @@ TODO();
 # endif
 
 	int	init;
+
+	if (strcmp(modname, "dtracedrv") == 0)
+		return;
+
 	/***********************************************/
 	/*   Possible  memleak  here...we  allocate a  */
 	/*   parallel  struct, but need to free if we  */
@@ -415,8 +419,6 @@ TODO();
 
 	if (dtrace_here) 
 		printk("%s(%d):modname=%s num_symtab=%u\n", dtrace_basename(__FILE__), __LINE__, modname, (unsigned) mp->num_symtab);
-	if (strcmp(modname, "dtracedrv") == 0)
-		return;
 
 	for (i = 1; i < mp->num_symtab; i++) {
 		uint8_t *instr, *limit;
@@ -575,7 +577,7 @@ if (strcmp(modname, "dummy") == 0) dtrace_here = 1;
 			modname, name, 
 			(uint8_t *) sym->st_value, 
 			instr, limit, i);
-		}
+	}
 }
 
 static int
@@ -857,8 +859,9 @@ fbt_disable(void *arg, dtrace_id_t id, void *parg)
 		/*   fiddle with other things tho.	       */
 		/***********************************************/
 		if (*fbt->fbtp_patchpoint == fbt->fbtp_patchval) {
-			if (1 || memory_set_rw(fbt->fbtp_patchpoint, 1, TRUE))
+			if (1 || memory_set_rw(fbt->fbtp_patchpoint, 1, TRUE)) {
 				*fbt->fbtp_patchpoint = fbt->fbtp_savedval;
+			}
 
 			/***********************************************/
 			/*   "Logically"  mark  probe  as gone. So we  */

driver/signal.c

@@ -22,6 +22,7 @@ init_signal_dummy(void)
 {
 	__asm(
 	FUNCTION(dnr1_handler)
+#if defined(__amd64)
 	"push	%r15\n"
 	"push	%r14\n"
 	"push	%r13\n"
@@ -36,10 +37,20 @@ init_signal_dummy(void)
 	"push	%rbx\n"
 	"push	%rcx\n"
 	"push	%rdx\n"
+#else
+	"push	%eax\n"
+	"push	%ebx\n"
+	"push	%ecx\n"
+	"push	%edx\n"
+	"push	%esi\n"
+	"push	%edi\n"
+	"push	%ebp\n"
+#endif
 
 //	"call dtrace_safe_synchronous_signal\n"
 	"call sig_send_wrapper\n"
 
+#if defined(__amd64)
 	"pop	%rdx\n"
 	"pop	%rcx\n"
 	"pop	%rbx\n"
@@ -54,6 +65,15 @@ init_signal_dummy(void)
 	"pop	%r13\n"
 	"pop	%r14\n"
 	"pop	%r15\n"
+#else
+	"pop	%ebp\n"
+	"pop	%edi\n"
+	"pop	%esi\n"
+	"pop	%edx\n"
+	"pop	%ecx\n"
+	"pop	%ebx\n"
+	"pop	%eax\n"
+#endif
 
 	/***********************************************/
 	/*   Pretend we never got here.		       */
@@ -107,7 +127,7 @@ sig_send_callback(uint8_t *instr, int size)
 	/*   Compute  new  address  (rip-relative for  */
 	/*   amd64).				       */
 	/***********************************************/
-	ptbl[pidx].p_addr = instr + 1;
+	ptbl[pidx].p_addr = (uintptr_t) instr + 1;
 	ptbl[pidx].p_val = *(uint32_t *) &instr[1];
 	pidx++;
 #if defined(__amd64)
@@ -116,6 +136,7 @@ sig_send_callback(uint8_t *instr, int size)
 
 	*(uint32_t *) &instr[1] = addr;
 #else
+	addr = (uintptr_t) target;
 	*(uint32_t *) &instr[1] = addr;
 #endif
 }

librtld/rtld_db.c

@@ -224,7 +224,6 @@ rd_loadobj_iter(rd_agent_t *rap, rl_iter_f *cb, void *client_data)
 		ret = cb(&lobj, client_data);
 	}
 	fclose(fp);
-	printf("%s\n", __func__);
 }
 rd_err_e
 rd_get_dyns(rd_agent_t *rap, psaddr_t addr, void **dynpp, size_t *dynpp_sz)

scripts/dt.pl renamed to scripts/dt

@@ -50,6 +50,34 @@
 	secs => 5
 	);
 
+sub do_func
+{
+	my $pid = shift @ARGV;
+	usage() if !$pid;
+
+	my $exe = readlink("/proc/$pid/exe");
+	if (!$exe) {
+		print "Error: cannot read /proc/$pid/exe - $!\n";
+		exit(1);
+	}
+	$exe = basename($exe);
+
+	print "Type Ctrl-C to see results\n";
+	my $d = <<EOF;
+pid${pid}:${exe}::entry
+{
+	\@func[probefunc] = count();
+}
+END
+{
+	printa(\@func);
+}
+EOF
+	do_dtrace($d);
+
+	exit(0);
+}
+
 sub main
 {
 	Getopt::Long::Configure('no_ignore_case');
@@ -63,6 +91,10 @@ sub main
 	usage() if ($opts{help});
 
 	my $cmd = shift @ARGV;
+	if ($cmd eq 'func') {
+		do_func();
+	}
+
 	my $mode = shift @ARGV || "scroll";
 	usage() if !$cmd;
 	usage() if !defined($calls{$cmd});
@@ -171,6 +203,8 @@ sub usage
   The following commands are available, and expand into traces against
   the listed system calls.
 
+  dt func <pid>    - Show function calls for a running process.
+
 EOF
 	foreach my $s (sort(keys(%calls))) {
 		printf "  %-10s => %s\n", $s, $calls{$s} || " (n/a)";
@@ -197,6 +231,17 @@ sub usage
 
   dt fork count2
 
+  \$ dt func 1234
+  Type Ctrl-C to see results
+  ...
+  lex_get_token                                                 28988
+  vt_parse_machine                                              29480
+  eval_expr2                                                    30437
+  thread_verify                                                 40003
+  lex_unget_char                                                69696
+  dstr_add_char                                                111018
+  lex_get_char                                                 331968
+
 EOF
 
 	exit(1);