*/
#include "defs.h"
+#include <sys/syscall.h>
#ifdef HAVE_POLL_H
#include <poll.h>
#include <sys/tihdr.h>
#endif
-#if defined(HAVE_SYS_STREAM_H) || defined(linux) || defined(FREEBSD)
+#if defined(HAVE_SYS_STREAM_H) || defined(LINUX) || defined(FREEBSD)
#ifndef HAVE_STROPTS_H
#define RS_HIPRI 1
struct strbuf {
- int maxlen; /* no. of bytes in buffer */
- int len; /* no. of bytes returned */
- char *buf; /* pointer to data */
+ int maxlen; /* no. of bytes in buffer */
+ int len; /* no. of bytes returned */
+ const char *buf; /* pointer to data */
};
#define MORECTL 1
#define MOREDATA 2
#endif /* HAVE_SYS_TIUSER_H */
#ifndef FREEBSD
-static struct xlat msgflags[] = {
+static const struct xlat msgflags[] = {
{ RS_HIPRI, "RS_HIPRI" },
{ 0, NULL },
};
for (i = 1; i < 3; i++)
printstrbufarg(tcp, tcp->u_arg[i], 0);
/* flags */
- if (!printflags(msgflags, tcp->u_arg[3]))
- tprintf("0");
+ printflags(msgflags, tcp->u_arg[3], "RS_???");
}
return 0;
}
+#if defined(SPARC) || defined(SPARC64) || defined(SUNOS4) || defined(SVR4)
int
sys_getmsg(tcp)
struct tcb *tcp;
tprintf("[?]");
else {
tprintf("[");
- if (!printflags(msgflags, flags))
- tprintf("0");
+ printflags(msgflags, flags, "RS_???");
tprintf("]");
}
/* decode return value */
}
return RVAL_HEX | RVAL_STR;
}
+#endif /* SPARC || SPARC64 || SUNOS4 || SVR4 */
-#ifdef HAVE_PUTPMSG
-
-static struct xlat pmsgflags[] = {
+#if defined SYS_putpmsg || defined SYS_getpmsg
+static const struct xlat pmsgflags[] = {
#ifdef MSG_HIPRI
{ MSG_HIPRI, "MSG_HIPRI" },
#endif
#endif
{ 0, NULL },
};
+#endif
+#ifdef SYS_putpmsg
int
sys_putpmsg(tcp)
struct tcb *tcp;
/* band */
tprintf("%ld, ", tcp->u_arg[3]);
/* flags */
- if (!printflags(pmsgflags, tcp->u_arg[4]))
- tprintf("0");
+ printflags(pmsgflags, tcp->u_arg[4], "MSG_???");
}
return 0;
}
+#endif /* SYS_putpmsg */
+#ifdef SYS_getpmsg
int
sys_getpmsg(tcp)
struct tcb *tcp;
tprintf("[?]");
else {
tprintf("[");
- if (!printflags(pmsgflags, flags))
- tprintf("0");
+ printflags(pmsgflags, flags, "MSG_???");
tprintf("]");
}
/* decode return value */
}
return RVAL_HEX | RVAL_STR;
}
+#endif /* SYS_getpmsg */
-#endif /* HAVE_PUTPMSG */
#endif /* !FREEBSD */
#ifdef HAVE_SYS_POLL_H
-static struct xlat pollflags[] = {
+static const struct xlat pollflags[] = {
#ifdef POLLIN
{ POLLIN, "POLLIN" },
{ POLLPRI, "POLLPRI" },
{ 0, NULL },
};
-int
-sys_poll(tcp)
-struct tcb *tcp;
+static int
+decode_poll(struct tcb *tcp, long pts)
{
- struct pollfd *pollp;
-
- if (exiting(tcp)) {
- int i;
- int nfds = tcp->u_arg[1];
+ struct pollfd fds;
+ unsigned nfds;
+ unsigned long size, start, cur, end, abbrev_end;
+ int failed = 0;
- if (nfds <= 0) {
- tprintf("%#lx, %d, %ld\n",
- tcp->u_arg[0], nfds, tcp->u_arg[2]);
+ if (entering(tcp)) {
+ nfds = tcp->u_arg[1];
+ size = sizeof(fds) * nfds;
+ start = tcp->u_arg[0];
+ end = start + size;
+ if (nfds == 0 || size / sizeof(fds) != nfds || end < start) {
+ tprintf("%#lx, %d, ",
+ tcp->u_arg[0], nfds);
return 0;
}
- pollp = (struct pollfd *) malloc(nfds * sizeof(*pollp));
- if (pollp == NULL) {
- fprintf(stderr, "sys_poll: no memory\n");
- tprintf("%#lx, %d, %ld",
- tcp->u_arg[0], nfds, tcp->u_arg[2]);
+ if (abbrev(tcp)) {
+ abbrev_end = start + max_strlen * sizeof(fds);
+ if (abbrev_end < start)
+ abbrev_end = end;
+ } else {
+ abbrev_end = end;
+ }
+ tprintf("[");
+ for (cur = start; cur < end; cur += sizeof(fds)) {
+ if (cur > start)
+ tprintf(", ");
+ if (cur >= abbrev_end) {
+ tprintf("...");
+ break;
+ }
+ if (umoven(tcp, cur, sizeof fds, (char *) &fds) < 0) {
+ tprintf("?");
+ failed = 1;
+ break;
+ }
+ if (fds.fd < 0) {
+ tprintf("{fd=%d}", fds.fd);
+ continue;
+ }
+ tprintf("{fd=");
+ printfd(tcp, fds.fd);
+ tprintf(", events=");
+ printflags(pollflags, fds.events, "POLL???");
+ tprintf("}");
+ }
+ tprintf("]");
+ if (failed)
+ tprintf(" %#lx", start);
+ tprintf(", %d, ", nfds);
+ return 0;
+ } else {
+ static char outstr[1024];
+ char str[64];
+ const char *flagstr;
+ unsigned int cumlen;
+
+ if (syserror(tcp))
return 0;
+ if (tcp->u_rval == 0) {
+ tcp->auxstr = "Timeout";
+ return RVAL_STR;
}
- if (umoven(tcp, tcp->u_arg[0],
- (nfds * sizeof(*pollp)), (char *) pollp) < 0) {
- tprintf("%#lx", tcp->u_arg[0]);
+
+ nfds = tcp->u_arg[1];
+ size = sizeof(fds) * nfds;
+ start = tcp->u_arg[0];
+ end = start + size;
+ if (nfds == 0 || size / sizeof(fds) != nfds || end < start)
+ return 0;
+ if (abbrev(tcp)) {
+ abbrev_end = start + max_strlen * sizeof(fds);
+ if (abbrev_end < start)
+ abbrev_end = end;
+ } else {
+ abbrev_end = end;
}
- else {
- tprintf("[");
- for (i = 0; i < nfds; i++) {
- if (i)
- tprintf(", ");
- if (pollp[i].fd < 0) {
- tprintf("{fd=%d}", pollp[i].fd);
- continue;
- }
- tprintf("{fd=%d, events=", pollp[i].fd);
- if (!printflags(pollflags, pollp[i].events))
- tprintf("0");
- if (!syserror(tcp) && pollp[i].revents) {
- tprintf(", revents=");
- if (!printflags(pollflags,
- pollp[i].revents))
- tprintf("0");
- }
- tprintf("}");
+
+ outstr[0] = '\0';
+ cumlen = 0;
+
+ for (cur = start; cur < end; cur += sizeof(fds)) {
+ if (umoven(tcp, cur, sizeof fds, (char *) &fds) < 0) {
+ ++cumlen;
+ if (cumlen < sizeof(outstr))
+ strcat(outstr, "?");
+ failed = 1;
+ break;
+ }
+ if (!fds.revents)
+ continue;
+ if (!cumlen) {
+ ++cumlen;
+ strcat(outstr, "[");
+ } else {
+ cumlen += 2;
+ if (cumlen < sizeof(outstr))
+ strcat(outstr, ", ");
+ }
+ if (cur >= abbrev_end) {
+ cumlen += 3;
+ if (cumlen < sizeof(outstr))
+ strcat(outstr, "...");
+ break;
+ }
+ sprintf(str, "{fd=%d, revents=", fds.fd);
+ flagstr=sprintflags("", pollflags, fds.revents);
+ cumlen += strlen(str) + strlen(flagstr) + 1;
+ if (cumlen < sizeof(outstr)) {
+ strcat(outstr, str);
+ strcat(outstr, flagstr);
+ strcat(outstr, "}");
}
- tprintf("]");
}
- tprintf(", %d, ", nfds);
+ if (failed)
+ return 0;
+
+ if (cumlen && ++cumlen < sizeof(outstr))
+ strcat(outstr, "]");
+
+ if (pts) {
+ char str[128];
+
+ sprintf(str, "%sleft ", cumlen ? ", " : "");
+ sprint_timespec(str + strlen(str), tcp, pts);
+ if ((cumlen += strlen(str)) < sizeof(outstr))
+ strcat(outstr, str);
+ }
+
+ if (!outstr[0])
+ return 0;
+
+ tcp->auxstr = outstr;
+ return RVAL_STR;
+ }
+}
+
+int
+sys_poll(struct tcb *tcp)
+{
+ int rc = decode_poll(tcp, 0);
+ if (entering(tcp)) {
#ifdef INFTIM
if (tcp->u_arg[2] == INFTIM)
tprintf("INFTIM");
else
#endif
tprintf("%ld", tcp->u_arg[2]);
- free(pollp);
}
- return 0;
+ return rc;
+}
+
+#ifdef LINUX
+int
+sys_ppoll(struct tcb *tcp)
+{
+ int rc = decode_poll(tcp, tcp->u_arg[2]);
+ if (entering(tcp)) {
+ print_timespec(tcp, tcp->u_arg[2]);
+ tprintf(", ");
+ print_sigset(tcp, tcp->u_arg[3], 0);
+ tprintf(", %lu", tcp->u_arg[4]);
+ }
+ return rc;
}
+#endif
#else /* !HAVE_SYS_POLL_H */
int
sys_poll(tcp)
struct tcb *tcp;
{
- return 0;
+ return 0;
}
#endif
-#if !defined(linux) && !defined(FREEBSD)
+#if !defined(LINUX) && !defined(FREEBSD)
-static struct xlat stream_flush_options[] = {
+static const struct xlat stream_flush_options[] = {
{ FLUSHR, "FLUSHR" },
{ FLUSHW, "FLUSHW" },
{ FLUSHRW, "FLUSHRW" },
{ 0, NULL },
};
-static struct xlat stream_setsig_flags[] = {
+static const struct xlat stream_setsig_flags[] = {
{ S_INPUT, "S_INPUT" },
{ S_HIPRI, "S_HIPRI" },
{ S_OUTPUT, "S_OUTPUT" },
{ 0, NULL },
};
-static struct xlat stream_read_options[] = {
+static const struct xlat stream_read_options[] = {
{ RNORM, "RNORM" },
{ RMSGD, "RMSGD" },
{ RMSGN, "RMSGN" },
{ 0, NULL },
};
-static struct xlat stream_read_flags[] = {
+static const struct xlat stream_read_flags[] = {
#ifdef RPROTDAT
{ RPROTDAT, "RPROTDAT" },
#endif
#endif
#ifdef I_SWROPT
-static struct xlat stream_write_flags[] = {
+static const struct xlat stream_write_flags[] = {
{ SNDZERO, "SNDZERO" },
{ SNDPIPE, "SNDPIPE" },
{ 0, NULL },
#endif /* I_SWROPT */
#ifdef I_ATMARK
-static struct xlat stream_atmark_options[] = {
+static const struct xlat stream_atmark_options[] = {
{ ANYMARK, "ANYMARK" },
{ LASTMARK, "LASTMARK" },
{ 0, NULL },
#endif /* I_ATMARK */
#ifdef TI_BIND
-static struct xlat transport_user_options[] = {
+static const struct xlat transport_user_options[] = {
{ T_CONN_REQ, "T_CONN_REQ" },
{ T_CONN_RES, "T_CONN_RES" },
{ T_DISCON_REQ, "T_DISCON_REQ" },
{ 0, NULL },
};
-static struct xlat transport_user_flags [] = {
+static const struct xlat transport_user_flags [] = {
{ 0, "0" },
{ T_MORE, "T_MORE" },
{ T_EXPEDITED, "T_EXPEDITED" },
};
-#ifdef HAVE_T_OPTHDR
+#ifdef HAVE_STRUCT_T_OPTHDR
-static struct xlat xti_level [] = {
+static const struct xlat xti_level [] = {
{ XTI_GENERIC, "XTI_GENERIC" },
{ 0, NULL },
};
-static struct xlat xti_generic [] = {
+static const struct xlat xti_generic [] = {
{ XTI_DEBUG, "XTI_DEBUG" },
{ XTI_LINGER, "XTI_LINGER" },
{ XTI_RCVBUF, "XTI_RCVBUF" },
long addr;
int len;
{
- /* We don't know how to tell if TLI (socket) or XTI
+ /* We don't know how to tell if TLI (socket) or XTI
optmgmt is being used yet, assume TLI. */
-#if defined (HAVE_OPTHDR)
+#if defined (HAVE_STRUCT_OPTHDR)
print_sock_optmgmt (tcp, addr, len);
-#elif defined (HAVE_T_OPTHDR)
+#elif defined (HAVE_STRUCT_T_OPTHDR)
print_xti_optmgmt (tcp, addr, len);
#else
printstr (tcp, addr, len);
-static struct xlat service_type [] = {
+static const struct xlat service_type [] = {
{ T_COTS, "T_COTS" },
{ T_COTS_ORD, "T_COTS_ORD" },
{ T_CLTS, "T_CLTS" },
{ 0, NULL },
};
-static struct xlat ts_state [] = {
+static const struct xlat ts_state [] = {
{ TS_UNBND, "TS_UNBND" },
{ TS_WACK_BREQ, "TS_WACK_BREQ" },
{ TS_WACK_UREQ, "TS_WACK_UREQ" },
{ 0, NULL },
};
-static struct xlat provider_flags [] = {
+static const struct xlat provider_flags [] = {
{ 0, "0" },
{ SENDZERO, "SENDZERO" },
{ EXPINLINE, "EXPINLINE" },
};
-static struct xlat tli_errors [] = {
+static const struct xlat tli_errors [] = {
{ TBADADDR, "TBADADDR" },
{ TBADOPT, "TBADOPT" },
{ TACCES, "TACCES" },
while (0)
#define COMMA() \
- do { if (c++) tprintf (", "); } while (0)
-
+ do { if (c++) tprintf (", "); } while (0)
+
#define STRUCT(struct, elem, print) \
do { \
while (0)
#define ADDR(struct, elem) STRUCT (struct, elem, printstr)
-
+
switch (m.type) {
#ifdef T_CONN_REQ
case T_CONN_REQ: /* connect request */
#ifdef T_CONN_RES
case T_CONN_RES: /* connect response */
GET (T_CONN_RES, conn_res);
+#ifdef HAVE_STRUCT_T_CONN_RES_QUEUE_PTR
COMMA ();
tprintf ("QUEUE=%p", m.conn_res.QUEUE_ptr);
+#elif defined HAVE_STRUCT_T_CONN_RES_ACCEPTOR_ID
+ COMMA ();
+ tprintf ("ACCEPTOR=%#lx", m.conn_res.ACCEPTOR_id);
+#endif
ADDR (conn_res, OPT);
COMMA ();
tprintf ("SEQ=%ld", m.conn_res.SEQ_number);
GET (T_OPTMGMT_REQ, optmgmt_req);
COMMA ();
tprintf ("MGMT=");
- printflags (transport_user_flags, m.optmgmt_req.MGMT_flags);
+ printflags (transport_user_flags, m.optmgmt_req.MGMT_flags,
+ "T_???");
STRUCT (optmgmt_req, OPT, print_optmgmt);
break;
#endif
tprintf (", CURRENT=");
printxval (ts_state, m.info_ack.CURRENT_state, "TS_???");
tprintf (", PROVIDER=");
- printflags (provider_flags, m.info_ack.PROVIDER_flag);
+ printflags (provider_flags, m.info_ack.PROVIDER_flag, "???");
break;
#endif
#ifdef T_BIND_ACK
GET (T_OPTMGMT_ACK, optmgmt_ack);
COMMA ();
tprintf ("MGMT=");
- printflags (transport_user_flags, m.optmgmt_ack.MGMT_flags);
+ printflags (transport_user_flags, m.optmgmt_ack.MGMT_flags,
+ "T_???");
STRUCT (optmgmt_ack, OPT, print_optmgmt);
break;
#endif
#undef ADDR
#undef COMMA
#undef STRUCT
-
+
return 0;
}
#endif /* TI_BIND */
-static int
-internal_stream_ioctl(tcp, arg)
-struct tcb *tcp;
-int arg;
+static int internal_stream_ioctl(struct tcb *tcp, int arg)
{
struct strioctl si;
- char *name;
+ struct ioctlent *iop;
int in_and_out;
int timod = 0;
#ifdef SI_GETUDATA
return 1;
}
if (entering(tcp)) {
- name = ioctl_lookup(si.ic_cmd);
- if (name)
- tprintf(", {ic_cmd=%s", name);
- else
+ iop = ioctl_lookup(si.ic_cmd);
+ if (iop) {
+ tprintf(", {ic_cmd=%s", iop->symbol);
+ while ((iop = ioctl_next_match(iop)))
+ tprintf(" or %s", iop->symbol);
+ } else
tprintf(", {ic_cmd=%#x", si.ic_cmd);
if (si.ic_timout == INFTIM)
tprintf(", ic_timout=INFTIM, ");
case SI_GETUDATA:
if (entering(tcp))
break;
-#if 0
- tprintf("struct si_udata ");
-#endif
if (umove(tcp, (int) si.ic_dp, &udata) < 0)
tprintf("{...}");
else {
tprintf("servtype=%d, so_state=%d, ",
udata.servtype, udata.so_state);
tprintf("so_options=%d", udata.so_options);
-#if 0
- tprintf(", tsdusize=%d", udata.tsdusize);
-#endif
tprintf("}");
}
break;
#endif /* SI_GETUDATA */
default:
- printstr(tcp, (int) si.ic_dp, si.ic_len);
+ printstr(tcp, (long) si.ic_dp, si.ic_len);
break;
}
if (exiting(tcp)) {
tprintf("}");
- if (timod && tcp->u_rval) {
+ if (timod && tcp->u_rval && !syserror(tcp)) {
tcp->auxstr = xlookup (tli_errors, tcp->u_rval);
return RVAL_STR + 1;
}
}
-
+
return 1;
}
tprintf(", {...}");
else {
tprintf(", {bi_pri=%d, bi_flag=", bi.bi_pri);
- if (!printflags(stream_flush_options, bi.bi_flag))
- tprintf("0");
+ printflags(stream_flush_options, bi.bi_flag, "FLUSH???");
tprintf("}");
}
return 1;
case I_SETSIG:
/* argument is a set of flags */
tprintf(", ");
- if (!printflags(stream_setsig_flags, arg))
- tprintf("0");
+ printflags(stream_setsig_flags, arg, "S_???");
return 1;
case I_GETSIG:
/* argument is a pointer to a set of flags */
tprintf(", [");
if (umove(tcp, arg, &val) < 0)
tprintf("?");
- else if (!printflags(stream_setsig_flags, val))
- tprintf("0");
+ else
+ printflags(stream_setsig_flags, val, "S_???");
tprintf("]");
return 1;
case I_PEEK:
tprintf(", databuf=");
printstrbuf(tcp, &sp.databuf, 1);
tprintf(", flags=");
- if (!printflags(msgflags, sp.flags))
- tprintf("0");
+ printflags(msgflags, sp.flags, "RS_???");
tprintf("}");
return 1;
case I_SRDOPT:
tprintf(", databuf=");
printstrbuf(tcp, &sfi.databuf, 1);
tprintf(", flags=");
- if (!printflags(msgflags, sfi.flags))
- tprintf("0");
+ printflags(msgflags, sfi.flags, "RS_???");
tprintf(", filedes=%d, offset=%d}", sfi.fildes, sfi.offset);
return 1;
#ifdef I_SWROPT
case I_SWROPT:
/* argument is a set of flags */
tprintf(", ");
- if (!printflags(stream_write_flags, arg))
- tprintf("0");
+ printflags(stream_write_flags, arg, "SND???");
return 1;
#endif /* I_SWROPT */
#ifdef I_GWROPT
tprintf(", [");
if (umove(tcp, arg, &val) < 0)
tprintf("?");
- else if (!printflags(stream_write_flags, arg))
- tprintf("0");
+ else
+ printflags(stream_write_flags, arg, "SND???");
tprintf("]");
return 1;
#endif /* I_GWROPT */
}
}
-#endif /* !linux && !FREEBSD */
-
-#endif /* HAVE_SYS_STREAM_H || linux || FREEBSD */
+#endif /* !LINUX && !FREEBSD */
+#endif /* HAVE_SYS_STREAM_H || LINUX || FREEBSD */
projects / strace / blobdiff