* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $Id$
*/
-#include "defs.h"
-
-#if defined(LINUX)
+#include "defs.h"
#include <fcntl.h>
#include <sys/stat.h>
-#include <sys/time.h>
#include <sys/wait.h>
#include <sys/resource.h>
#include <sys/utsname.h>
#include <sys/user.h>
-#include <sys/syscall.h>
-#include <signal.h>
/* Bits of module.flags. */
#define MOD_RUNNING 1
#define MOD_DELETED 2
#define MOD_AUTOCLEAN 4
-#define MOD_VISITED 8
+#define MOD_VISITED 8
#define MOD_USED_ONCE 16
#define MOD_JUST_FREED 32
#define MOD_INITIALIZING 64
};
int
-sys_query_module(tcp)
-struct tcb *tcp;
+sys_query_module(struct tcb *tcp)
{
-
- if (exiting(tcp)) {
+ if (entering(tcp)) {
printstr(tcp, tcp->u_arg[0], -1);
- tprintf(", ");
+ tprints(", ");
printxval(which, tcp->u_arg[1], "QM_???");
- tprintf(", ");
- if (!verbose(tcp)) {
- tprintf("%#lx, %lu, %#lx", tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[4]);
- } else if (tcp->u_rval!=0) {
- size_t ret;
- umove(tcp, tcp->u_arg[4], &ret);
- tprintf("%#lx, %lu, %Zu", tcp->u_arg[2], tcp->u_arg[3], ret);
+ tprints(", ");
+ } else {
+ size_t ret;
+
+ if (!verbose(tcp) || syserror(tcp) ||
+ umove(tcp, tcp->u_arg[4], &ret) < 0) {
+ tprintf("%#lx, %lu, %#lx", tcp->u_arg[2],
+ tcp->u_arg[3], tcp->u_arg[4]);
} else if (tcp->u_arg[1]==QM_INFO) {
struct module_info mi;
- size_t ret;
- umove(tcp, tcp->u_arg[2], &mi);
- tprintf("{address=%#lx, size=%lu, flags=", mi.addr, mi.size);
- printflags(modflags, mi.flags, "MOD_???");
- tprintf(", usecount=%lu}", mi.usecount);
- umove(tcp, tcp->u_arg[4], &ret);
- tprintf(", %Zu", ret);
+ if (umove(tcp, tcp->u_arg[2], &mi) < 0) {
+ tprintf("%#lx, ", tcp->u_arg[2]);
+ } else {
+ tprintf("{address=%#lx, size=%lu, flags=",
+ mi.addr, mi.size);
+ printflags(modflags, mi.flags, "MOD_???");
+ tprintf(", usecount=%lu}, ", mi.usecount);
+ }
+ tprintf("%lu", (unsigned long)ret);
} else if ((tcp->u_arg[1]==QM_MODULES) ||
- (tcp->u_arg[1]==QM_DEPS) ||
- (tcp->u_arg[1]==QM_REFS)) {
- size_t ret;
-
- umove(tcp, tcp->u_arg[4], &ret);
- tprintf("{");
+ (tcp->u_arg[1]==QM_DEPS) ||
+ (tcp->u_arg[1]==QM_REFS)) {
+ tprints("{");
if (!abbrev(tcp)) {
- char* data = (char*)malloc(tcp->u_arg[3]);
+ char* data = malloc(tcp->u_arg[3]);
char* mod = data;
size_t idx;
- if (data==NULL) {
+ if (!data) {
fprintf(stderr, "out of memory\n");
- tprintf(" /* %Zu entries */ ", ret);
+ tprintf(" /* %lu entries */ ", (unsigned long)ret);
} else {
- umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
- for (idx=0; idx<ret; idx++) {
- if (idx!=0)
- tprintf(",");
- tprintf(mod);
- mod+=strlen(mod)+1;
+ if (umoven(tcp, tcp->u_arg[2],
+ tcp->u_arg[3], data) < 0) {
+ tprintf(" /* %lu entries */ ", (unsigned long)ret);
+ } else {
+ for (idx = 0; idx < ret; idx++) {
+ tprintf("%s%s",
+ (idx ? ", " : ""),
+ mod);
+ mod += strlen(mod)+1;
+ }
}
free(data);
}
} else
- tprintf(" /* %Zu entries */ ", ret);
- tprintf("}, %Zu", ret);
+ tprintf(" /* %lu entries */ ", (unsigned long)ret);
+ tprintf("}, %lu", (unsigned long)ret);
} else if (tcp->u_arg[1]==QM_SYMBOLS) {
- size_t ret;
- umove(tcp, tcp->u_arg[4], &ret);
- tprintf("{");
+ tprints("{");
if (!abbrev(tcp)) {
- char* data = (char *)malloc(tcp->u_arg[3]);
+ char* data = malloc(tcp->u_arg[3]);
struct module_symbol* sym = (struct module_symbol*)data;
size_t idx;
- if (data==NULL) {
+ if (!data) {
fprintf(stderr, "out of memory\n");
- tprintf(" /* %Zu entries */ ", ret);
+ tprintf(" /* %lu entries */ ", (unsigned long)ret);
} else {
- umoven(tcp, tcp->u_arg[2], tcp->u_arg[3], data);
- for (idx=0; idx<ret; idx++) {
- tprintf("{name=%s, value=%lu} ", data+(long)sym->name, sym->value);
- sym++;
+ if (umoven(tcp, tcp->u_arg[2],
+ tcp->u_arg[3], data) < 0) {
+ tprintf(" /* %lu entries */ ", (unsigned long)ret);
+ } else {
+ for (idx = 0; idx < ret; idx++) {
+ tprintf("%s{name=%s, value=%lu}",
+ (idx ? " " : ""),
+ data+(long)sym->name,
+ sym->value);
+ sym++;
+ }
}
free(data);
}
} else
- tprintf(" /* %Zu entries */ ", ret);
- tprintf("}, %Zd", ret);
+ tprintf(" /* %lu entries */ ", (unsigned long)ret);
+ tprintf("}, %ld", (unsigned long)ret);
} else {
printstr(tcp, tcp->u_arg[2], tcp->u_arg[3]);
tprintf(", %#lx", tcp->u_arg[4]);
}
int
-sys_create_module(tcp)
-struct tcb *tcp;
+sys_create_module(struct tcb *tcp)
{
if (entering(tcp)) {
printpath(tcp, tcp->u_arg[0]);
}
int
-sys_init_module(tcp)
-struct tcb *tcp;
+sys_init_module(struct tcb *tcp)
{
if (entering(tcp)) {
- printpath(tcp, tcp->u_arg[0]);
- tprintf(", %#lx", tcp->u_arg[1]);
+ tprintf("%#lx, ", tcp->u_arg[0]);
+ tprintf("%lu, ", tcp->u_arg[1]);
+ printstr(tcp, tcp->u_arg[2], -1);
}
return 0;
}
-#endif /* LINUX */
projects / strace / blobdiff