Added another threading test with deep recursion in library ctor.

scripts/travis.sh

@@ -46,3 +46,4 @@ if ! echo "$ARCH" | grep -q 'powerpc\|mips\|riscv'; then
   tests/vector-args/run.sh $ARCH
 fi
 tests/thread/run.sh $ARCH
+tests/thread-2/run.sh $ARCH

tests/thread-2/interposed.c

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2025 Yury Gribov
+ *
+ * The MIT License (MIT)
+ * 
+ * Use of this source code is governed by MIT license that can be
+ * found in the LICENSE.txt file.
+ */
+
+#include <stdio.h>
+#include "interposed.h"
+
+static int glob;
+
+__attribute__((constructor))
+static void init() {
+  glob = foo0(11);  // 21
+}
+
+__attribute__((visibility("default")))
+int foo0(int x) {
+  return 0 + foo1(x);
+}
+
+__attribute__((visibility("default")))
+int foo1(int x) {
+  return 1 + foo2(x);
+}
+
+__attribute__((visibility("default")))
+int foo2(int x) {
+  return 2 + foo3(x);
+}
+
+__attribute__((visibility("default")))
+int foo3(int x) {
+  return 3 + foo4(x);
+}
+
+__attribute__((visibility("default")))
+int foo4(int x) {
+  return 4 + x;
+}
+
+int bar() {
+  return glob;
+}

tests/thread-2/interposed.h

@@ -0,0 +1,21 @@
+/*
+ * Copyright 2025 Yury Gribov
+ *
+ * The MIT License (MIT)
+ * 
+ * Use of this source code is governed by MIT license that can be
+ * found in the LICENSE.txt file.
+ */
+
+#ifndef INTERPOSED_H
+#define INTERPOSED_H
+
+extern int foo0(int x);
+extern int foo1(int x);
+extern int foo2(int x);
+extern int foo3(int x);
+extern int foo4(int x);
+
+extern int bar();
+
+#endif

tests/thread-2/main.c

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2025 Yury Gribov
+ *
+ * The MIT License (MIT)
+ * 
+ * Use of this source code is governed by MIT license that can be
+ * found in the LICENSE.txt file.
+ */
+
+#include <dlfcn.h>
+#include <stdio.h>
+#include <assert.h>
+#include <stdlib.h>
+
+#include <pthread.h>
+#include <unistd.h>
+
+#include "interposed.h"
+
+#if defined __mips && __mips == 32
+// For some reason pthread_create fails with EAGAIN
+#define N 32
+#else
+#define N 128
+#endif
+
+static int args[N];
+static pthread_t tids[N];
+static pthread_barrier_t b;
+
+void *run(void *arg_) {
+  int rc = pthread_barrier_wait(&b);
+  if (PTHREAD_BARRIER_SERIAL_THREAD != rc && 0 != rc)
+    abort();
+
+  int *arg = (int *)arg_;
+
+  int (*foo)(int);
+  switch(*arg % 5) {
+    case 0:
+      foo = foo0;
+      break;
+    case 1:
+      foo = foo1;
+      break;
+    case 2:
+      foo = foo2;
+      break;
+    case 3:
+      foo = foo3;
+      break;
+    case 4:
+      foo = foo4;
+      break;
+    default:
+      abort();
+  }
+
+  foo(*arg);
+
+  return 0;
+}
+
+int main() {
+  for (int i = 0; i < N; ++i)
+    args[i] = i;
+
+  if (0 != pthread_barrier_init(&b, 0, N))
+    abort();
+
+  for (int i = 0; i < N; ++i) {
+    if (0 != pthread_create(&tids[i], 0, run, &args[i]))
+      abort();
+  }
+
+  for (int i = 0; i < N; ++i) {
+    if (0 != pthread_join(tids[i], 0))
+      abort();
+  }
+
+  if (bar() == 21)
+    printf("Correct result\n");
+
+  return 0;
+}

tests/thread-2/run.sh

@@ -0,0 +1,65 @@
+#!/bin/sh
+
+# Copyright 2025 Yury Gribov
+#
+# The MIT License (MIT)
+# 
+# Use of this source code is governed by MIT license that can be
+# found in the LICENSE.txt file.
+
+# Another test for checking thread safety of Implib's shims.
+
+set -eu
+
+cd $(dirname $0)
+
+if test -n "${1:-}"; then
+  ARCH="$1"
+fi
+
+. ../common.sh
+
+CFLAGS="-g -O2 $CFLAGS"
+
+# Build shlib to test against
+$CC $CFLAGS -shared -fPIC interposed.c -o libinterposed.so
+
+# Prepare implib
+${PYTHON:-} ../../implib-gen.py -q --target $TARGET libinterposed.so
+
+# Test without export shims
+
+$CC $CFLAGS -fPIE main.c libinterposed.so.tramp.S libinterposed.so.init.c $LIBS
+
+for i in $(seq 1 10); do
+  LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH:-} $INTERP ./a.out > a.out.log
+  diff test.ref a.out.log
+done
+
+# Test with export shims
+
+$CC $CFLAGS -DIMPLIB_EXPORT_SHIMS -fPIE main.c libinterposed.so.tramp.S libinterposed.so.init.c $LIBS
+
+for i in $(seq 1 10); do
+  LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH:-} $INTERP ./a.out > a.out.log
+  diff test.ref a.out.log
+done
+
+# Test with Tsan
+# (do not bother with non-amd64 targets)
+
+if test -z "$INTERP" && uname | grep -q Linux; then
+  # ASLR keeps breaking Tsan mmaps
+  if test $(cat /proc/sys/kernel/randomize_va_space) != 0; then
+    echo 0 | sudo tee /proc/sys/kernel/randomize_va_space
+  fi
+
+  $CC $CFLAGS -g -fsanitize=thread -fPIE main.c libinterposed.so.tramp.S libinterposed.so.init.c $LIBS
+fi
+
+for i in $(seq 1 10); do
+  LD_LIBRARY_PATH=.:${LD_LIBRARY_PATH:-} $INTERP ./a.out > a.out.log
+  diff test.ref a.out.log
+done
+
+echo SUCCESS

tests/thread-2/test.ref

@@ -0,0 +1 @@
+Correct result