From e5831730a619ef015bc41a9cfa35d458782a30dc Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Thu, 19 Jul 2001 12:42:08 +0000 Subject: [PATCH] updates. --- CHANGES | 7 +++++++ lib/silcutil/silcschedule.c | 12 ++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/CHANGES b/CHANGES index e5a11169..4149c088 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +Thu Jul 19 14:47:30 EEST 2001 Pekka Riikonen + + * Removed the non-blocking settings in WIN32 code in the + silc_sock_[read/write] and added SleepEx instead. Affected + file lib/silcutil/win32/silcwin32sockconn.c. The availability + of input data is now checked with FIONREAD and ioctlsocket. + Wed Jul 18 18:34:01 EEST 2001 Pekka Riikonen * Call silc_schedule_task_del_by_context in the diff --git a/lib/silcutil/silcschedule.c b/lib/silcutil/silcschedule.c index e34009b2..1d727c6b 100644 --- a/lib/silcutil/silcschedule.c +++ b/lib/silcutil/silcschedule.c @@ -743,6 +743,8 @@ void silc_schedule_task_del(SilcSchedule schedule, SilcTask task) void silc_schedule_task_del_by_fd(SilcSchedule schedule, uint32 fd) { + SILC_LOG_DEBUG(("Unregister task by fd")); + silc_task_del_by_fd(schedule->timeout_queue, fd); silc_task_del_by_fd(schedule->fd_queue, fd); } @@ -752,6 +754,8 @@ void silc_schedule_task_del_by_fd(SilcSchedule schedule, uint32 fd) void silc_schedule_task_del_by_callback(SilcSchedule schedule, SilcTaskCallback callback) { + SILC_LOG_DEBUG(("Unregister task by callback")); + silc_task_del_by_callback(schedule->timeout_queue, callback); silc_task_del_by_callback(schedule->fd_queue, callback); silc_task_del_by_callback(schedule->generic_queue, callback); @@ -761,6 +765,8 @@ void silc_schedule_task_del_by_callback(SilcSchedule schedule, void silc_schedule_task_del_by_context(SilcSchedule schedule, void *context) { + SILC_LOG_DEBUG(("Unregister task by context")); + silc_task_del_by_context(schedule->timeout_queue, context); silc_task_del_by_context(schedule->fd_queue, context); silc_task_del_by_context(schedule->generic_queue, context); @@ -1127,8 +1133,6 @@ static void silc_task_del_by_fd(SilcTaskQueue queue, uint32 fd) { SilcTask next; - SILC_LOG_DEBUG(("Unregister task by fd")); - silc_mutex_lock(queue->lock); if (!queue->task) { @@ -1154,8 +1158,6 @@ static void silc_task_del_by_callback(SilcTaskQueue queue, { SilcTask next; - SILC_LOG_DEBUG(("Unregister task by callback")); - silc_mutex_lock(queue->lock); if (!queue->task) { @@ -1180,8 +1182,6 @@ static void silc_task_del_by_context(SilcTaskQueue queue, void *context) { SilcTask next; - SILC_LOG_DEBUG(("Unregister task by context")); - silc_mutex_lock(queue->lock); if (!queue->task) { -- 2.24.0