Move defines common between rtld and libsysdecode into the header,
instead of copying inline into sources. Sponsored by: The FreeBSD Foundation MFC after: 1 week
This commit is contained in:
kib
parent
d5127b8cb7
commit
ca7630f47d
@ -9,6 +9,7 @@ SRCS= errno.c ioctl.c syscallnames.c utrace.c
|
||||
INCS= sysdecode.h
|
||||
|
||||
CFLAGS+= -I${.CURDIR}/../../sys
|
||||
CFLAGS+= -I${.CURDIR}/../../libexec/rtld-elf
|
||||
|
||||
MAN+= sysdecode.3 \
|
||||
sysdecode_abi_to_freebsd_errno.3 \
|
||||
|
||||
@ -35,33 +35,11 @@ __FBSDID("$FreeBSD$");
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <sysdecode.h>
|
||||
|
||||
#define UTRACE_DLOPEN_START 1
|
||||
#define UTRACE_DLOPEN_STOP 2
|
||||
#define UTRACE_DLCLOSE_START 3
|
||||
#define UTRACE_DLCLOSE_STOP 4
|
||||
#define UTRACE_LOAD_OBJECT 5
|
||||
#define UTRACE_UNLOAD_OBJECT 6
|
||||
#define UTRACE_ADD_RUNDEP 7
|
||||
#define UTRACE_PRELOAD_FINISHED 8
|
||||
#define UTRACE_INIT_CALL 9
|
||||
#define UTRACE_FINI_CALL 10
|
||||
#define UTRACE_DLSYM_START 11
|
||||
#define UTRACE_DLSYM_STOP 12
|
||||
|
||||
struct utrace_rtld {
|
||||
char sig[4]; /* 'RTLD' */
|
||||
int event;
|
||||
void *handle;
|
||||
void *mapbase;
|
||||
size_t mapsize;
|
||||
int refcnt;
|
||||
char name[MAXPATHLEN];
|
||||
};
|
||||
#include "rtld_utrace.h"
|
||||
|
||||
#ifdef __LP64__
|
||||
struct utrace_rtld32 {
|
||||
char sig[4]; /* 'RTLD' */
|
||||
char sig[4];
|
||||
int event;
|
||||
uint32_t handle;
|
||||
uint32_t mapbase;
|
||||
@ -189,10 +167,11 @@ sysdecode_utrace(FILE *fp, void *p, size_t len)
|
||||
struct utrace_malloc um;
|
||||
struct utrace_malloc32 *pm;
|
||||
#endif
|
||||
static const char rtld_utrace_sig[RTLD_UTRACE_SIG_SZ] = RTLD_UTRACE_SIG;
|
||||
|
||||
if (len == sizeof(struct utrace_rtld) && bcmp(p, "RTLD", 4) == 0) {
|
||||
if (len == sizeof(struct utrace_rtld) && bcmp(p, rtld_utrace_sig,
|
||||
sizeof(rtld_utrace_sig)) == 0)
|
||||
return (print_utrace_rtld(fp, p));
|
||||
}
|
||||
|
||||
if (len == sizeof(struct utrace_malloc)) {
|
||||
print_utrace_malloc(fp, p);
|
||||
@ -200,7 +179,8 @@ sysdecode_utrace(FILE *fp, void *p, size_t len)
|
||||
}
|
||||
|
||||
#ifdef __LP64__
|
||||
if (len == sizeof(struct utrace_rtld32) && bcmp(p, "RTLD", 4) == 0) {
|
||||
if (len == sizeof(struct utrace_rtld32) && bcmp(p, rtld_utrace_sig,
|
||||
sizeof(rtld_utrace_sig)) == 0) {
|
||||
pr = p;
|
||||
memset(&ur, 0, sizeof(ur));
|
||||
memcpy(ur.sig, pr->sig, sizeof(ur.sig));
|
||||
|
||||
@ -59,6 +59,7 @@
|
||||
#include "paths.h"
|
||||
#include "rtld_tls.h"
|
||||
#include "rtld_printf.h"
|
||||
#include "rtld_utrace.h"
|
||||
#include "notes.h"
|
||||
|
||||
/* Types. */
|
||||
@ -273,29 +274,6 @@ char *ld_env_prefix = LD_;
|
||||
(dlp)->num_alloc = obj_count, \
|
||||
(dlp)->num_used = 0)
|
||||
|
||||
#define UTRACE_DLOPEN_START 1
|
||||
#define UTRACE_DLOPEN_STOP 2
|
||||
#define UTRACE_DLCLOSE_START 3
|
||||
#define UTRACE_DLCLOSE_STOP 4
|
||||
#define UTRACE_LOAD_OBJECT 5
|
||||
#define UTRACE_UNLOAD_OBJECT 6
|
||||
#define UTRACE_ADD_RUNDEP 7
|
||||
#define UTRACE_PRELOAD_FINISHED 8
|
||||
#define UTRACE_INIT_CALL 9
|
||||
#define UTRACE_FINI_CALL 10
|
||||
#define UTRACE_DLSYM_START 11
|
||||
#define UTRACE_DLSYM_STOP 12
|
||||
|
||||
struct utrace_rtld {
|
||||
char sig[4]; /* 'RTLD' */
|
||||
int event;
|
||||
void *handle;
|
||||
void *mapbase; /* Used for 'parent' and 'init/fini' */
|
||||
size_t mapsize;
|
||||
int refcnt; /* Used for 'mode' */
|
||||
char name[MAXPATHLEN];
|
||||
};
|
||||
|
||||
#define LD_UTRACE(e, h, mb, ms, r, n) do { \
|
||||
if (ld_utrace != NULL) \
|
||||
ld_utrace_log(e, h, mb, ms, r, n); \
|
||||
@ -306,11 +284,9 @@ ld_utrace_log(int event, void *handle, void *mapbase, size_t mapsize,
|
||||
int refcnt, const char *name)
|
||||
{
|
||||
struct utrace_rtld ut;
|
||||
static const char rtld_utrace_sig[RTLD_UTRACE_SIG_SZ] = RTLD_UTRACE_SIG;
|
||||
|
||||
ut.sig[0] = 'R';
|
||||
ut.sig[1] = 'T';
|
||||
ut.sig[2] = 'L';
|
||||
ut.sig[3] = 'D';
|
||||
memcpy(ut.sig, rtld_utrace_sig, sizeof(ut.sig));
|
||||
ut.event = event;
|
||||
ut.handle = handle;
|
||||
ut.mapbase = mapbase;
|
||||
|
||||
62
libexec/rtld-elf/rtld_utrace.h
Normal file
62
libexec/rtld-elf/rtld_utrace.h
Normal file
@ -0,0 +1,62 @@
|
||||
/*-
|
||||
* Copyright (c) 2007 John Baldwin
|
||||
*
|
||||
* 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.
|
||||
* 4. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY 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.
|
||||
*
|
||||
* $FreeBSD$
|
||||
*/
|
||||
|
||||
#ifndef RTLD_UTRACE_H
|
||||
#define RTLD_UTRACE_H
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
#define UTRACE_DLOPEN_START 1
|
||||
#define UTRACE_DLOPEN_STOP 2
|
||||
#define UTRACE_DLCLOSE_START 3
|
||||
#define UTRACE_DLCLOSE_STOP 4
|
||||
#define UTRACE_LOAD_OBJECT 5
|
||||
#define UTRACE_UNLOAD_OBJECT 6
|
||||
#define UTRACE_ADD_RUNDEP 7
|
||||
#define UTRACE_PRELOAD_FINISHED 8
|
||||
#define UTRACE_INIT_CALL 9
|
||||
#define UTRACE_FINI_CALL 10
|
||||
#define UTRACE_DLSYM_START 11
|
||||
#define UTRACE_DLSYM_STOP 12
|
||||
|
||||
#define RTLD_UTRACE_SIG_SZ 4
|
||||
#define RTLD_UTRACE_SIG "RTLD"
|
||||
|
||||
struct utrace_rtld {
|
||||
char sig[RTLD_UTRACE_SIG_SZ];
|
||||
int event;
|
||||
void *handle;
|
||||
void *mapbase; /* Used for 'parent' and 'init/fini' */
|
||||
size_t mapsize;
|
||||
int refcnt; /* Used for 'mode' */
|
||||
char name[MAXPATHLEN];
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
x
Reference in New Issue
Block a user