From: Vadim Kochan <[email protected]>
This reverts commit 451275470106024f106a310a5af050b3ca046a4f.
---
flowtop.c | 9 ---------
locking.h | 31 -------------------------------
2 files changed, 40 deletions(-)
diff --git a/flowtop.c b/flowtop.c
index bfd43a9..8cf2fd3 100644
--- a/flowtop.c
+++ b/flowtop.c
@@ -85,7 +85,6 @@ struct flow_list {
static volatile sig_atomic_t sigint = 0;
static int what = INCLUDE_IPV4 | INCLUDE_IPV6 | INCLUDE_TCP, show_src = 0;
static struct flow_list flow_list;
-static struct condlock collector_ready;
static int nfct_acct_val = -1;
static const char *short_options = "vhTUsDIS46u";
@@ -1038,8 +1037,6 @@ static void presenter(void)
int skip_lines = 0;
WINDOW *screen;
- condlock_wait(&collector_ready);
-
lookup_init_ports(PORTS_TCP);
lookup_init_ports(PORTS_UDP);
screen = screen_init(false);
@@ -1250,8 +1247,6 @@ static void *collector(void *null __maybe_unused)
panic("Cannot set non-blocking socket: fcntl(): %s\n",
strerror(errno));
- condlock_signal(&collector_ready);
-
rcu_register_thread();
while (!sigint && ret >= 0) {
@@ -1350,16 +1345,12 @@ int main(int argc, char **argv)
init_geoip(1);
- condlock_init(&collector_ready);
-
ret = pthread_create(&tid, NULL, collector, NULL);
if (ret < 0)
panic("Cannot create phthread!\n");
presenter();
- condlock_destroy(&collector_ready);
-
destroy_geoip();
restore_sysctl(&nfct_acct_val);
diff --git a/locking.h b/locking.h
index 2cb93d1..ddc4027 100644
--- a/locking.h
+++ b/locking.h
@@ -17,11 +17,6 @@ struct rwlock {
pthread_rwlock_t lock;
};
-struct condlock {
- pthread_mutex_t lock;
- pthread_cond_t cond;
-};
-
static inline int spinlock_init(struct spinlock *l)
{
return -pthread_spin_init(&l->lock, 0);
@@ -93,30 +88,4 @@ static inline void rwlock_unlock(struct rwlock *l)
pthread_rwlock_unlock(&l->lock);
}
-static inline void condlock_init(struct condlock *c)
-{
- pthread_mutex_init(&c->lock, NULL);
- pthread_cond_init(&c->cond, NULL);
-}
-
-static inline void condlock_signal(struct condlock *c)
-{
- pthread_mutex_lock(&c->lock);
- pthread_cond_signal(&c->cond);
- pthread_mutex_unlock(&c->lock);
-}
-
-static inline void condlock_wait(struct condlock *c)
-{
- pthread_mutex_lock(&c->lock);
- pthread_cond_wait(&c->cond, &c->lock);
- pthread_mutex_unlock(&c->lock);
-}
-
-static inline void condlock_destroy(struct condlock *c)
-{
- pthread_mutex_destroy(&c->lock);
- pthread_cond_destroy(&c->cond);
-}
-
#endif /* LOCKING_H */
--
2.4.2
--
You received this message because you are subscribed to the Google Groups
"netsniff-ng" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
