Merge pull request #3104 from lambdageek/dev/monoerror-resolve_vcall

[mono.git] / eglib / src / garray.c

diff --git a/eglib/src/garray.c b/eglib/src/garray.c
index e9605d0f7862dba4bde3aa0a3e7d56dc7d2a7ef1..b9844f88a9125869e98c8bb0549f3c55013df647 100644 (file)
--- a/eglib/src/garray.c
+++ b/eglib/src/garray.c
@@ -37,32 +37,30 @@
 typedef struct {
        GArray array;
        gboolean clear_;
-       gboolean element_size;
+       guint element_size;
        gboolean zero_terminated;
-       gint capacity;
+       guint capacity;
 } GArrayPriv;
 
 static void
-ensure_capacity (GArrayPriv *priv,
-                int capacity)
+ensure_capacity (GArrayPriv *priv, guint capacity)
 {
-       int new_capacity = MAX (priv->capacity, INITIAL_CAPACITY);
-
-       if (capacity < priv->capacity)
+       guint new_capacity;
+       
+       if (capacity <= priv->capacity)
                return;
-
-       while (new_capacity < capacity) {
-               new_capacity <<= 1;
-       }
-       capacity = new_capacity;
-       priv->array.data = (gchar*)g_realloc (priv->array.data, element_length (priv, capacity));
-
+       
+       new_capacity = (capacity + 63) & ~63;
+       
+       priv->array.data = g_realloc (priv->array.data, element_length (priv, new_capacity));
+       
        if (priv->clear_) {
                memset (element_offset (priv, priv->capacity),
                        0,
-                       element_length (priv, capacity - priv->capacity));
+                       element_length (priv, new_capacity - priv->capacity));
        }
-       priv->capacity = capacity;
+       
+       priv->capacity = new_capacity;
 }
 
 GArray *
@@ -80,6 +78,22 @@ g_array_new (gboolean zero_terminated,
        return (GArray*)rv;
 }
 
+GArray *
+g_array_sized_new (gboolean zero_terminated,
+            gboolean clear_,
+            guint element_size,
+                guint reserved_size)
+{
+       GArrayPriv *rv = g_new0 (GArrayPriv, 1);
+       rv->zero_terminated = zero_terminated;
+       rv->clear_ = clear_;
+       rv->element_size = element_size;
+
+       ensure_capacity (rv, reserved_size);
+
+       return (GArray*)rv;
+}
+
 gchar*
 g_array_free (GArray *array,
              gboolean free_segment)
@@ -181,3 +195,44 @@ g_array_remove_index (GArray *array,
        return array;
 }
 
+GArray*
+g_array_remove_index_fast (GArray *array,
+                     guint index_)
+{
+       GArrayPriv *priv = (GArrayPriv*)array;
+
+       g_return_val_if_fail (array != NULL, NULL);
+
+       memmove (element_offset (priv, index_),
+                element_offset (priv, array->len - 1),
+                element_length (priv, 1));
+
+       array->len --;
+
+       if (priv->zero_terminated) {
+               memset (element_offset (priv, priv->array.len),
+                       0,
+                       priv->element_size);
+       }
+
+       return array;
+}
+
+void
+g_array_set_size (GArray *array, gint length)
+{
+       GArrayPriv *priv = (GArrayPriv*)array;
+
+       g_return_if_fail (array != NULL);
+       g_return_if_fail (length >= 0);
+
+       if (length == priv->capacity)
+               return; // nothing to be done
+
+       if (length > priv->capacity) {
+               // grow the array
+               ensure_capacity (priv, length);
+       }
+
+       array->len = length;
+}