Changeset 4b1c6a4b in mainline

Timestamp:

2019-08-03T08:40:30Z (5 years ago)

Author:

Matthieu Riolo <matthieu.riolo@…>

Children:

7671231

Parents:

8432ae1

git-author:

Michal Koutny <xm.koutny+hos@…> (2015-04-25 00:30:34)

git-committer:

Matthieu Riolo <matthieu.riolo@…> (2019-08-03 08:40:30)

Message:

libc: Add more dyn_array functions
Conflicts:

boot/Makefile.common

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/lib/c/generic/adt/dyn_array.c (modified) (2 diffs)
• uspace/lib/c/include/adt/dyn_array.h (modified) (2 diffs)
• uspace/lib/c/test/dyn_array.c (modified) (1 diff)

boot/Makefile.common

@@ -251 +251 @@
         $(USPACE_PATH)/lib/c/test-libc \
         $(USPACE_PATH)/lib/label/test-liblabel \
+        $(USPACE_PATH)/lib/conf/test-libconf \
         $(USPACE_PATH)/lib/posix/test-libposix \
         $(USPACE_PATH)/lib/sif/test-libsif \

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

@@ -45 +45 @@
 
 
-static void dyn_array_clear(dyn_array_t *da)
-{
-        da->size = 0;
-}
+
 
 static int dyn_array_realloc(dyn_array_t *da, size_t capacity)
@@ -80 +77 @@
 }
 
+/** Clear dynamic array (empty) */
+void dyn_array_clear(dyn_array_t *da)
+{
+        da->size = 0;
+}
+
 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;

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

@@ -97 +97 @@
 /** Dynamic array iteration
  *
- * @param[in]  it   name of variable used as iterator, it's pointer to @p type
+ * @param[in]  dyn_array   dyn_array_t (not pointer)
+ * @param[in]  it          name of variable used as iterator, it's pointer
+ *                         to @p type
  */
 #define dyn_array_foreach(dyn_array, type, it)                                 \
@@ -103 +105 @@
             it != ((type *)(dyn_array)._data + (dyn_array).size); ++it)
 
+/** Find first occurence of value
+ *
+ * @param[in]  dyn_array   dyn_array_t *
+ * @param[in]  value       value to search for
+ *
+ * @return  index of found value or size of array when no found
+ */
+#define dyn_array_find(dyn_array, type, value)                                 \
+({                                                                             \
+        size_t _result = (dyn_array)->size;                                    \
+        dyn_array_foreach(*(dyn_array), type, _it) {                           \
+                if (*_it == value) {                                           \
+                        _result = _it - (type *)(dyn_array)->_data;            \
+                        break;                                                 \
+                }                                                              \
+        }                                                                      \
+        _result;                                                               \
+})
 
 extern void dyn_array_destroy(dyn_array_t *);
 extern void dyn_array_remove(dyn_array_t *, size_t);
+void dyn_array_clear(dyn_array_t *);
 
 extern int _dyn_array_initialize(dyn_array_t *, size_t, size_t);

uspace/lib/c/test/dyn_array.c

@@ -124 +124 @@
 }
 
+PCUT_TEST(find) {
+        dyn_array_append(&da, data_t, 10);
+        dyn_array_append(&da, data_t, 11);
+        dyn_array_append(&da, data_t, 12);
+        dyn_array_append(&da, data_t, 99);
+
+        PCUT_ASSERT_INT_EQUALS(0, dyn_array_find(&da, data_t, 10));
+        PCUT_ASSERT_INT_EQUALS(3, dyn_array_find(&da, data_t, 99));
+        PCUT_ASSERT_INT_EQUALS(4, dyn_array_find(&da, data_t, 666));
+}
 
 PCUT_EXPORT(dyn_array);