[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r37106 - in gnunet/src: curl include
From: |
gnunet |
Subject: |
[GNUnet-SVN] r37106 - in gnunet/src: curl include |
Date: |
Mon, 2 May 2016 08:11:58 +0200 |
Author: grothoff
Date: 2016-05-02 08:11:57 +0200 (Mon, 02 May 2016)
New Revision: 37106
Added:
gnunet/src/curl/curl_reschedule.c
Modified:
gnunet/src/curl/Makefile.am
gnunet/src/include/gnunet_curl_lib.h
Log:
add implementation of scheduler integration of curl context
Modified: gnunet/src/curl/Makefile.am
===================================================================
--- gnunet/src/curl/Makefile.am 2016-05-02 04:13:06 UTC (rev 37105)
+++ gnunet/src/curl/Makefile.am 2016-05-02 06:11:57 UTC (rev 37106)
@@ -13,7 +13,8 @@
-version-info 0:0:0 \
-no-undefined
libgnunetcurl_la_SOURCES = \
- curl.c
+ curl.c \
+ curl_reschedule.c
libgnunetcurl_la_LIBADD = \
$(top_builddir)/src/util/libgnunetutil.la \
-ljansson \
Added: gnunet/src/curl/curl_reschedule.c
===================================================================
--- gnunet/src/curl/curl_reschedule.c (rev 0)
+++ gnunet/src/curl/curl_reschedule.c 2016-05-02 06:11:57 UTC (rev 37106)
@@ -0,0 +1,149 @@
+/*
+ This file is part of GNUnet
+ Copyright (C) 2015, 2016 GNUnet e.V.
+
+ GNUnet is free software; you can redistribute it and/or modify it under the
+ terms of the GNU General Public License as published by the Free Software
+ Foundation; either version 3, or (at your option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but WITHOUT ANY
+ WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along with
+ GNUnet; see the file COPYING. If not, If not, see
+ <http://www.gnu.org/licenses/>
+*/
+/**
+ * @file curl/curl_reschedule.c
+ * @brief API for event loop integration with GNUnet SCHEDULER.
+ * @author Christian Grothoff
+ */
+#include "platform.h"
+#include "gnunet_curl_lib.h"
+#include "gnunet_util_lib.h"
+
+
+/**
+ * Closure for #GNUNET_CURL_gnunet_scheduler_reschedule().
+ */
+struct GNUNET_CURL_RescheduleContext
+{
+ /**
+ * Just the task.
+ */
+ struct GNUNET_SCHEDULER_Task *task;
+
+ /**
+ * Context we manage.
+ */
+ struct GNUNET_CURL_Context *ctx;
+};
+
+
+/**
+ * Initialize reschedule context.
+ *
+ * @param ctx context to manage
+ * @return closure for #GNUNET_CURL_gnunet_scheduler_reschedule().
+ */
+struct GNUNET_CURL_RescheduleContext *
+GNUNET_CURL_gnunet_rc_create (struct GNUNET_CURL_Context *ctx)
+{
+ struct GNUNET_CURL_RescheduleContext *rc;
+
+ rc = GNUNET_new (struct GNUNET_CURL_RescheduleContext);
+ rc->ctx = ctx;
+ return rc;
+}
+
+
+/**
+ * Destroy reschedule context.
+ *
+ * @param rc context to destroy
+ */
+void
+GNUNET_CURL_gnunet_rc_destroy (struct GNUNET_CURL_RescheduleContext *rc)
+{
+ if (NULL != rc->task)
+ GNUNET_SCHEDULER_cancel (rc->task);
+ GNUNET_free (rc);
+}
+
+
+/**
+ * Task that runs the context's event loop with the GNUnet scheduler.
+ *
+ * @param cls the `struct GNUNET_CURL_RescheduleContext`
+ */
+static void
+context_task (void *cls)
+{
+ struct GNUNET_CURL_RescheduleContext *rc = cls;
+ long timeout;
+ int max_fd;
+ fd_set read_fd_set;
+ fd_set write_fd_set;
+ fd_set except_fd_set;
+ struct GNUNET_NETWORK_FDSet *rs;
+ struct GNUNET_NETWORK_FDSet *ws;
+ struct GNUNET_TIME_Relative delay;
+
+ rc->task = NULL;
+ GNUNET_CURL_perform (rc->ctx);
+ max_fd = -1;
+ timeout = -1;
+ FD_ZERO (&read_fd_set);
+ FD_ZERO (&write_fd_set);
+ FD_ZERO (&except_fd_set);
+ GNUNET_CURL_get_select_info (rc->ctx,
+ &read_fd_set,
+ &write_fd_set,
+ &except_fd_set,
+ &max_fd,
+ &timeout);
+ if (timeout >= 0)
+ delay = GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_MILLISECONDS,
+ timeout);
+ else
+ delay = GNUNET_TIME_UNIT_FOREVER_REL;
+ rs = GNUNET_NETWORK_fdset_create ();
+ GNUNET_NETWORK_fdset_copy_native (rs,
+ &read_fd_set,
+ max_fd + 1);
+ ws = GNUNET_NETWORK_fdset_create ();
+ GNUNET_NETWORK_fdset_copy_native (ws,
+ &write_fd_set,
+ max_fd + 1);
+ rc->task = GNUNET_SCHEDULER_add_select (GNUNET_SCHEDULER_PRIORITY_DEFAULT,
+ delay,
+ rs,
+ ws,
+ &context_task,
+ rc);
+ GNUNET_NETWORK_fdset_destroy (rs);
+ GNUNET_NETWORK_fdset_destroy (ws);
+}
+
+
+/**
+ * Implementation of the #GNUNET_CURL_RescheduleCallback for GNUnet's
+ * scheduler. Will run the CURL context using GNUnet's scheduler.
+ * Note that you MUST immediately destroy the reschedule context after
+ * calling #GNUNET_CURL_fini().
+ *
+ * @param cls must point to a `struct GNUNET_CURL_RescheduleContext`
+ */
+void
+GNUNET_CURL_gnunet_scheduler_reschedule (void *cls)
+{
+ struct GNUNET_CURL_RescheduleContext *rc = cls;
+
+ if (NULL != rc->task)
+ GNUNET_SCHEDULER_cancel (rc->task);
+ rc->task = GNUNET_SCHEDULER_add_now (&context_task,
+ rc);
+}
+
+/* end of curl_reschedule.c */
Modified: gnunet/src/include/gnunet_curl_lib.h
===================================================================
--- gnunet/src/include/gnunet_curl_lib.h 2016-05-02 04:13:06 UTC (rev
37105)
+++ gnunet/src/include/gnunet_curl_lib.h 2016-05-02 06:11:57 UTC (rev
37106)
@@ -170,6 +170,46 @@
void
GNUNET_CURL_job_cancel (struct GNUNET_CURL_Job *job);
+
+/* ******* GNUnet SCHEDULER integration ************ */
+
+
+/**
+ * Closure for #GNUNET_CURL_gnunet_scheduler_reschedule().
+ */
+struct GNUNET_CURL_RescheduleContext;
+
+
+/**
+ * Initialize reschedule context.
+ *
+ * @param ctx context to manage
+ * @return closure for #GNUNET_CURL_gnunet_scheduler_reschedule().
+ */
+struct GNUNET_CURL_RescheduleContext *
+GNUNET_CURL_gnunet_rc_create (struct GNUNET_CURL_Context *ctx);
+
+/**
+ * Destroy reschedule context.
+ *
+ * @param rc context to destroy
+ */
+void
+GNUNET_CURL_gnunet_rc_destroy (struct GNUNET_CURL_RescheduleContext *rc);
+
+
+/**
+ * Implementation of the #GNUNET_CURL_RescheduleCallback for GNUnet's
+ * scheduler. Will run the CURL context using GNUnet's scheduler.
+ * Note that you MUST immediately destroy the reschedule context after
+ * calling #GNUNET_CURL_fini().
+ *
+ * @param cls must point to a `struct GNUNET_CURL_RescheduleContext`
+ */
+void
+GNUNET_CURL_gnunet_scheduler_reschedule (void *cls);
+
+
#endif
/** @} */ /* end of group */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r37106 - in gnunet/src: curl include,
gnunet <=