summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.vnet.ibm.com>2015-12-15 16:01:13 +1100
committerStewart Smith <stewart@linux.vnet.ibm.com>2015-12-15 16:48:06 +1100
commitb22aff3ebc8c21915c39030bf6024bcb4372d495 (patch)
treeceb54860da4ab011a84a6be859644bdc5fd66259
parent0e3baa21f276cb551d086e5b028ac9f7f0b7e4d2 (diff)
downloadffs-b22aff3ebc8c21915c39030bf6024bcb4372d495.zip
ffs-b22aff3ebc8c21915c39030bf6024bcb4372d495.tar.gz
remove unused signal
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--clib/Rules.mk2
-rw-r--r--clib/signal.h79
-rw-r--r--clib/src/signal.c142
3 files changed, 0 insertions, 223 deletions
diff --git a/clib/Rules.mk b/clib/Rules.mk
index a3c7f7b..4f9516f 100644
--- a/clib/Rules.mk
+++ b/clib/Rules.mk
@@ -27,8 +27,6 @@ CFLAGS += -iquote$(DEPTH) -fPIC
LDFLAGS=-L.
-# array.o array_iter.o signal.o
-
OBJS = err.o crc32.o misc.o ecc.o \
exception.o slab.o \
list.o list_iter.o \
diff --git a/clib/signal.h b/clib/signal.h
deleted file mode 100644
index 06f2243..0000000
--- a/clib/signal.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: clib/signal.h $ */
-/* */
-/* OpenPOWER FFS Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2015 */
-/* [+] International Business Machines Corp. */
-/* */
-/* */
-/* Licensed under the Apache License, Version 2.0 (the "License"); */
-/* you may not use this file except in compliance with the License. */
-/* You may obtain a copy of the License at */
-/* */
-/* http://www.apache.org/licenses/LICENSE-2.0 */
-/* */
-/* Unless required by applicable law or agreed to in writing, software */
-/* distributed under the License is distributed on an "AS IS" BASIS, */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
-/* implied. See the License for the specific language governing */
-/* permissions and limitations under the License. */
-/* */
-/* IBM_PROLOG_END_TAG */
-
-/*
- * File: signal.h
- * Author: Shaun Wetzstein <shaun@us.ibm.com>
- * Descr: File descriptor activity callback signaler
- * Note:
- * Date: 10/03/10
- */
-
-#ifndef __SIGNAL_H__
-#define __SIGNAL_H__
-
-#include <stdint.h>
-#include <stdbool.h>
-
-#include <sys/epoll.h>
-#include <sys/signalfd.h>
-
-#include "attribute.h"
-#include "builtin.h"
-#include "assert.h"
-
-#include "tree.h"
-#include "array.h"
-
-/* ======================================================================= */
-
-typedef struct signal signal_t;
-typedef struct signalfd_siginfo signal_event_t;
-
-struct signal {
- int fd;
-
- sigset_t mask;
- int flags;
-};
-
-/* ======================================================================= */
-
-extern void signal_init(signal_t * self) __nonnull((1));
-extern void signal_delete(signal_t * self) __nonnull((1));
-
-extern int signal_fileno(signal_t * self) __nonnull((1));
-
-extern int signal_setmask(signal_t * self, const sigset_t mask) __nonnull((1));
-
-#if 0
-#define signalfd_wait(...) STRCAT(signalfd_wait, NARGS(__VA_ARGS__))(__VA_ARGS__)
-extern void signal_wait1(signal_t *) __nonnull((1));
-extern void signal_wait2(_sisignal_tgnal *, int) __nonnull((1));
-#endif
-
-/* ======================================================================= */
-
-#endif /* __SIGNAL_H__ */
diff --git a/clib/src/signal.c b/clib/src/signal.c
deleted file mode 100644
index 609cc49..0000000
--- a/clib/src/signal.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/* IBM_PROLOG_BEGIN_TAG */
-/* This is an automatically generated prolog. */
-/* */
-/* $Source: clib/src/signal.c $ */
-/* */
-/* OpenPOWER FFS Project */
-/* */
-/* Contributors Listed Below - COPYRIGHT 2014,2015 */
-/* [+] International Business Machines Corp. */
-/* */
-/* */
-/* Licensed under the Apache License, Version 2.0 (the "License"); */
-/* you may not use this file except in compliance with the License. */
-/* You may obtain a copy of the License at */
-/* */
-/* http://www.apache.org/licenses/LICENSE-2.0 */
-/* */
-/* Unless required by applicable law or agreed to in writing, software */
-/* distributed under the License is distributed on an "AS IS" BASIS, */
-/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or */
-/* implied. See the License for the specific language governing */
-/* permissions and limitations under the License. */
-/* */
-/* IBM_PROLOG_END_TAG */
-
-/*
- * File: signal.c
- * Author: Shaun Wetzstein <shaun@us.ibm.com>
- * Descr:
- * Note:
- * Date: 10/03/10
- */
-
-#include <unistd.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <malloc.h>
-#include <stdint.h>
-#include <signal.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-
-#include "misc.h"
-#include "signal.h"
-
-/* ======================================================================= */
-
-const char *__signal_msg[] = {
- "signal: unexpected NULL self pointer",
- "signal: unexpected NULL callback structure",
-};
-
-#define SIGNAL_NULL (__signal_msg[0])
-
-/* ======================================================================= */
-
-void signal_init(signal_t * self)
-{
- if (unlikely(self == NULL))
- throw_unexpected(SIGNAL_NULL);
-
- if (self->fd != -1)
- close(self->fd), self->fd = -1;
-
- sigemptyset(&self->mask);
- self->flags = SFD_CLOEXEC;
-
- self->fd = signalfd(self->fd, &self->mask, self->flags);
- if (unlikely(self->fd == -1))
- throw_errno(errno);
-}
-
-void signal_delete(signal_t * self)
-{
- if (unlikely(self == NULL))
- throw_unexpected(SIGNAL_NULL);
-
- close(self->fd), self->fd = -1;
-
- if (sigprocmask(SIG_UNBLOCK, &self->mask, NULL) == -1)
- throw_errno(errno);
-
- sigemptyset(&self->mask);
- self->flags = 0;
-}
-
-int signal_fileno(signal_t * self)
-{
- if (unlikely(self == NULL))
- throw_unexpected(SIGNAL_NULL);
- return self->fd;
-}
-
-int signal_setmask(signal_t * self, const sigset_t mask)
-{
- if (unlikely(self == NULL))
- throw_unexpected(SIGNAL_NULL);
-
- self->mask = mask;
-
- if (sigprocmask(SIG_BLOCK, &self->mask, NULL) == -1)
- throw_errno(errno);
-
- self->fd = signalfd(self->fd, &self->mask, self->flags);
- if (unlikely(self->fd == -1))
- throw_errno(errno);
-
- return self->fd;
-}
-
-#if 0
-void signal_wait1(signal_t * self)
-{
- signal_wait2(self, -1);
-}
-
-void signal_wait2(signal_t * self, int timeout)
-{
- if (unlikely(self == NULL))
- throw_unexpected(SIGNAL_NULL);
-
- struct epoll_event events[signal_EVENT_SIZE];
-
- int rc = epoll_wait(self->fd, events,
- signal_EVENT_SIZE, timeout);
-
- for (int n = 0; n < rc; n++) {
- signal_callback *cb = (signal_callback *) events[n].data.ptr;
- if (cb != NULL)
- if (cb->func != NULL)
- cb->func((signal_event[1]) { {
- events[n].data.u64 >> 32,
- events[n].events}
- }
- , cb->data);
- }
-}
-#endif
-
-/* ======================================================================= */
OpenPOWER on IntegriCloud