[Click] [PATCH] Fix build error on !HAVE_TASK_HEAP && !HAVE_STRIDE_SCHED

Joonwoo Park joonwpark81 at gmail.com
Fri Sep 21 00:56:09 EDT 2007


Hi all.
This patch fixes the build error with '--disable-stride'.

-
 Signed-off-by: Joonwoo Park <joonwpark81 at gmail.com>

  lib/routerthread.cc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/routerthread.cc b/lib/routerthread.cc
index 1f8b714..e19367c 100644
--- a/lib/routerthread.cc
+++ b/lib/routerthread.cc
@@ -356,10 +356,12 @@ RouterThread::run_tasks(int ntasks)
 	t->fast_unschedule(false);
  #endif

+#if HAVE_STRIDE_SCHED || HAVE_TASK_HEAP
 	// 21.May.2007: Always set the current thread's pass to the current
 	// task's pass, to avoid problems when fast_reschedule() interacts
 	// with fast_schedule() (passes got out of sync).
 	_pass = t->_pass;
+#endif
 	
 	t->call_hook();

-

In addition to that, actually because of the HAVE_TASK_HEAP depends on
the HAVE_STRIDE_SCHED (config.h.in), configuring click with
'--disable-stride --enable-task-heap' means just '--disable-stride'.
Does really the task-heap depend on the stride-scheduler???
If it's true, I would like to suggest a fix configure.in like this way.

-
 Signed-off-by: Joonwoo Park <joonwpark81 at gmail.com>
 configure.in |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/configure.in b/configure.in
index fe8aeb5..15a434b 100644
--- a/configure.in
+++ b/configure.in
@@ -622,6 +622,9 @@ fi

 AC_ARG_ENABLE(task-heap, [  --enable-task-heap      use heap for task
list], :, enable_task_heap=no)
 if test $enable_task_heap = yes; then
+    if test $enable_stride != yes; then
+    	AC_MSG_ERROR([ Task heap needs stride scheduler. ])
+		fi
     AC_DEFINE(HAVE_TASK_HEAP)
 fi

-

Joonwoo Park (Jason Park)


More information about the click mailing list