From 8eb888394a435d6772108603a418b09fcdb6c6b4 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 28 Sep 2016 15:00:00 +0200 Subject: Split rtemsbsd/rtems/rtems-program.c This improves garbage collection by the linker. --- libbsd.py | 1 + libbsd_waf.py | 1 + rtemsbsd/rtems/rtems-program-socket.c | 79 +++++++++++++++++++++++++++++++++++ rtemsbsd/rtems/rtems-program.c | 33 --------------- 4 files changed, 81 insertions(+), 33 deletions(-) create mode 100644 rtemsbsd/rtems/rtems-program-socket.c diff --git a/libbsd.py b/libbsd.py index 35a93db2..6a1d7013 100755 --- a/libbsd.py +++ b/libbsd.py @@ -113,6 +113,7 @@ def rtems(mm): 'rtems/rtems-legacy-mii.c', 'rtems/rtems-kvm.c', 'rtems/rtems-program.c', + 'rtems/rtems-program-socket.c', 'rtems/rtems-routes.c', 'rtems/syslog.c', 'ftpd/ftpd.c', diff --git a/libbsd_waf.py b/libbsd_waf.py index cf0fc113..05060c32 100644 --- a/libbsd_waf.py +++ b/libbsd_waf.py @@ -1128,6 +1128,7 @@ def build(bld): 'rtemsbsd/rtems/rtems-legacy-mii.c', 'rtemsbsd/rtems/rtems-legacy-newproc.c', 'rtemsbsd/rtems/rtems-legacy-rtrequest.c', + 'rtemsbsd/rtems/rtems-program-socket.c', 'rtemsbsd/rtems/rtems-program.c', 'rtemsbsd/rtems/rtems-routes.c', 'rtemsbsd/rtems/syslog.c', diff --git a/rtemsbsd/rtems/rtems-program-socket.c b/rtemsbsd/rtems/rtems-program-socket.c new file mode 100644 index 00000000..4a8d9fca --- /dev/null +++ b/rtemsbsd/rtems/rtems-program-socket.c @@ -0,0 +1,79 @@ +/** + * @file + * + * @ingroup rtems_bsd_rtems + * + * @brief TODO. + */ + +/* + * Copyright (c) 2013, 2016 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Dornierstr. 4 + * 82178 Puchheim + * Germany + * + * + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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. + */ + +#include + +#include +#include + +#define RTEMS_BSD_PROGRAM_NO_SOCKET_WRAP +#define RTEMS_BSD_PROGRAM_NO_CALLOC_WRAP +#define RTEMS_BSD_PROGRAM_NO_FREE_WRAP +#include + +#include "program-internal.h" + +int +rtems_bsd_program_socket(int domain, int type, int protocol) +{ + struct rtems_bsd_program_control *prog_ctrl; + struct program_fd_item *item; + int fd; + + prog_ctrl = rtems_bsd_program_get_control_or_null(); + if (prog_ctrl == NULL) { + errno = ENOMEM; + return (-1); + } + + item = calloc(1, sizeof(*item)); + if (item == NULL) { + return (-1); + } + + fd = socket(domain, type, protocol); + if (fd >= 0) { + item->fd = fd; + LIST_INSERT_HEAD(&prog_ctrl->open_fd, item, entries); + } else { + free(item); + } + + return (fd); +} diff --git a/rtemsbsd/rtems/rtems-program.c b/rtemsbsd/rtems/rtems-program.c index 69a8961a..45d5450d 100644 --- a/rtemsbsd/rtems/rtems-program.c +++ b/rtemsbsd/rtems/rtems-program.c @@ -38,7 +38,6 @@ */ #include -#include #include #include @@ -50,7 +49,6 @@ #include #define RTEMS_BSD_PROGRAM_NO_OPEN_WRAP -#define RTEMS_BSD_PROGRAM_NO_SOCKET_WRAP #define RTEMS_BSD_PROGRAM_NO_CLOSE_WRAP #define RTEMS_BSD_PROGRAM_NO_FOPEN_WRAP #define RTEMS_BSD_PROGRAM_NO_FCLOSE_WRAP @@ -415,37 +413,6 @@ rtems_bsd_program_open(const char *path, int oflag, ...) return fd; } -int -rtems_bsd_program_socket(int domain, int type, int protocol) -{ - struct rtems_bsd_program_control *prog_ctrl = - rtems_bsd_program_get_control_or_null(); - int fd = -1; - - if (prog_ctrl != NULL) { - struct program_fd_item *item = - malloc(sizeof(*item)); - - if (item != NULL) { - /* FIXME: Why is there an implicit declaration warning? - */ - fd = socket(domain, type, protocol); - - if (fd != -1) { - item->fd = fd; - LIST_INSERT_HEAD(&(prog_ctrl->open_fd), - item, entries); - } else { - free(item); - } - } else { - errno = ENOMEM; - } - } - - return fd; -} - int rtems_bsd_program_close(int fd) { -- cgit v1.2.3