big scheduler refactoring, expect some issues

5 files changed, 5 insertions, 19 deletions

diff --git a/src/datacache/datacache.c b/src/datacache/datacache.c
index d2aa2616a..9bb0f14b9 100644
--- a/src/datacache/datacache.c
+++ b/src/datacache/datacache.c
@@ -116,14 +116,12 @@ env_delete_notify (void *cls,
 /**
  * Create a data cache.
  *
- * @param sched scheduler to use
  * @param cfg configuration to use
  * @param section section in the configuration that contains our options
  * @return handle to use to access the service
  */
 struct GNUNET_DATACACHE_Handle *
-GNUNET_DATACACHE_create (struct GNUNET_SCHEDULER_Handle *sched,
-                         const struct GNUNET_CONFIGURATION_Handle *cfg,
+GNUNET_DATACACHE_create (const struct GNUNET_CONFIGURATION_Handle *cfg,
                          const char *section)
 {
   unsigned int bf_size;
@@ -167,11 +165,9 @@ GNUNET_DATACACHE_create (struct GNUNET_SCHEDULER_Handle *sched,
     {
       ret->filter = GNUNET_CONTAINER_bloomfilter_load (NULL, bf_size, 5);  /* approx. 3% false positives at max use */  
     }
-  ret->stats = GNUNET_STATISTICS_create (sched,
-                                         "datacache",
+  ret->stats = GNUNET_STATISTICS_create ("datacache",
                                          cfg);
   ret->section = GNUNET_strdup (section);
-  ret->env.sched = sched;
   ret->env.cfg = cfg;
   ret->env.delete_notify = &env_delete_notify;  
   ret->env.section = ret->section;
diff --git a/src/datacache/perf_datacache.c b/src/datacache/perf_datacache.c
index 904238f85..f32574019 100644
--- a/src/datacache/perf_datacache.c
+++ b/src/datacache/perf_datacache.c
@@ -59,7 +59,6 @@ checkIt (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -72,8 +71,7 @@ run (void *cls,
   unsigned int i;
   
   ok = 0;
-  h = GNUNET_DATACACHE_create (sched,
-                               cfg,
+  h = GNUNET_DATACACHE_create (cfg,
                                "perfcache");
 
   if (h == NULL)
diff --git a/src/datacache/plugin_datacache.h b/src/datacache/plugin_datacache.h
index bf35b2619..850d3961e 100644
--- a/src/datacache/plugin_datacache.h
+++ b/src/datacache/plugin_datacache.h
@@ -58,10 +58,6 @@ typedef void (*GNUNET_DATACACHE_DeleteNotifyCallback)(void *cls,
 struct GNUNET_DATACACHE_PluginEnvironment
 {
   
-  /**
-   * Scheduler to use.
-   */ 
-  struct GNUNET_SCHEDULER_Handle *sched;
 
   /**
    * Configuration to use.
diff --git a/src/datacache/test_datacache.c b/src/datacache/test_datacache.c
index d0785173e..b626ce67d 100644
--- a/src/datacache/test_datacache.c
+++ b/src/datacache/test_datacache.c
@@ -62,7 +62,6 @@ checkIt (void *cls,
 
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile,
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -74,8 +73,7 @@ run (void *cls,
   unsigned int i;
 
   ok = 0;
-  h = GNUNET_DATACACHE_create (sched,
-                               cfg,
+  h = GNUNET_DATACACHE_create (cfg,
                                "testcache");
   if (h == NULL)
     {
diff --git a/src/datacache/test_datacache_quota.c b/src/datacache/test_datacache_quota.c
index 4674a7da9..77ad63815 100644
--- a/src/datacache/test_datacache_quota.c
+++ b/src/datacache/test_datacache_quota.c
@@ -45,7 +45,6 @@ static const char *plugin_name;
  */
 static void
 run (void *cls,
-     struct GNUNET_SCHEDULER_Handle *sched,
      char *const *args,
      const char *cfgfile, 
      const struct GNUNET_CONFIGURATION_Handle *cfg)
@@ -59,8 +58,7 @@ run (void *cls,
   struct GNUNET_TIME_Absolute exp;
 
   ok = 0;
-  h = GNUNET_DATACACHE_create (sched,
-                               cfg,
+  h = GNUNET_DATACACHE_create (cfg,
                                "testcache");
 
   if (h == NULL)