Changeset 6649 for branches/bugfix-0.9.1/src/sources/req_queue.ml

Timestamp:

06/18/09 17:43:47 (15 months ago)

Author:

metamorph68

Message:

Backported changes adding remaining time in request-based sources.
Set default options to the old behaviour.

Files:

• branches/bugfix-0.9.1/src/sources/req_queue.ml (modified) (3 diffs)

branches/bugfix-0.9.1/src/sources/req_queue.ml

@@ -35 +35 @@
   * user emits a request. *)
 class queue ?(requests=Queue.create()) ?(interactive=true)
-            length default_duration timeout =
+            length default_duration timeout conservative =
 object (self)
-  inherit Request_source.queued ~length ~default_duration ~timeout () as queued
+  inherit Request_source.queued ~length ~default_duration 
+     ~timeout ~conservative () as queued
 
   val reqlock = Mutex.create ()
@@ -179 +180 @@
      Request_source.queued_proto)
     (fun p ->
-       let l,d,t = Request_source.extract_queued_params p in
+       let l,d,t,c = Request_source.extract_queued_params p in
        let interactive = Lang.to_bool (Lang.assoc "interactive" 1 p) in
        let requests = Queue.create () in
@@ -187 +188 @@
               | None -> ())
            (Lang.to_list (List.assoc "queue" p)) ;
-         ((new queue ~requests ~interactive l d t) :> source))
+         ((new queue ~requests ~interactive l d t c) :> source))