X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_oset.h;h=fb36aac1cf17074696c353ce90ed3e2d9873d0bf;hb=bbdcfead98c6d3536215c3f0f603e4f92a28d26b;hp=0ac678f59273b393c8fe0901231a6eca0bb19ed1;hpb=a7e6fe2b890c07cb428be7ff82d1267847a1efdf;p=gnulib.git

diff --git a/lib/gl_oset.h b/lib/gl_oset.h
index 0ac678f59..fb36aac1c 100644
--- a/lib/gl_oset.h
+++ b/lib/gl_oset.h
@@ -56,9 +56,10 @@ extern "C" {
    Operation                  ARRAY     TREE
 
    gl_oset_size                O(1)     O(1)
-   gl_oset_add
-   gl_oset_remove
-   gl_oset_search
+   gl_oset_add                 O(n)   O(log n)
+   gl_oset_remove              O(n)   O(log n)
+   gl_oset_search            O(log n) O(log n)
+   gl_oset_search_atleast    O(log n) O(log n)
    gl_oset_iterator            O(1)   O(log n)
    gl_oset_iterator_next       O(1)   O(log n)
  */
@@ -69,6 +70,10 @@ extern "C" {
    NULL denotes pointer comparison.  */
 typedef int (*gl_setelement_compar_fn) (const void *elt1, const void *elt2);
 
+/* Type of function used to compare an element with a threshold.
+   Return true if the element is greater or equal than the threshold.  */
+typedef bool (*gl_setelement_threshold_fn) (const void *elt, const void *threshold);
+
 struct gl_oset_impl;
 /* Type representing an entire ordered set.  */
 typedef struct gl_oset_impl * gl_oset_t;
@@ -90,6 +95,16 @@ extern size_t gl_oset_size (gl_oset_t set);
    Return true if found, or false if not present in the set.  */
 extern bool gl_oset_search (gl_oset_t set, const void *elt);
 
+/* Search the least element in the ordered set that compares greater or equal
+   to the given THRESHOLD.  The representation of the THRESHOLD is defined
+   by the THRESHOLD_FN.
+   Return true and store the found element in *ELTP if found, otherwise return
+   false.  */
+extern bool gl_oset_search_atleast (gl_oset_t set,
+				    gl_setelement_threshold_fn threshold_fn,
+				    const void *threshold,
+				    const void **eltp);
+
 /* Add an element to an ordered set.
    Return true if it was not already in the set and added.  */
 extern bool gl_oset_add (gl_oset_t set, const void *elt);
@@ -138,15 +153,18 @@ extern void gl_oset_iterator_free (gl_oset_iterator_t *iterator);
 
 struct gl_oset_implementation
 {
-  // gl_oset_t functions.
+  /* gl_oset_t functions.  */
   gl_oset_t (*create_empty) (gl_oset_implementation_t implementation,
 			     gl_setelement_compar_fn compar_fn);
   size_t (*size) (gl_oset_t set);
   bool (*search) (gl_oset_t set, const void *elt);
+  bool (*search_atleast) (gl_oset_t set,
+			  gl_setelement_threshold_fn threshold_fn,
+			  const void *threshold, const void **eltp);
   bool (*add) (gl_oset_t set, const void *elt);
   bool (*remove) (gl_oset_t set, const void *elt);
   void (*oset_free) (gl_oset_t set);
-  // gl_oset_iterator_t functions.
+  /* gl_oset_iterator_t functions.  */
   gl_oset_iterator_t (*iterator) (gl_oset_t set);
   bool (*iterator_next) (gl_oset_iterator_t *iterator, const void **eltp);
   void (*iterator_free) (gl_oset_iterator_t *iterator);
@@ -186,6 +204,16 @@ gl_oset_search (gl_oset_t set, const void *elt)
   return ((const struct gl_oset_impl_base *) set)->vtable->search (set, elt);
 }
 
+# define gl_oset_search_atleast gl_oset_search_atleast_inline
+static inline bool
+gl_oset_search_atleast (gl_oset_t set,
+			gl_setelement_threshold_fn threshold_fn,
+			const void *threshold, const void **eltp)
+{
+  return ((const struct gl_oset_impl_base *) set)->vtable
+	 ->search_atleast (set, threshold_fn, threshold, eltp);
+}
+
 # define gl_oset_add gl_oset_add_inline
 static inline bool
 gl_oset_add (gl_oset_t set, const void *elt)