Commit ff001eb9 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Tomasz Zawadzki
Browse files

lib/thread: account for busy work for unregistered active pollers 



Treat active pollers similarly to timed ones and don't discard
unregistered poller's rc.  This patch is basically a copy of 7d3d2b62
but for active pollers.

Change-Id: Ia85e73a6736b2924601150f8e61995eb56009c15
Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/477252


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
parent 01f356ab

lib/thread/thread.c

+6 −8
Original line number Diff line number Diff line
@@ -520,24 +520,22 @@ spdk_thread_poll(struct spdk_thread *thread, uint32_t max_msgs, uint64_t now) 
		poller->state = SPDK_POLLER_STATE_RUNNING;

		poller_rc = poller->fn(poller->arg);



#ifdef DEBUG

		if (poller_rc == -1) {

			SPDK_DEBUGLOG(SPDK_LOG_THREAD, "Poller %p returned -1\n", poller);

		}

#endif



		if (poller->state == SPDK_POLLER_STATE_UNREGISTERED) {

			TAILQ_REMOVE(&thread->active_pollers, poller, tailq);

			free(poller);

			continue;

		} else if (poller->state != SPDK_POLLER_STATE_PAUSED) {

			poller->state = SPDK_POLLER_STATE_WAITING;

		}



#ifdef DEBUG

		if (poller_rc == -1) {

			SPDK_DEBUGLOG(SPDK_LOG_THREAD, "Poller %p returned -1\n", poller);

		}

#endif



		if (poller_rc > rc) {

			rc = poller_rc;

		}



	}



	TAILQ_FOREACH_SAFE(poller, &thread->timer_pollers, tailq, tmp) {