Page MenuHomeFreeBSD
Files F154340657

D27518.id80464.diff
No OneTemporary
Actions

D27518.id80464.diff
View Options

Index: usr.bin/truss/syscall.h
===================================================================
--- usr.bin/truss/syscall.h
+++ usr.bin/truss/syscall.h
@@ -87,6 +87,7 @@
/* Encoded scalar values. */
Accessmode,
Acltype,
+ AiofsyncOp,
Atfd,
Atflags,
CapFcntlRights,
@@ -101,6 +102,7 @@
Ioctl,
Kldsymcmd,
Kldunloadflags,
+ LioMode,
Madvice,
Minherit,
Msgflags,
@@ -139,6 +141,8 @@
/* Pointers to non-structures. */
Ptr,
+ AiocbArray,
+ AiocbPointer,
BinString,
CapRights,
ExecArgs,
@@ -157,6 +161,7 @@
StringArray,
/* Pointers to structures. */
+ Aiocb,
Itimerval,
Kevent,
Kevent11,
@@ -168,6 +173,7 @@
Schedparam,
Sctpsndrcvinfo,
Sigaction,
+ Sigevent,
Siginfo,
Sigset,
Sockaddr,
Index: usr.bin/truss/syscalls.c
===================================================================
--- usr.bin/truss/syscalls.c
+++ usr.bin/truss/syscalls.c
@@ -39,6 +39,7 @@
* arguments.
*/
+#include <sys/aio.h>
#include <sys/capsicum.h>
#include <sys/types.h>
#define _WANT_FREEBSD11_KEVENT
@@ -125,6 +126,22 @@
.args = { { Int, 0 }, { Sockaddr | OUT, 1 }, { Ptr | OUT, 2 } } },
{ .name = "access", .ret_type = 1, .nargs = 2,
.args = { { Name | IN, 0 }, { Accessmode, 1 } } },
+ { .name = "aio_cancel", .ret_type = 1, .nargs = 2,
+ .args = { { Int, 0 }, { Aiocb, 1 } } },
+ { .name = "aio_error", .ret_type = 1, .nargs = 1,
+ .args = { { Aiocb, 0 } } },
+ { .name = "aio_fsync", .ret_type = 1, .nargs = 2,
+ .args = { { AiofsyncOp, 0 }, { Aiocb, 1 } } },
+ { .name = "aio_read", .ret_type = 1, .nargs = 1,
+ .args = { { Aiocb, 0 } } },
+ { .name = "aio_return", .ret_type = 1, .nargs = 1,
+ .args = { { Aiocb, 0 } } },
+ { .name = "aio_suspend", .ret_type = 1, .nargs = 3,
+ .args = { { AiocbArray, 0 }, { Int, 1 }, { Timespec, 2 } } },
+ { .name = "aio_waitcomplete", .ret_type = 1, .nargs = 2,
+ .args = { { AiocbPointer | OUT, 0 }, { Timespec, 1 } } },
+ { .name = "aio_write", .ret_type = 1, .nargs = 1,
+ .args = { { Aiocb, 0 } } },
{ .name = "bind", .ret_type = 1, .nargs = 3,
.args = { { Int, 0 }, { Sockaddr | IN, 1 }, { Socklent, 2 } } },
{ .name = "bindat", .ret_type = 1, .nargs = 4,
@@ -324,6 +341,9 @@
{ .name = "linkat", .ret_type = 1, .nargs = 5,
.args = { { Atfd, 0 }, { Name, 1 }, { Atfd, 2 }, { Name, 3 },
{ Atflags, 4 } } },
+ { .name = "lio_listio", .ret_type = 1, .nargs = 4,
+ .args = { { LioMode, 0 }, { AiocbArray, 1 }, { Int, 2 },
+ { Sigevent, 3 } } },
{ .name = "listen", .ret_type = 1, .nargs = 2,
.args = { { Int, 0 }, { Int, 1 } } },
{ .name = "lseek", .ret_type = 2, .nargs = 3,
@@ -714,6 +734,21 @@
XEND
};
+static struct xlat lio_modes[] = {
+ X(LIO_WAIT) X(LIO_NOWAIT)
+ XEND
+};
+
+static struct xlat lio_opcodes[] = {
+ X(LIO_WRITE) X(LIO_READ) X(LIO_NOP)
+ XEND
+};
+
+static struct xlat aio_fsync_ops[] = {
+ X(O_SYNC)
+ XEND
+};
+
#undef X
#define X(a) { CLOUDABI_##a, #a },
@@ -1324,6 +1359,60 @@
fprintf(fp, "%s%s", iov_truncated ? ",..." : "", "]");
}
+static void
+print_sigval(FILE *fp, union sigval *sv)
+{
+ fprintf(fp, "{ %d, %p }", sv->sival_int, sv->sival_ptr);
+}
+
+static void
+print_sigevent(FILE *fp, struct sigevent *se)
+{
+ fputs("{ sigev_notify=", fp);
+ switch (se->sigev_notify) {
+ case SIGEV_NONE:
+ fputs("SIGEV_NONE", fp);
+ break;
+ case SIGEV_SIGNAL:
+ fprintf(fp, "SIGEV_SIGNAL, sigev_signo=%s, sigev_value=",
+ strsig2(se->sigev_signo));
+ print_sigval(fp, &se->sigev_value);
+ break;
+ case SIGEV_THREAD:
+ fprintf(fp, "SIGEV_THREAD, sigev_notify_function=%p, sigev_value=",
+ se->sigev_notify_function);
+ print_sigval(fp, &se->sigev_value);
+ break;
+ case SIGEV_KEVENT:
+ fprintf(fp, "SIGEV_KEVENT, sigev_notify_kqueue=%d, sigev_notify_kevent_flags=",
+ se->sigev_notify_kqueue);
+ print_mask_arg(sysdecode_kevent_flags, fp, se->sigev_notify_kevent_flags);
+ break;
+ case SIGEV_THREAD_ID:
+ fprintf(fp, "SIGEV_THREAD_ID, sigev_notify_thread_id=%d, sigev_signo=%s, sigev_value=",
+ se->sigev_notify_thread_id, strsig2(se->sigev_signo));
+ print_sigval(fp, &se->sigev_value);
+ break;
+ default:
+ fprintf(fp, "%d", se->sigev_notify);
+ break;
+ }
+ fputs(" }", fp);
+}
+
+static void
+print_aiocb(FILE *fp, struct aiocb *cb)
+{
+ fprintf(fp, "{ %d,%jd,%p,%zu,%s,",
+ cb->aio_fildes,
+ cb->aio_offset,
+ cb->aio_buf,
+ cb->aio_nbytes,
+ xlookup(lio_opcodes, cb->aio_lio_opcode));
+ print_sigevent(fp, &cb->aio_sigevent);
+ fputs(" }", fp);
+}
+
static void
print_gen_cmsg(FILE *fp, struct cmsghdr *cmsghdr)
{
@@ -2107,6 +2196,15 @@
print_pointer(fp, args[sc->offset]);
break;
}
+ case Sigevent: {
+ struct sigevent se;
+
+ if (get_struct(pid, args[sc->offset], &se, sizeof(se)) != -1)
+ print_sigevent(fp, &se);
+ else
+ print_pointer(fp, args[sc->offset]);
+ break;
+ }
case Kevent: {
/*
* XXX XXX: The size of the array is determined by either the
@@ -2467,6 +2565,12 @@
print_integer_arg(sysdecode_kldunload_flags, fp,
args[sc->offset]);
break;
+ case AiofsyncOp:
+ fputs(xlookup(aio_fsync_ops, args[sc->offset]), fp);
+ break;
+ case LioMode:
+ fputs(xlookup(lio_modes, args[sc->offset]), fp);
+ break;
case Madvice:
print_integer_arg(sysdecode_madvice, fp, args[sc->offset]);
break;
@@ -2604,6 +2708,67 @@
print_iovec(fp, trussinfo, args[sc->offset],
(int)args[sc->offset + 1]);
break;
+ case Aiocb: {
+ struct aiocb cb;
+
+ if (get_struct(pid, args[sc->offset], &cb, sizeof(cb)) != -1)
+ print_aiocb(fp, &cb);
+ else
+ print_pointer(fp, args[sc->offset]);
+ break;
+ }
+ case AiocbArray: {
+ /*
+ * Print argment as an array of pointers to struct aiocb, where
+ * the next syscall argument is the number of elements.
+ */
+ uintptr_t cbs[AIO_LISTIO_MAX];
+ int nent;
+ bool truncated;
+
+ nent = args[sc->offset + 1];
+ if (nent > AIO_LISTIO_MAX) {
+ nent = AIO_LISTIO_MAX;
+ truncated = true;
+ } else
+ truncated = false;
+
+ if (get_struct(pid, args[sc->offset], cbs, sizeof(uintptr_t) * nent) != -1) {
+ int i;
+ fputs("[", fp);
+ for (i = 0; i < nent; ++i) {
+ struct aiocb cb;
+ if (i > 0)
+ fputc(',', fp);
+ if (get_struct(pid, cbs[i], &cb, sizeof(cb)) != -1)
+ print_aiocb(fp, &cb);
+ else
+ print_pointer(fp, cbs[i]);
+ }
+ if (truncated)
+ fputs(",...", fp);
+ fputs("]", fp);
+ } else
+ print_pointer(fp, args[sc->offset]);
+ break;
+ }
+ case AiocbPointer: {
+ /*
+ * aio_waitcomplete(2) assigns a pointer to a pointer to struct
+ * aiocb, so we need to handle the extra layer of indirection.
+ */
+ uintptr_t cbp;
+ struct aiocb cb;
+
+ if (get_struct(pid, args[sc->offset], &cbp, sizeof(cbp)) != -1) {
+ if (get_struct(pid, cbp, &cb, sizeof(cb)) != -1)
+ print_aiocb(fp, &cb);
+ else
+ print_pointer(fp, cbp);
+ } else
+ print_pointer(fp, args[sc->offset]);
+ break;
+ }
case Sctpsndrcvinfo: {
struct sctp_sndrcvinfo info;

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 11:20 PM (6 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32311208
Default Alt Text
D27518.id80464.diff (6 KB)

Event Timeline