aboutsummaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2017-03-12 09:57:44 -0700
committerGarrett D'Amore <garrett@damore.org>2017-03-12 09:57:44 -0700
commit30a12e0d5746e0376780f74e3a1530a5b3fb2329 (patch)
treea73bb83925ed0964c1ec4f581e9b4d061a96a0d1 /src/core
parent0b27bc9865f49eb1213dff50e2ac64936130d09f (diff)
downloadnng-30a12e0d5746e0376780f74e3a1530a5b3fb2329.tar.gz
nng-30a12e0d5746e0376780f74e3a1530a5b3fb2329.tar.bz2
nng-30a12e0d5746e0376780f74e3a1530a5b3fb2329.zip
Clean up worker vestiges.
Diffstat (limited to 'src/core')
-rw-r--r--src/core/defs.h4
-rw-r--r--src/core/protocol.h12
2 files changed, 0 insertions, 16 deletions
diff --git a/src/core/defs.h b/src/core/defs.h
index c730cf41..82d0dfaf 100644
--- a/src/core/defs.h
+++ b/src/core/defs.h
@@ -48,7 +48,6 @@ typedef void (*nni_thr_func)(void *);
typedef int nni_signal; // Wakeup channel.
typedef uint64_t nni_time; // Abs. time (usec).
typedef int64_t nni_duration; // Rel. time (usec).
-typedef void (*nni_worker)(void *);
typedef void (*nni_cb)(void *);
@@ -74,9 +73,6 @@ typedef struct {
#define NNI_ALLOC_STRUCT(s) nni_alloc(sizeof (*s))
#define NNI_FREE_STRUCT(s) nni_free((s), sizeof (*s))
-// Maximum number of socket or pipe worker threads.
-#define NNI_MAXWORKERS 4
-
#define NNI_PUT16(ptr, u) \
do { \
(ptr)[0] = (uint8_t) (((uint16_t) (u)) >> 8); \
diff --git a/src/core/protocol.h b/src/core/protocol.h
index 877eec31..29befab2 100644
--- a/src/core/protocol.h
+++ b/src/core/protocol.h
@@ -43,12 +43,6 @@ struct nni_proto_pipe_ops {
// lock held, so the protocol may not call back into the socket, and
// must not block.
void (*pipe_rem)(void *);
-
- // Worker functions. If non-NULL, each worker is executed and
- // given the protocol pipe data as a argument. All workers are
- // started, or none are started. The pipe_fini function is obliged
- // to ensure that workers have exited.
- nni_worker pipe_worker[NNI_MAXWORKERS];
};
struct nni_proto_sock_ops {
@@ -85,12 +79,6 @@ struct nni_proto_sock_ops {
// Send filter. This may be NULL, but if it isn't, then messages
// here are filtered just after they come from the application.
nni_msg * (*sock_sfilter)(void *, nni_msg *);
-
- // Worker functions. If non-NULL, each worker is executed and given
- // the protocol socket data as an argument. These will all be started
- // at about the same time, and all will be started, or none will be
- // started. They are obliged to exit in response to sock_close.
- nni_worker sock_worker[NNI_MAXWORKERS];
};
struct nni_proto {