From: Chris Johns <chr...@rtems.org>
- Update linker_set.h to the latest from libbsd so the linker
scripts work.
- Add a sysctl command to check on sysctls
- Add set defines to the networking stack
---
netsources.py | 1 +
rtems/rtems_bsdnet.h | 1 +
rtems/rtems_glue.c | 7 +-
rtems/rtems_showsysctl.c | 1340 ++++++++++++++++++++++++++++++++++
sys/linker_set.h | 131 +++-
testsuites/telnetd02/init.c | 4 +
testsuites/telnetd02/wscript | 1 +
7 files changed, 1455 insertions(+), 30 deletions(-)
create mode 100755 rtems/rtems_showsysctl.c
diff --git a/netsources.py b/netsources.py
index 54dbbf1..550c741 100644
--- a/netsources.py
+++ b/netsources.py
@@ -46,6 +46,7 @@ class source:
'rtems/rtems_showipstat.c',
'rtems/rtems_showmbuf.c',
'rtems/rtems_showroute.c',
+ 'rtems/rtems_showsysctl.c',
'rtems/rtems_showtcpstat.c',
'rtems/rtems_showudpstat.c',
'rtems/rtems_socketpair.c',
diff --git a/rtems/rtems_bsdnet.h b/rtems/rtems_bsdnet.h
index 4607f42..9bd3dee 100644
--- a/rtems/rtems_bsdnet.h
+++ b/rtems/rtems_bsdnet.h
@@ -48,6 +48,7 @@ void rtems_bsdnet_show_ip_stats (void);
void rtems_bsdnet_show_icmp_stats (void);
void rtems_bsdnet_show_udp_stats (void);
void rtems_bsdnet_show_tcp_stats (void);
+int rtems_shell_main_sysctl(int argc, char *argv[]);
/*
* Network configuration
diff --git a/rtems/rtems_glue.c b/rtems/rtems_glue.c
index ee6c8f5..e05a2c4 100644
--- a/rtems/rtems_glue.c
+++ b/rtems/rtems_glue.c
@@ -14,6 +14,7 @@
#include <rtems.h>
#include <rtems/libio.h>
#include <rtems/error.h>
+#include <sys/linker_set.h>
#include <rtems/thread.h>
#include <rtems/rtems_bsdnet.h>
#include <sys/types.h>
@@ -56,6 +57,11 @@ static size_t networkDaemonCpusetSize = 0;
#endif
static void networkDaemon (void *task_argument);
+/*
+ * SYSCTL data
+ */
+RTEMS_BSD_DEFINE_SET(sysctl_set, struct sysctl_oid *);
+
/*
* Network timing
*/
@@ -1261,4 +1267,3 @@ m_clalloc(int ncl, int nowait)
}
return 1;
}
-
diff --git a/rtems/rtems_showsysctl.c b/rtems/rtems_showsysctl.c
new file mode 100755
index 0000000..cf3d6e2
--- /dev/null
+++ b/rtems/rtems_showsysctl.c
@@ -0,0 +1,1340 @@
+#include <machine/rtems-bsd-kernel-space.h>
+
+/*-
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (c) 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.
+ * 3. 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.
+ */
+
+#ifndef lint
+static const char copyright[] =
+"@(#) Copyright (c) 1993\n\
+ The Regents of the University of California. All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+#if 0
+static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
+#endif /* not lint */
+
+#ifdef __rtems__
+#define __need_getopt_newlib
+#include <getopt.h>
+#include <rtems/shell.h>
+#include <setjmp.h>
+#define CHAR_BIT 8
+#endif /* __rtems__ */
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+
+#ifdef __amd64__
+#include <sys/efi.h>
+#include <machine/metadata.h>
+#endif
+
+#if defined(__amd64__) || defined(__i386__)
+#ifndef __rtems__
+#include <machine/pc/bios.h>
+#endif /* __rtems__ */
+#endif
+
+#include <assert.h>
+#include <ctype.h>
+#ifndef __rtems__
+#include <err.h>
+#endif /* __rtems__ */
+#include <errno.h>
+#include <inttypes.h>
+#include <locale.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#ifndef __rtems__
+#include <sysexits.h>
+#endif /* __rtems__ */
+#include <unistd.h>
+
+#ifndef __rtems__
+static const char *conffile;
+
+static int aflag, bflag, Bflag, dflag, eflag, hflag, iflag;
+static int Nflag, nflag, oflag, qflag, tflag, Tflag, Wflag, xflag;
+#endif /* __rtems__ */
+
+static int oidfmt(int *, int, char *, u_int *);
+static int parsefile(const char *);
+static int parse(const char *, int);
+static int show_var(int *, int);
+static int sysctl_all(int *oid, int len);
+static int name2oid(const char *, int *);
+
+static int strIKtoi(const char *, char **, const char *);
+
+static const int ctl_sign[CTLTYPE+1] = {
+ [CTLTYPE_INT] = 1,
+ [CTLTYPE_LONG] = 1,
+#ifndef __rtems__
+ [CTLTYPE_S8] = 1,
+ [CTLTYPE_S16] = 1,
+ [CTLTYPE_S32] = 1,
+ [CTLTYPE_S64] = 1,
+#endif /* __rtems__ */
+};
+
+static int ctl_size[CTLTYPE+1] = {
+ [CTLTYPE_INT] = sizeof(int),
+ [CTLTYPE_UINT] = sizeof(u_int),
+ [CTLTYPE_LONG] = sizeof(long),
+ [CTLTYPE_ULONG] = sizeof(u_long),
+#ifndef __rtems__
+ [CTLTYPE_S8] = sizeof(int8_t),
+ [CTLTYPE_S16] = sizeof(int16_t),
+ [CTLTYPE_S32] = sizeof(int32_t),
+ [CTLTYPE_S64] = sizeof(int64_t),
+ [CTLTYPE_U8] = sizeof(uint8_t),
+ [CTLTYPE_U16] = sizeof(uint16_t),
+ [CTLTYPE_U32] = sizeof(uint32_t),
+ [CTLTYPE_U64] = sizeof(uint64_t),
+#endif /* __rtems__ */
+};
+
+static const char *ctl_typename[CTLTYPE+1] = {
+ [CTLTYPE_INT] = "integer",
+ [CTLTYPE_UINT] = "unsigned integer",
+ [CTLTYPE_LONG] = "long integer",
+ [CTLTYPE_ULONG] = "unsigned long",
+#ifndef __rtems__
+ [CTLTYPE_U8] = "uint8_t",
+ [CTLTYPE_U16] = "uint16_t",
+ [CTLTYPE_U32] = "uint32_t",
+ [CTLTYPE_U64] = "uint64_t",
+ [CTLTYPE_S8] = "int8_t",
+ [CTLTYPE_S16] = "int16_t",
+ [CTLTYPE_S32] = "int32_t",
+ [CTLTYPE_S64] = "int64_t",
+#endif /* __rtems__ */
+ [CTLTYPE_NODE] = "node",
+ [CTLTYPE_STRING] = "string",
+ [CTLTYPE_OPAQUE] = "opaque",
+};
+
+#ifdef __rtems__
+static int main(int argc, char *argv[]);
+
+typedef struct {
+ const char *conffile;
+
+ int aflag, bflag, Bflag, dflag, eflag, hflag, iflag;
+ int Nflag, nflag, oflag, qflag, tflag, Tflag, Wflag, xflag;
+ int exit_code;
+ jmp_buf exit_jmp;
+} rtems_shell_sysctl_globals;
+
+void
+rtems_shell_sysctl_exit (rtems_shell_sysctl_globals* globals, int code)
+{
+ longjmp (globals->exit_jmp, 1);
+}
+
+/* only run this command one at a time */
+static rtems_shell_sysctl_globals _globals;
+
+#define conffile _globals.conffile
+
+#define aflag _globals.aflag
+#define bflag _globals.bflag
+#define Bflag _globals.Bflag
+#define dflag _globals.dflag
+#define eflag _globals.eflag
+#define hflag _globals.hflag
+#define iflag _globals.iflag
+#define Nflag _globals.Nflag
+#define nflag _globals.nflag
+#define oflag _globals.oflag
+#define qflag _globals.qflag
+#define tflag _globals.tflag
+#define Tflag _globals.Tflag
+#define Wflag _globals.Wflag
+#define xflag _globals.xflag
+
+#define err(e, s, ...) \
+ do { printf("error: %d " #s "\n", e, ## __VA_ARGS__); exit(e); } while (0)
+#define warn(s, ...) printf("warning: " #s "\n", ## __VA_ARGS__); return
+#define warnx(s, ...) printf("warning: " #s "\n", ## __VA_ARGS__); return
+#define EX_NOINPUT 1
+
+int
+rtems_shell_main_sysctl(int argc, char *argv[])
+{
+ int ec = 1;
+ memset (&_globals, 0, sizeof (_globals));
+ _globals.exit_code = 1;
+ if (setjmp (_globals.exit_jmp) == 0)
+ ec = main(argc, argv);
+ else
+ ec = _globals.exit_code;
+ fflush(stdout);
+ return ec;
+}
+#undef exit
+#define exit(rc) rtems_shell_sysctl_exit(&_globals, rc)
+
+#endif /* __rtems__ */
+static void
+usage(void)
+{
+
+ (void)fprintf(stderr, "%s\n%s\n",
+ "usage: sysctl [-bdehiNnoqTtWx] [ -B <bufsize> ] [-f filename]
name[=value] ...",
+ " sysctl [-bdehNnoqTtWx] [ -B <bufsize> ] -a");
+ exit(1);
+}
+
+int
+main(int argc, char **argv)
+{
+ int ch;
+ int warncount = 0;
+#ifdef __rtems__
+ struct getopt_data getopt_data;
+ memset(&getopt_data, 0, sizeof(getopt_data));
+#define optind getopt_data.optind
+#define optarg getopt_data.optarg
+#define opterr getopt_data.opterr
+#define optopt getopt_data.optopt
+#define getopt(argc, argv, opt) getopt_r(argc, argv, "+" opt, &getopt_data)
+#endif /* __rtems__ */
+
+ setlocale(LC_NUMERIC, "");
+ setbuf(stdout,0);
+ setbuf(stderr,0);
+
+ while ((ch = getopt(argc, argv, "AabB:def:hiNnoqtTwWxX")) != -1) {
+ switch (ch) {
+ case 'A':
+ /* compatibility */
+ aflag = oflag = 1;
+ break;
+ case 'a':
+ aflag = 1;
+ break;
+ case 'b':
+ bflag = 1;
+ break;
+ case 'B':
+ Bflag = strtol(optarg, NULL, 0);
+ break;
+ case 'd':
+ dflag = 1;
+ break;
+ case 'e':
+ eflag = 1;
+ break;
+ case 'f':
+ conffile = optarg;
+ break;
+ case 'h':
+ hflag = 1;
+ break;
+ case 'i':
+ iflag = 1;
+ break;
+ case 'N':
+ Nflag = 1;
+ break;
+ case 'n':
+ nflag = 1;
+ break;
+ case 'o':
+ oflag = 1;
+ break;
+ case 'q':
+ qflag = 1;
+ break;
+ case 't':
+ tflag = 1;
+ break;
+ case 'T':
+ Tflag = 1;
+ break;
+ case 'w':
+ /* compatibility */
+ /* ignored */
+ break;
+ case 'W':
+ Wflag = 1;
+ break;
+ case 'X':
+ /* compatibility */
+ aflag = xflag = 1;
+ break;
+ case 'x':
+ xflag = 1;
+ break;
+ default:
+ usage();
+ }
+ }
+ argc -= optind;
+ argv += optind;
+
+ if (Nflag && nflag)
+ usage();
+ if (aflag && argc == 0)
+ exit(sysctl_all(0, 0));
+ if (argc == 0 && conffile == NULL)
+ usage();
+
+ warncount = 0;
+ if (conffile != NULL)
+ warncount += parsefile(conffile);
+
+ while (argc-- > 0)
+ warncount += parse(*argv++, 0);
+
+ return (warncount);
+}
+
+/*
+ * Parse a single numeric value, append it to 'newbuf', and update
+ * 'newsize'. Returns true if the value was parsed and false if the
+ * value was invalid. Non-numeric types (strings) are handled
+ * directly in parse().
+ */
+static bool
+parse_numeric(const char *newvalstr, const char *fmt, u_int kind,
+ void **newbufp, size_t *newsizep)
+{
+ void *newbuf;
+ const void *newval;
+ int8_t i8val;
+ uint8_t u8val;
+ int16_t i16val;
+ uint16_t u16val;
+ int32_t i32val;
+ uint32_t u32val;
+ int intval;
+ unsigned int uintval;
+ long longval;
+ unsigned long ulongval;
+ int64_t i64val;
+ uint64_t u64val;
+ size_t valsize;
+ char *endptr = NULL;
+
+ errno = 0;
+
+ switch (kind & CTLTYPE) {
+ case CTLTYPE_INT:
+ if (strncmp(fmt, "IK", 2) == 0)
+ intval = strIKtoi(newvalstr, &endptr, fmt);
+ else
+ intval = (int)strtol(newvalstr, &endptr, 0);
+ newval = &intval;
+ valsize = sizeof(intval);
+ break;
+ case CTLTYPE_UINT:
+ uintval = (int) strtoul(newvalstr, &endptr, 0);
+ newval = &uintval;
+ valsize = sizeof(uintval);
+ break;
+ case CTLTYPE_LONG:
+ longval = strtol(newvalstr, &endptr, 0);
+ newval = &longval;
+ valsize = sizeof(longval);
+ break;
+ case CTLTYPE_ULONG:
+ ulongval = strtoul(newvalstr, &endptr, 0);
+ newval = &ulongval;
+ valsize = sizeof(ulongval);
+ break;
+#ifndef __rtems__
+ case CTLTYPE_S8:
+ i8val = (int8_t)strtol(newvalstr, &endptr, 0);
+ newval = &i8val;
+ valsize = sizeof(i8val);
+ break;
+ case CTLTYPE_S16:
+ i16val = (int16_t)strtol(newvalstr, &endptr, 0);
+ newval = &i16val;
+ valsize = sizeof(i16val);
+ break;
+ case CTLTYPE_S32:
+ i32val = (int32_t)strtol(newvalstr, &endptr, 0);
+ newval = &i32val;
+ valsize = sizeof(i32val);
+ break;
+ case CTLTYPE_S64:
+ i64val = strtoimax(newvalstr, &endptr, 0);
+ newval = &i64val;
+ valsize = sizeof(i64val);
+ break;
+ case CTLTYPE_U8:
+ u8val = (uint8_t)strtoul(newvalstr, &endptr, 0);
+ newval = &u8val;
+ valsize = sizeof(u8val);
+ break;
+ case CTLTYPE_U16:
+ u16val = (uint16_t)strtoul(newvalstr, &endptr, 0);
+ newval = &u16val;
+ valsize = sizeof(u16val);
+ break;
+ case CTLTYPE_U32:
+ u32val = (uint32_t)strtoul(newvalstr, &endptr, 0);
+ newval = &u32val;
+ valsize = sizeof(u32val);
+ break;
+ case CTLTYPE_U64:
+ u64val = strtoumax(newvalstr, &endptr, 0);
+ newval = &u64val;
+ valsize = sizeof(u64val);
+ break;
+#endif /* __rtems__ */
+ default:
+ /* NOTREACHED */
+ abort();
+ }
+
+ if (errno != 0 || endptr == newvalstr ||
+ (endptr != NULL && *endptr != '\0'))
+ return (false);
+
+ newbuf = realloc(*newbufp, *newsizep + valsize);
+ if (newbuf == NULL)
+ err(1, "out of memory");
+ memcpy((char *)newbuf + *newsizep, newval, valsize);
+ *newbufp = newbuf;
+ *newsizep += valsize;
+
+ return (true);
+}
+
+/*
+ * Parse a name into a MIB entry.
+ * Lookup and print out the MIB entry if it exists.
+ * Set a new value if requested.
+ */
+static int
+parse(const char *string, int lineno)
+{
+ int len, i, j;
+ const void *newval;
+ char *newvalstr = NULL;
+ void *newbuf;
+ size_t newsize = Bflag;
+ int mib[CTL_MAXNAME];
+ char *cp, *bufp, buf[BUFSIZ], fmt[BUFSIZ], line[BUFSIZ];
+ u_int kind;
+
+ if (lineno)
+ snprintf(line, sizeof(line), " at line %d", lineno);
+ else
+ line[0] = '\0';
+
+ cp = buf;
+ if (snprintf(buf, BUFSIZ, "%s", string) >= BUFSIZ) {
+ warnx("oid too long: '%s'%s", string, line);
+ return (1);
+ }
+ bufp = strsep(&cp, "=:");
+ if (cp != NULL) {
+ /* Tflag just lists tunables, do not allow assignment */
+ if (Tflag || Wflag) {
+ warnx("Can't set variables when using -T or -W");
+ usage();
+ }
+ while (isspace(*cp))
+ cp++;
+ /* Strip a pair of " or ' if any. */
+ switch (*cp) {
+ case '\"':
+ case '\'':
+ if (cp[strlen(cp) - 1] == *cp)
+ cp[strlen(cp) - 1] = '\0';
+ cp++;
+ }
+ newvalstr = cp;
+ newsize = strlen(cp);
+ }
+ /* Trim spaces */
+ cp = bufp + strlen(bufp) - 1;
+ while (cp >= bufp && isspace((int)*cp)) {
+ *cp = '\0';
+ cp--;
+ }
+ len = name2oid(bufp, mib);
+
+ if (len < 0) {
+ if (iflag)
+ return (0);
+ if (qflag)
+ return (1);
+ else {
+ if (errno == ENOENT) {
+ warnx("unknown oid '%s'%s", bufp, line);
+ } else {
+ warn("unknown oid '%s'%s", bufp, line);
+ }
+ return (1);
+ }
+ }
+
+ if (oidfmt(mib, len, fmt, &kind)) {
+ warn("couldn't find format of oid '%s'%s", bufp, line);
+ if (iflag)
+ return (1);
+ else
+ exit(1);
+ }
+
+ if (newvalstr == NULL || dflag) {
+ if ((kind & CTLTYPE) == CTLTYPE_NODE) {
+ if (dflag) {
+ i = show_var(mib, len);
+ if (!i && !bflag)
+ putchar('\n');
+ }
+ sysctl_all(mib, len);
+ } else {
+ i = show_var(mib, len);
+ if (!i && !bflag)
+ putchar('\n');
+ }
+ } else {
+ if ((kind & CTLTYPE) == CTLTYPE_NODE) {
+ warnx("oid '%s' isn't a leaf node%s", bufp, line);
+ return (1);
+ }
+
+ if (!(kind & CTLFLAG_WR)) {
+ if (kind & CTLFLAG_TUN) {
+ warnx("oid '%s' is a read only tunable%s",
bufp, line);
+ warnx("Tunable values are set in
/boot/loader.conf");
+ } else
+ warnx("oid '%s' is read only%s", bufp, line);
+ return (1);
+ }
+
+ switch (kind & CTLTYPE) {
+ case CTLTYPE_INT:
+ case CTLTYPE_UINT:
+ case CTLTYPE_LONG:
+ case CTLTYPE_ULONG:
+#ifndef __rtems__
+ case CTLTYPE_S8:
+ case CTLTYPE_S16:
+ case CTLTYPE_S32:
+ case CTLTYPE_S64:
+ case CTLTYPE_U8:
+ case CTLTYPE_U16:
+ case CTLTYPE_U32:
+ case CTLTYPE_U64:
+#endif /* __rtems__ */
+ if (strlen(newvalstr) == 0) {
+ warnx("empty numeric value");
+ return (1);
+ }
+ /* FALLTHROUGH */
+ case CTLTYPE_STRING:
+ break;
+ default:
+ warnx("oid '%s' is type %d,"
+ " cannot set that%s", bufp,
+ kind & CTLTYPE, line);
+ return (1);
+ }
+
+ newbuf = NULL;
+
+ switch (kind & CTLTYPE) {
+ case CTLTYPE_STRING:
+ newval = newvalstr;
+ break;
+ default:
+ newsize = 0;
+ while ((cp = strsep(&newvalstr, " ,")) != NULL) {
+ if (*cp == '\0')
+ continue;
+ if (!parse_numeric(cp, fmt, kind, &newbuf,
+ &newsize)) {
+ warnx("invalid %s '%s'%s",
+ ctl_typename[kind & CTLTYPE],
+ cp, line);
+ free(newbuf);
+ return (1);
+ }
+ }
+ newval = newbuf;
+ break;
+ }
+
+ i = show_var(mib, len);
+ if (sysctl(mib, len, 0, 0, newval, newsize) == -1) {
+ free(newbuf);
+ if (!i && !bflag)
+ putchar('\n');
+ switch (errno) {
+ case EOPNOTSUPP:
+ warnx("%s: value is not available%s",
+ string, line);
+ return (1);
+ case ENOTDIR:
+ warnx("%s: specification is incomplete%s",
+ string, line);
+ return (1);
+ case ENOMEM:
+ warnx("%s: type is unknown to this program%s",
+ string, line);
+ return (1);
+ default:
+ warn("%s%s", string, line);
+ return (1);
+ }
+ }
+ free(newbuf);
+ if (!bflag)
+ printf(" -> ");
+ i = nflag;
+ nflag = 1;
+ j = show_var(mib, len);
+ if (!j && !bflag)
+ putchar('\n');
+ nflag = i;
+ }
+
+ return (0);
+}
+
+static int
+parsefile(const char *filename)
+{
+ FILE *file;
+ char line[BUFSIZ], *p, *pq, *pdq;
+ int warncount = 0, lineno = 0;
+
+ file = fopen(filename, "r");
+ if (file == NULL)
+ err(EX_NOINPUT, "%s", filename);
+ while (fgets(line, sizeof(line), file) != NULL) {
+ lineno++;
+ p = line;
+ pq = strchr(line, '\'');
+ pdq = strchr(line, '\"');
+ /* Replace the first # with \0. */
+ while((p = strchr(p, '#')) != NULL) {
+ if (pq != NULL && p > pq) {
+ if ((p = strchr(pq+1, '\'')) != NULL)
+ *(++p) = '\0';
+ break;
+ } else if (pdq != NULL && p > pdq) {
+ if ((p = strchr(pdq+1, '\"')) != NULL)
+ *(++p) = '\0';
+ break;
+ } else if (p == line || *(p-1) != '\\') {
+ *p = '\0';
+ break;
+ }
+ p++;
+ }
+ /* Trim spaces */
+ p = line + strlen(line) - 1;
+ while (p >= line && isspace((int)*p)) {
+ *p = '\0';
+ p--;
+ }
+ p = line;
+ while (isspace((int)*p))
+ p++;
+ if (*p == '\0')
+ continue;
+ else
+ warncount += parse(p, lineno);
+ }
+ fclose(file);
+
+ return (warncount);
+}
+
+/* These functions will dump out various interesting structures. */
+
+#ifndef __rtems__
+static int
+S_clockinfo(size_t l2, void *p)
+{
+ struct clockinfo *ci = (struct clockinfo*)p;
+
+ if (l2 != sizeof(*ci)) {
+ warnx("S_clockinfo %zu != %zu", l2, sizeof(*ci));
+ return (1);
+ }
+ printf(hflag ? "{ hz = %'d, tick = %'d, profhz = %'d, stathz = %'d }" :
+ "{ hz = %d, tick = %d, profhz = %d, stathz = %d }",
+ ci->hz, ci->tick, ci->profhz, ci->stathz);
+ return (0);
+}
+#endif /* __rtems__ */
+
+static int
+S_loadavg(size_t l2, void *p)
+{
+#ifndef __rtems__
+ struct loadavg *tv = (struct loadavg*)p;
+
+ if (l2 != sizeof(*tv)) {
+ warnx("S_loadavg %zu != %zu", l2, sizeof(*tv));
+ return (1);
+ }
+ printf(hflag ? "{ %'.2f %'.2f %'.2f }" : "{ %.2f %.2f %.2f }",
+ (double)tv->ldavg[0]/(double)tv->fscale,
+ (double)tv->ldavg[1]/(double)tv->fscale,
+ (double)tv->ldavg[2]/(double)tv->fscale);
+#endif /* __rtems__ */
+ return (0);
+}
+
+static int
+S_timeval(size_t l2, void *p)
+{
+ struct timeval *tv = (struct timeval*)p;
+ time_t tv_sec;
+ char *p1, *p2;
+
+ if (l2 != sizeof(*tv)) {
+ warnx("S_timeval %zu != %zu", l2, sizeof(*tv));
+ return (1);
+ }
+ printf(hflag ? "{ sec = %'jd, usec = %'ld } " :
+ "{ sec = %jd, usec = %ld } ",
+ (intmax_t)tv->tv_sec, tv->tv_usec);
+ tv_sec = tv->tv_sec;
+ p1 = strdup(ctime(&tv_sec));
+ for (p2=p1; *p2 ; p2++)
+ if (*p2 == '\n')
+ *p2 = '\0';
+ fputs(p1, stdout);
+ free(p1);
+ return (0);
+}
+
+static int
+S_vmtotal(size_t l2, void *p)
+{
+#ifndef __rtems__
+ struct vmtotal *v;
+ int pageKilo;
+
+ if (l2 != sizeof(*v)) {
+ warnx("S_vmtotal %zu != %zu", l2, sizeof(*v));
+ return (1);
+ }
+
+ v = p;
+ pageKilo = getpagesize() / 1024;
+
+#define pg2k(a) ((uintmax_t)(a) * pageKilo)
+ printf("\nSystem wide totals computed every five seconds:"
+ " (values in kilobytes)\n");
+ printf("===============================================\n");
+ printf("Processes:\t\t(RUNQ: %d Disk Wait: %d Page Wait: "
+ "%d Sleep: %d)\n",
+ v->t_rq, v->t_dw, v->t_pw, v->t_sl);
+ printf("Virtual Memory:\t\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_vm), pg2k(v->t_avm));
+ printf("Real Memory:\t\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_rm), pg2k(v->t_arm));
+ printf("Shared Virtual Memory:\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_vmshr), pg2k(v->t_avmshr));
+ printf("Shared Real Memory:\t(Total: %juK Active: %juK)\n",
+ pg2k(v->t_rmshr), pg2k(v->t_armshr));
+ printf("Free Memory:\t%juK", pg2k(v->t_free));
+#endif /* __rtems__ */
+ return (0);
+}
+
+static int
+S_input_id(size_t l2, void *p)
+{
+#ifndef __rtems__
+ struct input_id *id = p;
+
+ if (l2 != sizeof(*id)) {
+ warnx("S_input_id %zu != %zu", l2, sizeof(*id));
+ return (1);
+ }
+
+ printf("{ bustype = 0x%04x, vendor = 0x%04x, "
+ "product = 0x%04x, version = 0x%04x }",
+ id->bustype, id->vendor, id->product, id->version);
+#endif /* __rtems__ */
+ return (0);
+}
+
+#ifdef __amd64__
+static int
+S_efi_map(size_t l2, void *p)
+{
+ struct efi_map_header *efihdr;
+ struct efi_md *map;
+ const char *type;
+ size_t efisz;
+ int ndesc, i;
+
+ static const char * const types[] = {
+ [EFI_MD_TYPE_NULL] = "Reserved",
+ [EFI_MD_TYPE_CODE] = "LoaderCode",
+ [EFI_MD_TYPE_DATA] = "LoaderData",
+ [EFI_MD_TYPE_BS_CODE] = "BootServicesCode",
+ [EFI_MD_TYPE_BS_DATA] = "BootServicesData",
+ [EFI_MD_TYPE_RT_CODE] = "RuntimeServicesCode",
+ [EFI_MD_TYPE_RT_DATA] = "RuntimeServicesData",
+ [EFI_MD_TYPE_FREE] = "ConventionalMemory",
+ [EFI_MD_TYPE_BAD] = "UnusableMemory",
+ [EFI_MD_TYPE_RECLAIM] = "ACPIReclaimMemory",
+ [EFI_MD_TYPE_FIRMWARE] = "ACPIMemoryNVS",
+ [EFI_MD_TYPE_IOMEM] = "MemoryMappedIO",
+ [EFI_MD_TYPE_IOPORT] = "MemoryMappedIOPortSpace",
+ [EFI_MD_TYPE_PALCODE] = "PalCode",
+ [EFI_MD_TYPE_PERSISTENT] = "PersistentMemory",
+ };
+
+ /*
+ * Memory map data provided by UEFI via the GetMemoryMap
+ * Boot Services API.
+ */
+ if (l2 < sizeof(*efihdr)) {
+ warnx("S_efi_map length less than header");
+ return (1);
+ }
+ efihdr = p;
+ efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf;
+ map = (struct efi_md *)((uint8_t *)efihdr + efisz);
+
+ if (efihdr->descriptor_size == 0)
+ return (0);
+ if (l2 != efisz + efihdr->memory_size) {
+ warnx("S_efi_map length mismatch %zu vs %zu", l2, efisz +
+ efihdr->memory_size);
+ return (1);
+ }
+ ndesc = efihdr->memory_size / efihdr->descriptor_size;
+
+ printf("\n%23s %12s %12s %8s %4s",
+ "Type", "Physical", "Virtual", "#Pages", "Attr");
+
+ for (i = 0; i < ndesc; i++,
+ map = efi_next_descriptor(map, efihdr->descriptor_size)) {
+ type = NULL;
+ if (map->md_type < nitems(types))
+ type = types[map->md_type];
+ if (type == NULL)
+ type = "<INVALID>";
+ printf("\n%23s %012jx %12p %08jx ", type,
+ (uintmax_t)map->md_phys, map->md_virt,
+ (uintmax_t)map->md_pages);
+ if (map->md_attr & EFI_MD_ATTR_UC)
+ printf("UC ");
+ if (map->md_attr & EFI_MD_ATTR_WC)
+ printf("WC ");
+ if (map->md_attr & EFI_MD_ATTR_WT)
+ printf("WT ");
+ if (map->md_attr & EFI_MD_ATTR_WB)
+ printf("WB ");
+ if (map->md_attr & EFI_MD_ATTR_UCE)
+ printf("UCE ");
+ if (map->md_attr & EFI_MD_ATTR_WP)
+ printf("WP ");
+ if (map->md_attr & EFI_MD_ATTR_RP)
+ printf("RP ");
+ if (map->md_attr & EFI_MD_ATTR_XP)
+ printf("XP ");
+ if (map->md_attr & EFI_MD_ATTR_RT)
+ printf("RUNTIME");
+ }
+ return (0);
+}
+#endif
+
+#if defined(__amd64__) || defined(__i386__)
+#ifndef __rtems__
+static int
+S_bios_smap_xattr(size_t l2, void *p)
+{
+ struct bios_smap_xattr *smap, *end;
+
+ if (l2 % sizeof(*smap) != 0) {
+ warnx("S_bios_smap_xattr %zu is not a multiple of %zu", l2,
+ sizeof(*smap));
+ return (1);
+ }
+
+ end = (struct bios_smap_xattr *)((char *)p + l2);
+ for (smap = p; smap < end; smap++)
+ printf("\nSMAP type=%02x, xattr=%02x, base=%016jx, len=%016jx",
+ smap->type, smap->xattr, (uintmax_t)smap->base,
+ (uintmax_t)smap->length);
+ return (0);
+}
+#endif /* __rtems__ */
+#endif
+
+static int
+strIKtoi(const char *str, char **endptrp, const char *fmt)
+{
+ int kelv;
+ float temp;
+ size_t len;
+ const char *p;
+ int prec, i;
+
+ assert(errno == 0);
+
+ len = strlen(str);
+ /* caller already checked this */
+ assert(len > 0);
+
+ /*
+ * A format of "IK" is in deciKelvin. A format of "IK3" is in
+ * milliKelvin. The single digit following IK is log10 of the
+ * multiplying factor to convert Kelvin into the untis of this sysctl,
+ * or the dividing factor to convert the sysctl value to Kelvin. Numbers
+ * larger than 6 will run into precision issues with 32-bit integers.
+ * Characters that aren't ASCII digits after the 'K' are ignored. No
+ * localization is present because this is an interface from the kernel
+ * to this program (eg not an end-user interface), so isdigit() isn't
+ * used here.
+ */
+ if (fmt[2] != '\0' && fmt[2] >= '0' && fmt[2] <= '9')
+ prec = fmt[2] - '0';
+ else
+ prec = 1;
+ p = &str[len - 1];
+ if (*p == 'C' || *p == 'F' || *p == 'K') {
+ temp = strtof(str, endptrp);
+ if (*endptrp != str && *endptrp == p && errno == 0) {
+ if (*p == 'F')
+ temp = (temp - 32) * 5 / 9;
+ *endptrp = NULL;
+ if (*p != 'K')
+ temp += 273.15;
+ for (i = 0; i < prec; i++)
+ temp *= 10.0;
+ return ((int)(temp + 0.5));
+ }
+ } else {
+ /* No unit specified -> treat it as a raw number */
+ kelv = (int)strtol(str, endptrp, 10);
+ if (*endptrp != str && *endptrp == p && errno == 0) {
+ *endptrp = NULL;
+ return (kelv);
+ }
+ }
+
+ errno = ERANGE;
+ return (0);
+}
+
+/*
+ * These functions uses a presently undocumented interface to the kernel
+ * to walk the tree and get the type so it can print the value.
+ * This interface is under work and consideration, and should probably
+ * be killed with a big axe by the first person who can find the time.
+ * (be aware though, that the proper interface isn't as obvious as it
+ * may seem, there are various conflicting requirements.
+ */
+
+static int
+name2oid(const char *name, int *oidp)
+{
+ int oid[2];
+ int i;
+ size_t j;
+
+ oid[0] = 0;
+ oid[1] = 3;
+
+ j = CTL_MAXNAME * sizeof(int);
+ i = sysctl(oid, 2, oidp, &j, name, strlen(name));
+ if (i < 0)
+ return (i);
+ j /= sizeof(int);
+ return (j);
+}
+
+static int
+oidfmt(int *oid, int len, char *fmt, u_int *kind)
+{
+ int qoid[CTL_MAXNAME+2];
+ u_char buf[BUFSIZ];
+ int i;
+ size_t j;
+
+ qoid[0] = 0;
+ qoid[1] = 4;
+ memcpy(qoid + 2, oid, len * sizeof(int));
+
+ j = sizeof(buf);
+ i = sysctl(qoid, len + 2, buf, &j, 0, 0);
+ if (i)
+ err(1, "sysctl fmt %d %zu %d", i, j, errno);
+
+ if (kind)
+ *kind = *(u_int *)buf;
+
+ if (fmt)
+ strcpy(fmt, (char *)(buf + sizeof(u_int)));
+ return (0);
+}
+
+/*
+ * This formats and outputs the value of one variable
+ *
+ * Returns zero if anything was actually output.
+ * Returns one if didn't know what to do with this.
+ * Return minus one if we had errors.
+ */
+static int
+show_var(int *oid, int nlen)
+{
+ u_char buf[BUFSIZ], *val, *oval, *p;
+ char name[BUFSIZ], fmt[BUFSIZ];
+ const char *sep, *sep1, *prntype;
+ int qoid[CTL_MAXNAME+2];
+ uintmax_t umv;
+ intmax_t mv;
+ int i, hexlen, sign, ctltype;
+ size_t intlen;
+ size_t j, len;
+ u_int kind;
+ float base;
+ int (*func)(size_t, void *);
+ int prec;
+
+ /* Silence GCC. */
+ umv = mv = intlen = 0;
+
+ bzero(buf, BUFSIZ);
+ bzero(fmt, BUFSIZ);
+ bzero(name, BUFSIZ);
+ qoid[0] = 0;
+ memcpy(qoid + 2, oid, nlen * sizeof(int));
+
+ qoid[1] = 1;
+ j = sizeof(name);
+ i = sysctl(qoid, nlen + 2, name, &j, 0, 0);
+ if (i || !j)
+ err(1, "sysctl name %d %zu %d", i, j, errno);
+
+ oidfmt(oid, nlen, fmt, &kind);
+ /* if Wflag then only list sysctls that are writeable and not stats. */
+#ifndef __rtems__
+ if (Wflag && ((kind & CTLFLAG_WR) == 0 || (kind & CTLFLAG_STATS) != 0))
+ return 1;
+#endif /* __rtems__ */
+
+ /* if Tflag then only list sysctls that are tuneables. */
+ if (Tflag && (kind & CTLFLAG_TUN) == 0)
+ return 1;
+
+ if (Nflag) {
+ printf("%s", name);
+ return (0);
+ }
+
+ if (eflag)
+ sep = "=";
+ else
+ sep = ": ";
+
+ ctltype = (kind & CTLTYPE);
+ if (tflag || dflag) {
+ if (!nflag)
+ printf("%s%s", name, sep);
+ if (ctl_typename[ctltype] != NULL)
+ prntype = ctl_typename[ctltype];
+ else
+ prntype = "unknown";
+ if (tflag && dflag)
+ printf("%s%s", prntype, sep);
+ else if (tflag) {
+ printf("%s", prntype);
+ return (0);
+ }
+ qoid[1] = 5;
+ j = sizeof(buf);
+ i = sysctl(qoid, nlen + 2, buf, &j, 0, 0);
+ printf("%s", buf);
+ return (0);
+ }
+
+ /* don't fetch opaques that we don't know how to print */
+ if (ctltype == CTLTYPE_OPAQUE) {
+ if (strcmp(fmt, "S,clockinfo") == 0)
+#ifndef __rtems__
+ func = S_clockinfo;
+#else /* __rtems__ */
+ func = NULL;
+#endif /* __rtems__ */
+ else if (strcmp(fmt, "S,timeval") == 0)
+ func = S_timeval;
+ else if (strcmp(fmt, "S,loadavg") == 0)
+ func = S_loadavg;
+ else if (strcmp(fmt, "S,vmtotal") == 0)
+ func = S_vmtotal;
+ else if (strcmp(fmt, "S,input_id") == 0)
+ func = S_input_id;
+#ifdef __amd64__
+ else if (strcmp(fmt, "S,efi_map_header") == 0)
+ func = S_efi_map;
+#endif
+#if defined(__amd64__) || defined(__i386__)
+ else if (strcmp(fmt, "S,bios_smap_xattr") == 0)
+#ifndef __rtems__
+ func = S_bios_smap_xattr;
+#else /* __rtems__ */
+ func = NULL;
+#endif /* __rtems__ */
+#endif
+ else {
+ func = NULL;
+ if (!bflag && !oflag && !xflag)
+ return (1);
+ }
+ }
+
+ /* find an estimate of how much we need for this var */
+ if (Bflag)
+ j = Bflag;
+ else {
+ j = 0;
+ i = sysctl(oid, nlen, 0, &j, 0, 0);
+ j += j; /* we want to be sure :-) */
+ }
+
+ val = oval = malloc(j + 1);
+ if (val == NULL) {
+ warnx("malloc failed");
+ return (1);
+ }
+ len = j;
+ i = sysctl(oid, nlen, val, &len, 0, 0);
+ if (i != 0 || (len == 0 && ctltype != CTLTYPE_STRING)) {
+ free(oval);
+ return (1);
+ }
+
+ if (bflag) {
+ fwrite(val, 1, len, stdout);
+ free(oval);
+ return (0);
+ }
+ val[len] = '\0';
+ p = val;
+ sign = ctl_sign[ctltype];
+ intlen = ctl_size[ctltype];
+
+ switch (ctltype) {
+ case CTLTYPE_STRING:
+ if (!nflag)
+ printf("%s%s", name, sep);
+ printf("%.*s", (int)len, p);
+ free(oval);
+ return (0);
+
+ case CTLTYPE_INT:
+ case CTLTYPE_UINT:
+ case CTLTYPE_LONG:
+ case CTLTYPE_ULONG:
+#ifndef __rtems__
+ case CTLTYPE_S8:
+ case CTLTYPE_S16:
+ case CTLTYPE_S32:
+ case CTLTYPE_S64:
+ case CTLTYPE_U8:
+ case CTLTYPE_U16:
+ case CTLTYPE_U32:
+ case CTLTYPE_U64:
+#endif /* __rtems__ */
+ if (!nflag)
+ printf("%s%s", name, sep);
+ hexlen = 2 + (intlen * CHAR_BIT + 3) / 4;
+ sep1 = "";
+ while (len >= intlen) {
+ switch (kind & CTLTYPE) {
+ case CTLTYPE_INT:
+ case CTLTYPE_UINT:
+ umv = *(u_int *)p;
+ mv = *(int *)p;
+ break;
+ case CTLTYPE_LONG:
+ case CTLTYPE_ULONG:
+ umv = *(u_long *)p;
+ mv = *(long *)p;
+ break;
+#ifndef __rtems__
+ case CTLTYPE_S8:
+ case CTLTYPE_U8:
+ umv = *(uint8_t *)p;
+ mv = *(int8_t *)p;
+ break;
+ case CTLTYPE_S16:
+ case CTLTYPE_U16:
+ umv = *(uint16_t *)p;
+ mv = *(int16_t *)p;
+ break;
+ case CTLTYPE_S32:
+ case CTLTYPE_U32:
+ umv = *(uint32_t *)p;
+ mv = *(int32_t *)p;
+ break;
+ case CTLTYPE_S64:
+ case CTLTYPE_U64:
+ umv = *(uint64_t *)p;
+ mv = *(int64_t *)p;
+ break;
+#endif /* __rtems__ */
+ }
+ fputs(sep1, stdout);
+ if (xflag)
+ printf("%#0*jx", hexlen, umv);
+ else if (!sign)
+ printf(hflag ? "%'ju" : "%ju", umv);
+ else if (fmt[1] == 'K') {
+ if (mv < 0)
+ printf("%jd", mv);
+ else {
+ /*
+ * See strIKtoi for details on fmt.
+ */
+ prec = 1;
+ if (fmt[2] != '\0')
+ prec = fmt[2] - '0';
+ base = 1.0;
+ for (int i = 0; i < prec; i++)
+ base *= 10.0;
+ printf("%.*fC", prec,
+ (float)mv / base - 273.15);
+ }
+ } else
+ printf(hflag ? "%'jd" : "%jd", mv);
+ sep1 = " ";
+ len -= intlen;
+ p += intlen;
+ }
+ free(oval);
+ return (0);
+
+ case CTLTYPE_OPAQUE:
+ i = 0;
+ if (func) {
+ if (!nflag)
+ printf("%s%s", name, sep);
+ i = (*func)(len, p);
+ free(oval);
+ return (i);
+ }
+ /* FALLTHROUGH */
+ default:
+ if (!oflag && !xflag) {
+ free(oval);
+ return (1);
+ }
+ if (!nflag)
+ printf("%s%s", name, sep);
+ printf("Format:%s Length:%zu Dump:0x", fmt, len);
+ while (len-- && (xflag || p < val + 16))
+ printf("%02x", *p++);
+ if (!xflag && len > 16)
+ printf("...");
+ free(oval);
+ return (0);
+ }
+ free(oval);
+ return (1);
+}
+
+static int
+sysctl_all(int *oid, int len)
+{
+ int name1[22], name2[22];
+ int i, j;
+ size_t l1, l2;
+
+ name1[0] = 0;
+ name1[1] = 2;
+ l1 = 2;
+ if (len) {
+ memcpy(name1+2, oid, len * sizeof(int));
+ l1 += len;
+ } else {
+ name1[2] = 1;
+ l1++;
+ }
+ for (;;) {
+ l2 = sizeof(name2);
+ j = sysctl(name1, l1, name2, &l2, 0, 0);
+ if (j < 0) {
+ if (errno == ENOENT)
+ return (0);
+ else
+ err(1, "sysctl(getnext) %d %zu", j, l2);
+ }
+
+ l2 /= sizeof(int);
+
+ if (len < 0 || l2 < (unsigned int)len)
+ return (0);
+
+ for (i = 0; i < len; i++)
+ if (name2[i] != oid[i])
+ return (0);
+
+ i = show_var(name2, l2);
+ if (!i && !bflag)
+ putchar('\n');
+
+ memcpy(name1+2, name2, l2 * sizeof(int));
+ l1 = 2 + l2;
+ }
+}
+
+#ifdef __rtems__
+rtems_shell_cmd_t rtems_shell_SYSCTL_Command = {
+ "sysctl", /* name */
+ "sysctl [-bdehNnoqTtWx] [ -B <bufsize> ] [-a | name[=value]] ... ", /* usage
*/
+ "rtems", /* topic */
+ rtems_shell_main_sysctl, /* command */
+ NULL, /* alias */
+ NULL /* next */
+};
+#endif /* __rtems__ */
diff --git a/sys/linker_set.h b/sys/linker_set.h
index c83d7c8..e10be24 100644
--- a/sys/linker_set.h
+++ b/sys/linker_set.h
@@ -1,4 +1,6 @@
/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
* Copyright (c) 1999 John D. Polstra
* Copyright (c) 1999,2001 Peter Wemm <pe...@freebsd.org>
* All rights reserved.
@@ -24,27 +26,18 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/sys/linker_set.h,v 1.13 2002/09/23 06:11:29 peter Exp $
+ * $FreeBSD$
*/
#ifndef _SYS_LINKER_SET_H_
#define _SYS_LINKER_SET_H_
-/* FIXME: These macros should not be here
- * BSD has them macros in sys/cdefs.h
- * older rtems had them in rtems/bsd/sys/cdefs.h
- * newlib has some of them in sys/cdefs.h
- */
-
-#if defined(__rtems__)
-#ifndef __used
-#define __used __attribute__((__used__))
-#endif
-#ifndef __CONCAT
-#define __CONCAT1(x,y) x ## y
-#define __CONCAT(x,y) __CONCAT1(x,y)
-#endif
+#ifndef _SYS_CDEFS_H_
+#error this file needs sys/cdefs.h as a prerequisite
#endif
+#ifdef __rtems__
+#include <sys/_types.h>
+#endif /* __rtems__ */
/*
* The following macros are used to declare global sets of objects, which
@@ -52,40 +45,120 @@
* For ELF, this is done by constructing a separate segment for each set.
*/
+#if defined(__powerpc64__)
+/*
+ * Move the symbol pointer from ".text" to ".data" segment, to make
+ * the GCC compiler happy:
+ */
+#define __MAKE_SET_CONST
+#else
+#define __MAKE_SET_CONST const
+#endif
+
/*
* Private macros, not to be used outside this header file.
*/
-#ifdef __GNUC__
+#ifdef __GNUCLIKE___SECTION
+#ifndef __rtems__
+#define __MAKE_SET_QV(set, sym, qv) \
+ __GLOBL(__CONCAT(__start_set_,set)); \
+ __GLOBL(__CONCAT(__stop_set_,set)); \
+ static void const * qv \
+ __set_##set##_sym_##sym __section("set_" #set) \
+ __used = &(sym)
+#define __MAKE_SET(set, sym) __MAKE_SET_QV(set, sym, __MAKE_SET_CONST)
+#else /* __rtems__ */
+#define RTEMS_BSD_DEFINE_SET(set, type)
\
+ type const __CONCAT(_bsd__start_set_,set)[0] \
+ __section(".rtemsroset.bsd." __STRING(set) ".begin") __used; \
+ type const __CONCAT(_bsd__stop_set_,set)[0] \
+ __section(".rtemsroset.bsd." __STRING(set) ".end") __used
+
+#define RTEMS_BSD_DECLARE_SET(set, type) \
+ extern type const __CONCAT(_bsd__start_set_,set)[0]; \
+ extern type const __CONCAT(_bsd__stop_set_,set)[0]
+
+#define RTEMS_BSD_DEFINE_SET_ITEM(set, sym, type) \
+ static type const __set_##set##_sym_##sym \
+ __section(".rtemsroset.bsd." __STRING(set) ".content.1") __used
+
+#define RTEMS_BSD_DEFINE_SET_ITEM_ORDERED(set, sym, order, type) \
+ static type const __set_##set##_sym_##sym \
+ __section(".rtemsroset.bsd." __STRING(set) ".content.0."
RTEMS_XSTRING( order )) __used
+
#define __MAKE_SET(set, sym) \
- static void const * const __set_##set##_sym_##sym \
- __attribute((section("set_" #set))) __used = &sym
-#else /* !__GNUC__ */
-#ifndef lint
-#error "This file needs to be compiled by GCC or lint"
-#endif /* lint */
-#define __MAKE_SET(set, sym) extern void const * const
(__set_##set##_sym_##sym)
-#endif /* __GNUC__ */
+ RTEMS_BSD_DEFINE_SET_ITEM(set, sym, const void *) = &sym
+
+#define RTEMS_BSD_DEFINE_RWSET(set, type) \
+ type __CONCAT(_bsd__start_set_,set)[0] \
+ __section(".rtemsrwset.bsd." __STRING(set) ".begin") __used; \
+ type __CONCAT(_bsd__stop_set_,set)[0] \
+ __section(".rtemsrwset.bsd." __STRING(set) ".end") __used
+
+#define RTEMS_BSD_DECLARE_RWSET(set, type) \
+ extern type __CONCAT(_bsd__start_set_,set)[0]; \
+ extern type __CONCAT(_bsd__stop_set_,set)[0]
+
+#define RTEMS_BSD_DEFINE_RWSET_ITEM(set, sym, type) \
+ static type __set_##set##_sym_##sym \
+ __section(".rtemsrwset.bsd." __STRING(set) ".content") __used
+
+#define __MAKE_RWSET(set, sym) \
+ RTEMS_BSD_DEFINE_RWSET_ITEM(set, sym, const void *) = &sym
+#endif /* __rtems__ */
+#else /* !__GNUCLIKE___SECTION */
+#error this file needs to be ported to your compiler
+#endif /* __GNUCLIKE___SECTION */
/*
* Public macros.
*/
#define TEXT_SET(set, sym) __MAKE_SET(set, sym)
#define DATA_SET(set, sym) __MAKE_SET(set, sym)
+#ifndef __rtems__
+#define DATA_WSET(set, sym) __MAKE_SET_QV(set, sym, )
+#else /* __rtems__ */
+#define DATA_WSET(set, sym) __MAKE_RWSET(set, sym)
+#endif /* __rtems__ */
#define BSS_SET(set, sym) __MAKE_SET(set, sym)
#define ABS_SET(set, sym) __MAKE_SET(set, sym)
#define SET_ENTRY(set, sym) __MAKE_SET(set, sym)
/*
- * Initialize before referring to a give linker set
+ * Initialize before referring to a given linker set.
*/
+#ifndef __rtems__
+#define SET_DECLARE(set, ptype) \
+ extern ptype __weak_symbol *__CONCAT(__start_set_,set); \
+ extern ptype __weak_symbol *__CONCAT(__stop_set_,set)
+
+#define SET_BEGIN(set) \
+ (&__CONCAT(__start_set_,set))
+#define SET_LIMIT(set) \
+ (&__CONCAT(__stop_set_,set))
+#else /* __rtems__ */
#define SET_DECLARE(set, ptype)
\
- extern ptype *__CONCAT(__start_set_,set)[]; \
- extern ptype *__CONCAT(__stop_set_,set)[]
+ RTEMS_BSD_DECLARE_SET(set, ptype *)
+
+#define RWSET_DECLARE(set, ptype) \
+ RTEMS_BSD_DECLARE_RWSET(set, ptype *)
+
+static __inline __uintptr_t
+_linker_set_obfuscate(const void *marker)
+{
+
+ /* Obfuscate the variable, so that the compiler cannot optimize */
+ __asm__("" : "+r" (marker));
+ return ((__uintptr_t)marker);
+}
#define SET_BEGIN(set) \
- (__CONCAT(__start_set_,set))
+ ((__typeof(&__CONCAT(_bsd__start_set_,set)[0])) \
+ _linker_set_obfuscate(__CONCAT(_bsd__start_set_,set)))
#define SET_LIMIT(set) \
- (__CONCAT(__stop_set_,set))
+ ((__typeof(&__CONCAT(_bsd__stop_set_,set)[0])) \
+ _linker_set_obfuscate(__CONCAT(_bsd__stop_set_,set)))
+#endif /* __rtems__ */
/*
* Iterate over all the elements of a set.
diff --git a/testsuites/telnetd02/init.c b/testsuites/telnetd02/init.c
index 6f762db..7a450fa 100644
--- a/testsuites/telnetd02/init.c
+++ b/testsuites/telnetd02/init.c
@@ -111,6 +111,10 @@ static rtems_task Init(rtems_task_argument argument)
#define CONFIGURE_SHELL_COMMANDS_ALL
#define CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING
+extern rtems_shell_cmd_t rtems_shell_SYSCTL_Command;
+#define CONFIGURE_SHELL_USER_COMMANDS \
+ &rtems_shell_SYSCTL_Command
+
#include <rtems/shellconfig.h>
#include <rtems/confdefs.h>
diff --git a/testsuites/telnetd02/wscript b/testsuites/telnetd02/wscript
index b59c040..9a04c59 100644
--- a/testsuites/telnetd02/wscript
+++ b/testsuites/telnetd02/wscript
@@ -47,4 +47,5 @@ def build(bld):
lib=['telnetd', 'networking'],
libpath=['.'],
source=source,
+ use=['networking'],
install_path=False)
--
2.37.1
_______________________________________________
devel mailing list
devel@rtems.org
http://lists.rtems.org/mailman/listinfo/devel
