Fri Jul 24 11:34:03 2009 UTC ()

Delay emulation record output, to be processed after the current
syscall; to avoid picking syscall name from the wrong emulation table.


(njoly)

diff -r1.35 -r1.36 src/usr.bin/ktruss/dump.c

--- src/usr.bin/ktruss/dump.c 2009/05/02 21:01:01	1.35
+++ src/usr.bin/ktruss/dump.c 2009/07/24 11:34:03	1.36

 @@ -1,14 +1,14 @@
-/*	$NetBSD: dump.c,v 1.35 2009/05/02 21:01:01 mlelstv Exp $	*/
+/*	$NetBSD: dump.c,v 1.36 2009/07/24 11:34:03 njoly Exp $	*/
 /*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\
  The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)kdump.c	8.4 (Berkeley) 4/28/95";
 #endif
-__RCSID("$NetBSD: dump.c,v 1.35 2009/05/02 21:01:01 mlelstv Exp $");
+__RCSID("$NetBSD: dump.c,v 1.36 2009/07/24 11:34:03 njoly Exp $");
 #endif /* not lint */
 #include <sys/param.h>
 #define	_KERNEL
 #include <sys/errno.h>
 #undef _KERNEL
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/ktrace.h>
 #include <sys/ptrace.h>
 #include <sys/queue.h>
 @@ -278,27 +278,27 @@ dumprecord(int trpoints, FILE *fp)
 	case KTR_NAMEI:
 		putpendq(kte);
 		break;
 	case KTR_GENIO:
 		putpendq(kte);
 		break;
 	case KTR_PSIG:
 		ktrpsig(kte);
 		break;
 	case KTR_CSW:
 		ktrcsw(kte);
 		break;
 	case KTR_EMUL:
-		ktremul(kte);
+		putpendq(kte);
 		break;
 	default:
 		/*
 		 * XXX: Other types added recently.
 		 */
 		free(kte);
 		break;
+	}
 	newline();
 out:
 	return (1);
+}
 @@ -639,26 +639,27 @@ sysretprint(struct ktr_header *kth)
 			wprintf(" = %ld", (long)ret);
 			if (kth->ktr_len > (int)offsetof(struct ktr_sysret,
 			    ktr_retval_1) && ktr->ktr_retval_1 != 0)
 				wprintf(", %ld", (long)ktr->ktr_retval_1);
 			break;
+		}
+}
 void
 ktrsysret(struct ktr_entry *kte)
+{
 	struct ktr_header *kth = &kte->kte_kth;
 	struct ktr_sysret *ktr = (struct ktr_sysret *)(kth + 1);
 	struct ktr_entry *emul;
 	struct ktr_entry *genio;
 	struct ktr_entry *syscall_ent;
 	dumpheader(kth);
 	/* Print syscall name and arguments. */
 	syscall_ent = getpendq(kth, KTR_SYSCALL, NULL);
 	if (syscall_ent == NULL) {
 		/*
 		 * Possibilly a child of fork/vfork, or tracing of
 		 * process started during system call.
 		 */
 		syscallnameprint(ktr->ktr_code);
 @@ -666,26 +667,32 @@ ktrsysret(struct ktr_entry *kte)
 		syscallprint(&syscall_ent->kte_kth);
 		free(syscall_ent);
+	}
 	/* Print return value and an error if any. */
 	sysretprint(kth);
 	genio = getpendq(kth, KTR_GENIO, NULL);
 	if (genio != NULL) {
 		genioprint(&genio->kte_kth);
 		free(genio);
+	}
 	emul = getpendq(kth, KTR_EMUL, NULL);
 	if (emul != NULL) {
 		newline();
 		ktremul(emul);
+	}
 	flushpendq(kte);
 	free(kte);
+}
 void
 nameiprint(struct ktr_header *kth)
+{
 	wprintf("\"%.*s\"", kth->ktr_len, (char *)(kth + 1));
+}
 #ifdef notused
 void