Merge branch 'devel'

Author: sanpeqf

.gitignore

@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 CMakeFiles/
+Testing/
 generated/
 CMakeCache.txt
 CTestTestfile.cmake

CMakeLists.txt

@@ -5,7 +5,7 @@
 #
 
 cmake_minimum_required(VERSION 3.12)
-project(bfdev VERSION 1.0.4 LANGUAGES C)
+project(bfdev VERSION 1.0.5 LANGUAGES C)
 
 include(GNUInstallDirs)
 include(CheckIncludeFiles)
@@ -36,6 +36,15 @@ include(scripts/commit.cmake)
 
 commit_hash(BFDEV_COMMITID)
 commit_branch(BFDEV_BRANCH)
+string(TIMESTAMP BFDEV_BUILD_TIME "%A %B %d %H:%M:%S UTC %Y" UTC)
+
+string(APPEND BFDEV_RELEASE
+    "${PROJECT_NAME}-${BFDEV_NAME} "
+    "${BFDEV_VERSION}.${BFDEV_ARCH} "
+    "${BFDEV_COMMITID}-${BFDEV_BRANCH} "
+    "(${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION} ${CMAKE_HOST_SYSTEM_NAME}) "
+    "${BFDEV_BUILD_TIME}"
+)
 
 option(BFDEV_DEVEL "Enable development mode" OFF)
 option(BFDEV_STRICT "Enable strict compilation" ON)

cmake/config.h.in

@@ -19,12 +19,10 @@ BFDEV_BEGIN_DECLS
 #define BFDEV_VERSION_TWEAK ${PROJECT_VERSION_TWEAK}
 #define BFDEV_EXTREVERSION ${BFDEV_EXTREVERSION}
 
-#define BFDEV_ARCH ${BFDEV_ARCH}
 #define BFDEV_NAME ${BFDEV_NAME}
+#define BFDEV_ARCH ${BFDEV_ARCH}
 #define BFDEV_VERSION ${BFDEV_VERSION}
-
-#define BFDEV_COMMITID ${BFDEV_COMMITID}
-#define BFDEV_BRANCH ${BFDEV_BRANCH}
+#define BFDEV_RELEASE "${BFDEV_RELEASE}"
 
 #cmakedefine BFDEV_DEBUG_LIST
 #cmakedefine BFDEV_DEBUG_SLIST
@@ -43,6 +41,18 @@ BFDEV_BEGIN_DECLS
       (patch) <= BFDEV_VERSION_PATCH))              \
 )
 
+static inline const char *
+bfdev_version(void)
+{
+    return __bfdev_stringify(BFDEV_VERSION);
+}
+
+static inline const char *
+bfdev_release(void)
+{
+    return BFDEV_RELEASE;
+}
+
 static inline int
 bfdev_version_major(void)
 {
@@ -63,4 +73,4 @@ bfdev_version_patch(void)
 
 BFDEV_END_DECLS
 
-#endif /*_BFDEV_CONFIG_H_*/
+#endif /* _BFDEV_CONFIG_H_ */

examples/CMakeLists.txt

@@ -16,6 +16,7 @@ add_subdirectory(btree)
 add_subdirectory(cache)
 add_subdirectory(circle)
 add_subdirectory(crc)
+add_subdirectory(crypto)
 add_subdirectory(fifo)
 add_subdirectory(fsm)
 add_subdirectory(guards)

examples/action/simple.c

@@ -17,7 +17,8 @@ test_action(void *pdata)
     return 0;
 }
 
-int main(int argc, char **argv)
+int
+main(int argc, char **argv)
 {
     BFDEV_DEFINE_ACTION(action, test_action, NULL);
     int retval;

examples/allocator/simple.c

@@ -12,6 +12,12 @@ test_alloc(size_t size, void *pdata)
     return malloc(size);
 }
 
+static void *
+test_zalloc(size_t size, void *pdata)
+{
+    return calloc(1, size);
+}
+
 static void *
 test_realloc(void *block, size_t resize, void *pdata)
 {
@@ -24,30 +30,31 @@ test_free(void *block, void *pdata)
     return free((void *)block);
 }
 
-BFDEV_DEFINE_ALLOC(
+BFDEV_DEFINE_ALLOC_OPS(
     test_ops,
-    test_alloc,
-    test_realloc,
-    test_free,
-    NULL
+    test_alloc, test_zalloc,
+    test_realloc, test_free
 );
 
-int main(int argc, char const *argv[])
+int
+main(int argc, char const *argv[])
 {
+    BFDEV_DEFINE_ALLOC(test, &test_ops, NULL);
     int *block;
 
-    block = bfdev_malloc(&test_ops, sizeof(*block));
+    block = bfdev_malloc(&test, sizeof(*block));
     if (!block)
         return 1;
-    bfdev_free(&test_ops, block);
+    bfdev_free(&test, block);
 
-    block = bfdev_zalloc(&test_ops, sizeof(*block));
+    block = bfdev_zalloc(&test, sizeof(*block));
     if (!block)
         return 1;
-    block = bfdev_realloc(&test_ops, block, sizeof(*block) * 2);
+
+    block = bfdev_realloc(&test, block, sizeof(*block) * 2);
     if (!block)
         return 1;
-    bfdev_free(&test_ops, block);
+    bfdev_free(&test, block);
 
     return 0;
 }

examples/arc4/bandwidth.c

@@ -18,7 +18,8 @@
 #define TEST_LOOP 3
 #define TEST_KEY 64
 
-int main(int argc, const char *argv[])
+int
+main(int argc, const char *argv[])
 {
     bfdev_arc4_ctx_t sctx, dctx;
     unsigned int count, loop;

examples/array/simple.c

@@ -12,7 +12,8 @@
 #define TEST_SIZE 64
 BFDEV_DEFINE_ARRAY(test_array, NULL, TEST_SIZE);
 
-int main(int argc, const char *argv[])
+int
+main(int argc, const char *argv[])
 {
     unsigned int count;
     void *array;

examples/ascii85/.gitignore

@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 /ascii85-bandwidth
+/ascii85

examples/ascii85/bandwidth.c

@@ -17,7 +17,8 @@
 #define TEST_SIZE BFDEV_SZ_1MiB
 #define TEST_LOOP 3
 
-int main(int argc, char const *argv[])
+int
+main(int argc, char const *argv[])
 {
     unsigned int count, loop;
     uint8_t *dbuff, *sbuff;