disable in_queue assertion checks

Since the queueing system is proven by now and we're more
familiar with how things work in a multi-threaded environment,
these checks are now redundant.

3 files changed, 2 insertions, 7 deletions

diff --git a/cmogstored.h b/cmogstored.h
index f844c56..2f77f40 100644
--- a/cmogstored.h
+++ b/cmogstored.h
@@ -260,7 +260,6 @@ struct mog_fd {
         enum mog_fd_type fd_type;
         enum mog_queue_state queue_state;
         int fd;
-        int in_queue;
         SIMPLEQ_ENTRY(mog_fd) active_fd;
         union {
                 struct mog_accept accept;
diff --git a/fdmap.c b/fdmap.c
index 5335011..dca7cb1 100644
--- a/fdmap.c
+++ b/fdmap.c
@@ -97,7 +97,6 @@ void mog_fdmap_requeue(struct mog_queue *quit_queue)
                 case MOG_FD_TYPE_HTTP:
                 case MOG_FD_TYPE_HTTPGET:
                         mfd->queue_state = MOG_QUEUE_STATE_NEW;
-                        assert((mfd->in_queue = 0) == 0 && "in_queue check");
                         mog_activeq_insert(quit_queue, mfd);
                         mog_nr_active_at_quit++;
                 default:
diff --git a/fdmap.h b/fdmap.h
index a5d5f9e..c21aff8 100644
--- a/fdmap.h
+++ b/fdmap.h
@@ -14,15 +14,13 @@ static inline struct mog_fd * mog_fd_of(void *as_obj)
 /* used to validate a mog_fd is never in two queues at once */
 static inline void mog_fd_check_in(struct mog_fd *mfd)
 {
-        assert(mog_sync_add_and_fetch(&mfd->in_queue, 1) == 1 &&
-               "in_queue counter off (check in)");
+        /* currently unused */
 }
 
 /* used to validate a mog_fd is never in two queues at once */
 static inline void mog_fd_check_out(struct mog_fd *mfd)
 {
-        assert(mog_sync_sub_and_fetch(&mfd->in_queue, 1) == 0 &&
-               "in_queue counter off (check out)");
+        /* currently unused */
 }
 
 static inline struct mog_fd * mog_fd_init(int fd, enum mog_fd_type fd_type)
@@ -32,7 +30,6 @@ static inline struct mog_fd * mog_fd_init(int fd, enum mog_fd_type fd_type)
         mfd->fd = fd;
         mfd->fd_type = fd_type;
         mfd->queue_state = MOG_QUEUE_STATE_NEW;
-        assert((mfd->in_queue = 0) == 0 && "in_queue check");
 
         return mfd;
 }