Socket cork fixes (8447b24e) · Commits · 戴 / Bird

lib/event.c

+8 −2

Original line number	Diff line number	Diff line
		@@ -283,7 +283,13 @@ void ev_uncork(struct event_cork *ec)
		birdloop_ping(el->loop);
		}

		UNLOCK_DOMAIN(cork, ec->lock);
		struct birdsock *sk;
		WALK_LIST_FIRST2(sk, cork_node, ec->sockets)
		{
		// log(L_TRACE "Socket %p uncorked", sk);
		rem_node(&sk->cork_node);
		sk_ping(sk);
		}

		birdloop_ping(&main_birdloop);
		UNLOCK_DOMAIN(cork, ec->lock);
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ struct event_cork {
		DOMAIN(cork) lock;
		u32 count;
		list events;
		list sockets;
		};

		extern event_list global_event_list;
		@@ -56,6 +57,7 @@ static inline void ev_init_list(event_list el, struct birdloop loop, const cha
		static inline void ev_init_cork(struct event_cork ec, const char name)
		{
		init_list(&ec->events);
		init_list(&ec->sockets);
		ec->lock = DOMAIN_NEW(cork, name);
		ec->count = 0;
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@
		void sk_start(sock *s);
		void sk_stop(sock *s);
		void sk_reloop(sock s, struct birdloop loop);
		void sk_ping(sock *s);

		extern struct birdloop main_birdloop;

+1 −0

Original line number	Diff line number	Diff line
		@@ -59,6 +59,7 @@ typedef struct birdsock {
		uint rbsize;
		int (rx_hook)(struct birdsock , uint size); /* NULL=receiving turned off, returns 1 to clear rx buffer */
		struct event_cork cork; / Cork to temporarily stop receiving data */
		node cork_node; /* Node in cork list */

		byte tbuf, tpos; /* NULL=allocate automatically */
		byte ttx; / Internal */

+33 −1

Original line number	Diff line number	Diff line
		@@ -218,7 +218,36 @@ sk_stop(sock *s)
		}

		static inline uint sk_want_events(sock *s)
		{ return ((s->rx_hook && !ev_corked(s->cork)) ? POLLIN : 0) \| ((s->ttx != s->tpos) ? POLLOUT : 0); }
		{
		uint out = ((s->ttx != s->tpos) ? POLLOUT : 0);
		if (s->rx_hook)
		if (s->cork)
		{
		LOCK_DOMAIN(cork, s->cork->lock);
		if (!enlisted(&s->cork_node))
		if (s->cork->count)
		{
		// log(L_TRACE "Socket %p corked", s);
		add_tail(&s->cork->sockets, &s->cork_node);
		}
		else
		out \|= POLLIN;
		UNLOCK_DOMAIN(cork, s->cork->lock);
		}
		else
		out \|= POLLIN;

		// log(L_TRACE "sk_want_events(%p) = %x", s, out);
		return out;
		}


		void
		sk_ping(sock *s)
		{
		s->loop->poll_changed = 1;
		birdloop_ping(s->loop);
		}

		/*
		FIXME: this should be called from sock code
		@@ -284,7 +313,10 @@ sockets_fire(struct birdloop *loop)

		/* Last fd is internal wakeup fd */
		if (pfd[poll_num].revents & POLLIN)
		{
		wakeup_drain(loop);
		loop->poll_changed = 1;
		}

		int i;
		for (i = 0; i < poll_num; pfd++, psk++, i++)