Merge pull request #214 from AmigaLabs/development

Preparing release of the v1.4.0

Author: walkero-gr

GNUmakefile.os4

@@ -72,7 +72,7 @@ WARNINGS := \
 	-Wundef -Wmissing-declarations -Wunused -Wwrite-strings -Wno-unused-value -Wno-comment -Wno-missing-braces \
 	-Wno-deprecated-declarations -Wno-sign-compare -Wno-unused-variable -Wno-parentheses -Wno-missing-prototypes \
 	-Wstrict-aliasing -Wno-shadow -Wno-discarded-qualifiers -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing \
-    -Wno-type-limits -Wno-cast-function-type -Wno-frame-address -Werror \
+    -Wno-type-limits -Wno-cast-function-type -Wno-frame-address -Wno-error=unused-but-set-variable -Werror \
      # -Wbad-function-cast -Wconversion -Wformat
 
 PIC		   := -fPIC -DPIC
@@ -106,7 +106,8 @@ INCLUDES   := -I$(LIB_DIR)/include \
 				-I$(LIB_DIR)/termios \
 				-I$(LIB_DIR)/time \
 				-I$(LIB_DIR)/unistd \
-				-I$(LIB_DIR)/wchar
+				-I$(LIB_DIR)/wchar \
+				-I$(LIB_DIR)/wmem
 
 SHARED   := $(if $(SHARED),$(SHARED),yes)
 STATIC   := $(if $(STATIC),$(STATIC),yes)
@@ -139,6 +140,8 @@ ifdef SPE
                 -fno-align-functions -fno-align-jumps -fno-align-loops -fno-align-labels -fno-inline-small-functions \
                 -fno-indirect-inlining -Wno-overflow -Wno-unused-but-set-variable -Wno-uninitialized #-Wdouble-promotion
     AFLAGS := $(AFLAGS) -mvrsave -D__SPE__ -mspe -mtune=8540 -mcpu=8540 -mfloat-gprs=double $(CMATH) -Wno-overflow
+    CFLAGS := $(filter-out -Wno-cast-function-type, $(CFLAGS))
+    CFLAGS_N := $(filter-out -Wno-cast-function-type, $(CFLAGS_N))
 endif
 
 ifdef PROFILE
@@ -362,7 +365,7 @@ endef
 define COMPILE_ALTIVEC_REG
 $(VERBOSE)@$(MAKEDIR) $(@D)
 $(VERBOSE)echo -e "\rAssembling altivec \033[0;33m[$(@D)]\033[0m \r\t\t\t\t\t\t\t\t\t\t\t \033[0;31m$(@F)\033[0m"
-$(VERBOSE)$(CC) -maltivec -mabi=altivec -mvrsave -mregnames -DVRSAVE -o $@ -c $< $(LOG_COMMAND)
+$(VERBOSE)$(CC) -maltivec -mabi=altivec -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -mvrsave -mregnames -DVRSAVE -o $@ -c $< $(LOG_COMMAND)
 endef
 
 define COMPILE_SPE_REG

README.md

@@ -53,8 +53,19 @@ have problems running existent software!
 
 ### New memory allocator
 
-Clib4 now use `Wheel Of Fortune` allocator that is faster than previous one, and it seems more robust and with a cleaner
-and portable code
+Clib4 now use `wmem` allocator from WireShark that is faster than previous one, and it seems more robust and with a cleaner
+and portable code.  
+You can choose at runtime (for test purpose) which kind of allocators want to use setting `CLIB4_MEMORY_ALLOCATOR` env variable.  
+At moment you can use:
+
+| Value | Allocator                 |  
+|-------|---------------------------|
+| 1     | WMEM_ALLOCATOR_SIMPLE     |
+| 2     | WMEM_ALLOCATOR_BLOCK      |
+| 3     | WMEM_ALLOCATOR_STRICT     |
+| 4     | WMEM_ALLOCATOR_BLOCK_FAST |
+
+The default one is `WMEM_ALLOCATOR_BLOCK_STRICT`. `WMEM_ALLOCATOR_BLOCK_FAST` can crash on some situation. Please refer to `wmem/wmem_core.h` for all details. 
 
 ### Optimized AMCC functions
 
@@ -219,6 +230,13 @@ constructors/destructors executions
 - Try to use some functions/headers from https://github.com/attractivechaos/klib to improve speed
 - Use a good locale implementation
 
+### Libraries repository
+
+A repository with pre packaged libraries is present and ready to use for debian like systems.
+You can find all informations to the following <a href="https://github.com/AmigaLabs/clib4/wiki/Clib4-apt-packages-repository">wiki page</a>.
+
+A list of packages can be found into public <a href="https://clib4pkg.amigasoft.net/ubuntu/dists/focal/main/binary-amd64/Packages">Packages</a> file.
+
 ## Legal status
 
 Because this library is in part based upon free software it would be uncourteous not to make it free software itself.

libc.gmk

@@ -112,6 +112,7 @@ C_LOCALE := \
 	locale/setlocale.o
 
 C_MISC := \
+	misc/children.o \
 	misc/map.o \
 	misc/uuid.o
 
@@ -159,7 +160,6 @@ C_POSIX := \
 	posix/getrlimit.o \
 	posix/setrlimit.o \
 	posix/getrusage.o \
-	posix/checkabort.o \
 	posix/kill.o \
 	posix/raise.o \
 	posix/sigaction.o \
@@ -171,8 +171,11 @@ C_POSIX := \
     posix/sigismember.o \
 	posix/sigmask.o \
 	posix/signal.o \
+    posix/sigpause.o \
 	posix/sigprocmask.o \
+	posix/sigsuspend.o \
 	posix/sigsetmask.o \
+	posix/sigwait.o \
 	posix/statvfs.o \
 	posix/sysinfo.o \
 	posix/sysv_ftok.o \
@@ -195,6 +198,9 @@ C_POSIX := \
 	posix/sysv_shmids.o \
 	posix/ulimit.o \
 	posix/readv.o \
+	wait/wait.o \
+	wait/waitpid.o \
+	posix/waitpoll.o \
 	posix/writev.o \
 	posix/uname.o
 
@@ -420,7 +426,6 @@ C_STDIO := \
 	stdio/iobhookentry.o \
 	stdio/lock.o \
 	stdio/openiob.o \
-	stdio/parent_of_fh.o \
 	stdio/perror.o \
 	stdio/popen.o \
 	stdio/printf.o \
@@ -544,8 +549,7 @@ C_STDLIB := \
 	stdlib/udivsi4.o \
 	stdlib/umodsi3.o \
 	stdlib/unsetenv.o \
-	stdlib/valloc.o \
-	stdlib/wof_allocator.o
+	stdlib/valloc.o
 
 C_STRING := \
 	string/strings_ffs.o \
@@ -576,12 +580,15 @@ C_STRING := \
 	cpu/4xx/strlen440.o \
 	cpu/4xx/strncmp440.o \
 	cpu/4xx/strrchr440.o \
+	cpu/altivec/vec_memchr.o \
 	cpu/altivec/vec_memcmp.o \
 	cpu/altivec/vec_memcpy.o \
 	cpu/altivec/vec_memset.o \
+	cpu/altivec/vec_strchr.o \
 	cpu/altivec/vec_strcpy.o \
 	cpu/generic/bcopy.o \
 	cpu/generic/strcat.o \
+	cpu/generic/strchr.o \
 	cpu/generic/strcpy.o \
 	cpu/generic/strlen.o \
 	string/rindex.o \
@@ -620,6 +627,7 @@ C_STRING := \
 	string/strxfrm.o
 
 C_TERMCAP := \
+    termcap/tcstubs.o \
     termcap/termcap.o \
     termcap/tparam.o
 
@@ -754,7 +762,9 @@ C_UNISTD := \
 	unistd/setlogin.o \
 	unistd/sleep.o \
 	unistd/spawnv.o \
+	unistd/spawnve.o \
 	unistd/spawnvp.o \
+	unistd/spawnvpe.o \
 	unistd/strip_double_slash.o \
 	unistd/symlink.o \
 	unistd/sync_fd.o \
@@ -764,6 +774,7 @@ C_UNISTD := \
 	unistd/translatea2u.o \
 	unistd/translaterel.o \
 	unistd/translateu2a.o \
+	unistd/search_command_path.o \
 	unistd/truncate.o \
 	unistd/truncate64.o \
 	unistd/ttyname.o \
@@ -911,6 +922,23 @@ C_WCHAR := \
 	wchar/wctrans.o \
 	wchar/wctype.o
 
+C_WMEM := \
+    wmem/wmem_allocator_block.o \
+    wmem/wmem_allocator_block_fast.o \
+    wmem/wmem_allocator_simple.o \
+    wmem/wmem_allocator_strict.o \
+    wmem/wmem_array.o \
+    wmem/wmem_core.o \
+    wmem/wmem_interval_tree.o \
+    wmem/wmem_list.o \
+    wmem/wmem_map.o \
+    wmem/wmem_miscutl.o \
+    wmem/wmem_multimap.o \
+    wmem/wmem_stack.o \
+    wmem/wmem_strutl.o \
+    wmem/wmem_tree.o \
+    wmem/wmem_user_cb.o
+
 ifdef SPE
     $(info Adding SPE objects)
     C_STRING := $(C_STRING) \
@@ -957,7 +985,8 @@ C_LIBRARY := \
 	$(C_TIME) \
 	$(C_UNISTD) \
 	$(C_USERGROUP) \
-	$(C_WCHAR)
+	$(C_WCHAR) \
+	$(C_WMEM)
 
 C_LIB := \
 	c.lib_rev.o \

library/argz/create.c

@@ -9,34 +9,30 @@
 #include <argz.h>
 
 error_t
-argz_create(char *const argv[], char **argz, size_t *argz_len)
-{
+argz_create(char *const argv[], char **argz, size_t *argz_len) {
     int argc = 0;
     int i = 0;
     size_t len = 0;
     char *iter;
 
     *argz_len = 0;
 
-    if (*argv == NULL)
-    {
+    if (*argv == NULL) {
         *argz = NULL;
         return 0;
     }
 
-    while (argv[argc])
-    {
+    while (argv[argc]) {
         *argz_len += (strlen(argv[argc]) + 1);
         argc++;
     }
 
     /* There are argc strings to copy into argz. */
-    if (!(*argz = (char *)malloc(*argz_len)))
+    if (!(*argz = (char *) malloc(*argz_len)))
         return ENOMEM;
 
     iter = *argz;
-    for (i = 0; i < argc; i++)
-    {
+    for (i = 0; i < argc; i++) {
         len = strlen(argv[i]) + 1;
         memcpy(iter, argv[i], len);
         iter += len;

library/argz/create_sep.c

@@ -9,38 +9,34 @@
 #include <argz.h>
 
 error_t
-argz_create_sep(const char *string, int sep, char **argz, size_t *argz_len)
-{
-    size_t len = 0;
-    int i = 0;
+argz_create_sep(const char *string, int sep, char **argz, size_t *argz_len) {
+    size_t len;
+    int i;
     int num_strings = 0;
     char delim[2];
-    char *running = 0;
-    char *old_running = 0;
-    char *token = 0;
-    char *iter = 0;
+    char *running;
+    char *old_running;
+    char *token;
+    char *iter;
 
     delim[0] = (char) sep;
     delim[1] = '\0';
 
     running = strdup(string);
 
-    if(!running)
-    {
+    if (!running) {
         return ENOMEM;
     }
 
     old_running = running;
 
-    while ((token = strsep(&running, delim)))
-    {
+    while ((token = strsep(&running, delim))) {
         len = strlen(token);
         *argz_len += (len + 1);
         num_strings++;
     }
 
-    if (!(*argz = (char *)malloc(*argz_len)))
-    {
+    if (!(*argz = (char *) malloc(*argz_len))) {
         free(old_running);
         return ENOMEM;
     }
@@ -49,17 +45,15 @@ argz_create_sep(const char *string, int sep, char **argz, size_t *argz_len)
 
     running = strdup(string);
 
-    if(!running)
-    {
+    if (!running) {
         free(*argz);
         return ENOMEM;
     }
 
     old_running = running;
 
     iter = *argz;
-    for (i = 0; i < num_strings; i++)
-    {
+    for (i = 0; i < num_strings; i++) {
         token = strsep(&running, delim);
         len = strlen(token) + 1;
         memcpy(iter, token, len);

library/argz/delete.c

@@ -9,25 +9,22 @@
 #include <argz.h>
 
 error_t
-argz_delete(char **argz, size_t *argz_len, char *entry)
-{
+argz_delete(char **argz, size_t *argz_len, char *entry) {
     size_t len = 0;
     char *moveto = entry;
 
-    if (entry)
-    {
+    if (entry) {
         len = strlen(entry) + 1;
         entry += len;
 
-        memmove(moveto, entry, (size_t) (*argz + *argz_len - entry));
+        memmove(moveto, entry, (size_t)(*argz + *argz_len - entry));
 
         *argz_len -= len;
 
-        if (!(*argz = (char *)realloc(*argz, *argz_len)))
+        if (!(*argz = (char *) realloc(*argz, *argz_len)))
             return ENOMEM;
 
-        if (*argz_len <= 0)
-        {
+        if (*argz_len <= 0) {
             free(*argz);
             *argz = NULL;
         }