core-builtin: add and use built in shim wrapper for strlen

Signed-off-by: Colin Ian King <colin.i.king@gmail.com>

Author: ColinIanKing

Makefile.config

@@ -2642,6 +2642,7 @@ functions: \
 	BUILTIN_STRCHR \
 	BUILTIN_STRCMP \
 	BUILTIN_STRDUP \
+	BUILTIN_STRLEN \
 	BUILTIN_STRNCMP \
 	BUILTIN_STRSTR \
 	BUILTIN_SUPPORTS \
@@ -3734,6 +3735,9 @@ BUILTIN_STRCMP:
 BUILTIN_STRDUP:
 	$(call check,test-builtin-strdup,HAVE_BUILTIN_STRDUP,__builtin_strdup)
 
+BUILTIN_STRLEN:
+	$(call check,test-builtin-strlen,HAVE_BUILTIN_STRLEN,__builtin_strlen)
+
 BUILTIN_STRNCMP:
 	$(call check,test-builtin-strncmp,HAVE_BUILTIN_STRNCMP,__builtin_strncmp)
 

core-affinity.c

@@ -103,7 +103,7 @@ static void stress_topology_set_get(
 	int n_sets = 0;
 	int which;
 
-	if (sscanf(arg + strlen(topology) , "%d", &which) != 1) {
+	if (sscanf(arg + shim_strlen(topology) , "%d", &which) != 1) {
 		(void)fprintf(stderr, "%s: invalid argument '%s' missing integer\n", topology, arg);
 		_exit(EXIT_FAILURE);
 	}

core-builtin.h

@@ -73,6 +73,12 @@
 #define shim_strcmp(s1, s2)		strcmp((s1), (s2))
 #endif
 
+#if defined(HAVE_BUILTIN_STRLEN)
+#define shim_strlen(str)		__builtin_strlen((str))
+#else
+#define shim_strlen(str)		strlen((str))
+#endif
+
 #if defined(HAVE_BUILTIN_STRNCMP)
 #define shim_strncmp(s1, s2, n)		__builtin_strncmp((s1), (s2), (n))
 #else

core-config-check.c

@@ -83,7 +83,7 @@ static int stress_config_check_cpu_filter(const struct dirent *d)
 {
         if (UNLIKELY(!d))
                 return 0;
-	if (UNLIKELY(strlen(d->d_name) < 4))
+	if (UNLIKELY(shim_strlen(d->d_name) < 4))
 		return 0;
         if (shim_strncmp(d->d_name, "cpu", 3))
 		return 0;

core-cpu-cache.c

@@ -333,7 +333,7 @@ static int stress_cpu_cache_get_riscv(
 	base++;
 	if (!*base)
 		return 0;
-	if (strlen(base) < 4)
+	if (shim_strlen(base) < 4)
 		return 0;
 	if (sscanf(base + 3, "%d", &cpu_num) != 1)
 		return 0;

core-cpuidle.c

@@ -362,7 +362,7 @@ void stress_cpuidle_log_info(void)
 		return;
 
 	for (cc = cpu_cstate_list; cc; cc = cc->next) {
-		len += strlen(cc->cstate) + 2;
+		len += shim_strlen(cc->cstate) + 2;
 	}
 	buf = (char *)calloc(len, sizeof(*buf));
 	if (UNLIKELY(!buf))

core-filesystem.c

@@ -1685,7 +1685,7 @@ static void stress_fs_clean_dir_files(
 	end = path + PATH_MAX;
 
 	while (n--) {
-		size_t name_len = strlen(names[n]->d_name) + 1;
+		size_t name_len = shim_strlen(names[n]->d_name) + 1;
 #if !defined(DT_DIR) ||	\
     !defined(DT_LNK) ||	\
     !defined(DT_REG)
@@ -1699,7 +1699,7 @@ static void stress_fs_clean_dir_files(
 		}
 
 		(void)snprintf(ptr, (size_t)(end - ptr), "/%s", names[n]->d_name);
-		name_len = strlen(ptr);
+		name_len = shim_strlen(ptr);
 
 #if defined(DT_DIR) &&	\
     defined(DT_LNK) &&	\
@@ -1767,7 +1767,7 @@ void stress_fs_clean_dir(
 	const uint32_t instance)
 {
 	const char *temp_path = stress_fs_temp_path_get();
-	const size_t temp_path_len = strlen(temp_path);
+	const size_t temp_path_len = shim_strlen(temp_path);
 
 	if (LIKELY(name != NULL)) {
 		char path[PATH_MAX];

core-ftrace.c

@@ -189,7 +189,7 @@ static int stress_ftrace_current_tracer(const char *str, const bool carp)
 	char filename[PATH_MAX];
 
 	(void)snprintf(filename, sizeof(filename), "%s/tracing/current_tracer", path);
-	if (stress_fs_file_write(filename, str, strlen(str)) < 0) {
+	if (stress_fs_file_write(filename, str, shim_strlen(str)) < 0) {
 		if (carp) {
 			pr_inf("ftrace: cannot set function tracing, cannot write '%s' to '%s', errno=%d (%s)\n",
 				str, filename, errno, strerror(errno));

core-hash.c

@@ -768,7 +768,7 @@ stress_hash_t *stress_hash_add(stress_hash_table_t *hash_table, const char *str)
 		return hash;
 
 	/* Not found, so add a new hash */
-	len = strlen(str) + 1;
+	len = shim_strlen(str) + 1;
 	hash = (stress_hash_t *)malloc(sizeof(*hash) + len);
 	if (UNLIKELY(!hash))
 		return NULL;

core-helper.c

@@ -2075,7 +2075,7 @@ char *stress_env_ld_library_path_get(void)
 	 */
 	parent_ld_path = getenv("LD_LIBRARY_PATH");
 	if (parent_ld_path) {
-		const size_t len = strlen(parent_ld_path) + 17;
+		const size_t len = shim_strlen(parent_ld_path) + 17;
 
 		ld_library_path = (char *)malloc(len);
 		if (ld_library_path)