new carray capi version

Author: osch

src/carray_capi.h

@@ -11,7 +11,7 @@
 #endif
 
 #define CARRAY_CAPI_ID_STRING     "_capi_carray"
-#define CARRAY_CAPI_VERSION_MAJOR  -2
+#define CARRAY_CAPI_VERSION_MAJOR   1
 #define CARRAY_CAPI_VERSION_MINOR   0
 #define CARRAY_CAPI_VERSION_PATCH   0
 
@@ -77,7 +77,7 @@ enum carray_attr
 
 struct carray_info
 {
-    carray_type type;
+    carray_type elementType;
     carray_attr attr;
     size_t      elementSize;
     size_t      elementCount;
@@ -206,13 +206,55 @@ struct carray_capi
      * newElementCount - new number of elements. If this is larger than the current 
      *                   element count, the new elements are uninitialized.
      *
-     * shrinkCapacity  - flag, if true the capacity is set to the new size.
+     * reservePercent  - if < 0 the capacity is set to the new size,
+     *                   if == 0 the capacity remains if the new size is smaller
+     *                           than current capacity.
+     *                   if > 0 the capacity gets a reserve of reservePercent percent
+     *                   if capacity needs to be increased. E.g. if reservePercent == 100
+     *                   the capacity is doubled if newElementCount exceeds the current
+     *                   capacity.
      *
      * Returns pointer to the first element in the array. The caller may read
      * or write newElementCount elements at this pointer.
      * Returns NULL on failure or if newElementCount == 0.
      */
-    void* (*resizeCarray)(carray* a, size_t newElementCount, int shrinkCapacity);
+    void* (*resizeCarray)(carray* a, size_t newElementCount, int reservePercent);
+    
+    /**
+     * Insert Elements.
+     *
+     * offset       - index of the first new element, 0 <= offset <= elementCount
+     * insertCount  - number of elements to be inserted
+     *
+     * reservePercent  - if < 0 the capacity is set to the new size,
+     *                   if == 0 the capacity remains if the new size is smaller
+     *                           than current capacity.
+     *                   if > 0 the capacity gets a reserve of reservePercent percent
+     *                   if capacity needs to be increased. E.g. if reservePercent == 100
+     *                   the capacity is doubled if new element count exceeds the current
+     *                   capacity.
+     *
+     * Returns pointer to the first new element in the array. The caller may write 
+     * insertCount elements at this pointer.
+     * Returns NULL on failure or if insertCount == 0.
+     */
+    void* (*insertElements)(carray* a, size_t offset, size_t insertCount, int reservePercent);
+
+    /**
+     * Insert Elements.
+     *
+     * offset       - index of the first element to be removed, 0 <= offset < elementCount
+     * removeCount  - number of elements to be removed
+     *
+     * reservePercent  - if < 0 the capacity is set to the new size,
+     *                   if == 0 the capacity remains if the new size is smaller
+     *                           than current capacity.
+     *                   if > 0 the capacity gets a reserve of reservePercent percent
+     *                   if capacity needs to be increased. E.g. if reservePercent == 100
+     *                   the capacity is doubled if new element count exceeds the current
+     *                   capacity.
+     */
+    void  (*removeElements)(carray* a, size_t offset, size_t count, int reservePercent);
 };
 
 #if CARRAY_CAPI_IMPLEMENT_SET_CAPI

src/receiver_capi_impl.c

@@ -161,7 +161,7 @@ static void* addArrayToWriter(receiver_writer* writer, receiver_array_type type,
         default: return NULL;
     }
     carray_info info = {0};
-    info.type = carrayType;
+    info.elementType  = carrayType;
     info.elementSize  = elementSize;
     info.elementCount = elementCount;
     size_t args_size = mtmsg_serialize_calc_carray_size(&info);

src/serialize.c

@@ -195,7 +195,7 @@ int mtmsg_serialize_get_msg_args(lua_State* L)
                         par->errorArg = arg;
                         return raiseCarrayError(L, capi, reason);
                     }
-                    capi->resizeCarray(carray, 0, false);
+                    capi->resizeCarray(carray, 0, 0);
                 }
                 arg += 1;
             }
@@ -263,7 +263,7 @@ int mtmsg_serialize_get_msg_args(lua_State* L)
                 break;
             }
             case BUFFER_CARRAY: {
-                carray_type   type         = (unsigned char)buffer[p++];
+                carray_type   elementType  = (unsigned char)buffer[p++];
                 unsigned char elementSize  = (unsigned char)buffer[p++];;
                 size_t        elementCount;
                 memcpy(&elementCount, buffer + p, sizeof(size_t));
@@ -285,10 +285,10 @@ int mtmsg_serialize_get_msg_args(lua_State* L)
                             return raiseCarrayError(L, capi, reason);
                         }
                         arg += 1;
-                        if (info.type == type && info.elementSize == elementSize) {
+                        if (info.elementType == elementType && info.elementSize == elementSize) {
                             break;
                         }
-                        capi->resizeCarray(carray, 0, false);
+                        capi->resizeCarray(carray, 0, 0);
                         capi      = NULL;
                         carray    = NULL;
                     } else {
@@ -297,7 +297,7 @@ int mtmsg_serialize_get_msg_args(lua_State* L)
                 }
                 void* data;
                 if (carray) {
-                    data = capi->resizeCarray(carray, elementCount, false);
+                    data = capi->resizeCarray(carray, elementCount, 0);
                     if (!data) {
                         par->errorArg = arg - 1;
                         return luaL_error(L, "cannot resize carray");
@@ -307,8 +307,8 @@ int mtmsg_serialize_get_msg_args(lua_State* L)
                     if (!par->carrayCapi) {
                         par->carrayCapi = carray_require_capi(L);
                     }
-                    if (!par->carrayCapi->newCarray(L, type, CARRAY_DEFAULT, elementCount, &data)) {
-                        return luaL_error(L, "internal error creating carray for type %d", type);
+                    if (!par->carrayCapi->newCarray(L, elementType, CARRAY_DEFAULT, elementCount, &data)) {
+                        return luaL_error(L, "internal error creating carray for type %d", elementType);
                     }
                 }
                 memcpy(data, buffer + p, len);

src/serialize.h

@@ -129,7 +129,7 @@ static inline char* mtmsg_serialize_cfunction_to_buffer(lua_CFunction value, cha
 static inline char* mtmsg_serialize_carray_header_to_buffer(carray_info* info, char* buffer)
 {
     *buffer++ = BUFFER_CARRAY;
-    *buffer++ = info->type;
+    *buffer++ = info->elementType;
     *buffer++ = (unsigned char)info->elementSize;
     memcpy(buffer, &info->elementCount, sizeof(size_t));
     buffer += sizeof(size_t);