Changeset dd5c623 in mainline

Timestamp:

2019-08-03T09:44:51Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

4224ef7

Parents:

dda2602

git-author:

Michal Koutný <xm.koutny+hos@…> (2015-05-08 11:21:11)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 09:44:51)

Message:

dyn_array: Non-allocating initialization API

Location:

uspace

Files:

• lib/c/generic/adt/dyn_array.c (modified) (3 diffs)
• lib/c/include/adt/dyn_array.h (modified) (3 diffs)
• lib/c/test/dyn_array.c (modified) (1 diff)
• srv/sysman/job.c (modified) (1 diff)
• srv/sysman/sysman.c (modified) (1 diff)

uspace/lib/c/generic/adt/dyn_array.c

@@ -73 +73 @@
         assert(index < da->size);
         _dyn_array_unshift(da, index, 1);
-        int rc = _dyn_array_reserve(da, da->size);
+        int rc = dyn_array_reserve(da, da->size);
         assert(rc == EOK);
 }
@@ -83 +83 @@
 }
 
-int _dyn_array_initialize(dyn_array_t *da, size_t item_size, size_t capacity)
-{
-        da->_item_size = item_size;
-        da->_data = NULL;
-
-        da->capacity = 0;
-        da->size = 0;
-
-        return _dyn_array_reserve(da, capacity);
-}
-
 /** Grows/shrinks array so that it effeciently stores desired capacity
  *
  * @param      da
- * @param[in]  desired capacity of array
+ * @param[in]  desired capacity of array (items)
  *
  * @return EOK
  * @return ENOMEM
  */
-int _dyn_array_reserve(dyn_array_t *da, size_t capacity)
+int dyn_array_reserve(dyn_array_t *da, size_t capacity)
 {
         const size_t factor = 2;
@@ -115 +104 @@
 
         return dyn_array_realloc(da, new_capacity);
+}
+
+void _dyn_array_initialize(dyn_array_t *da, size_t item_size)
+{
+        da->_item_size = item_size;
+        da->_data = NULL;
+
+        da->capacity = 0;
+        da->size = 0;
 }
 

uspace/lib/c/include/adt/dyn_array.h

@@ -55 +55 @@
  * @param[in]  capacity  initial capacity of array
  *
- * @return EOK on success
- * @return ENOMEM on low memory
+ * @return void
  */
-#define dyn_array_initialize(dyn_array, type, capacity)                        \
-        _dyn_array_initialize((dyn_array), sizeof(type), capacity)
+#define dyn_array_initialize(dyn_array, type)                                  \
+        _dyn_array_initialize((dyn_array), sizeof(type))
 
 
@@ -78 +77 @@
         size_t _index = (index);                                               \
         dyn_array_t *_da = (dyn_array);                                        \
-        int rc = _dyn_array_reserve(_da, _da->size + 1);                       \
+        int rc = dyn_array_reserve(_da, _da->size + 1);                       \
         if (!rc) {                                                             \
                 _dyn_array_shift(_da, _index, 1);                              \
@@ -127 +126 @@
 extern void dyn_array_remove(dyn_array_t *, size_t);
 void dyn_array_clear(dyn_array_t *);
+extern int  dyn_array_reserve(dyn_array_t *, size_t);
 
-extern int _dyn_array_initialize(dyn_array_t *, size_t, size_t);
-extern int  _dyn_array_reserve(dyn_array_t *, size_t);
+extern void _dyn_array_initialize(dyn_array_t *, size_t);
 extern void _dyn_array_shift(dyn_array_t *, size_t, size_t);
 extern void _dyn_array_unshift(dyn_array_t *, size_t, size_t);

uspace/lib/c/test/dyn_array.c

@@ -39 +39 @@
 
 PCUT_TEST_BEFORE {
-        int rc = dyn_array_initialize(&da, data_t, 3);
+        dyn_array_initialize(&da, data_t);
+        int rc = dyn_array_reserve(&da, 3);
         assert(rc == EOK);
 }

uspace/srv/sysman/job.c

@@ -89 +89 @@
         job_add_ref(job);
 
-        (void)dyn_array_initialize(&job->blocked_jobs, job_ptr_t, 0);
+        dyn_array_initialize(&job->blocked_jobs, job_ptr_t);
         job->blocking_jobs = 0;
         job->blocking_job_failed = false;

uspace/srv/sysman/sysman.c

@@ -254 +254 @@
         job_t *job = data;
         dyn_array_t job_closure;
-        dyn_array_initialize(&job_closure, job_ptr_t, 0);
+        dyn_array_initialize(&job_closure, job_ptr_t);
 
         int rc = job_create_closure(job, &job_closure);