pkg/csource: make all usleeps random

We can't know the exact values of those sleeps in advance, they can be different for different bugs. Making them random increases the chance that the C repro executes with the right timings at some point.
google · Jul 24, 2017 · e83310d · e83310d
1 parent 65a2d5f
commit e83310d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/executor/common.h b/executor/common.h
@@ -13,8 +13,6 @@
 #include <unistd.h>
 #if defined(SYZ_EXECUTOR) || defined(SYZ_THREADED) || defined(SYZ_COLLIDE)
 #include <pthread.h>
-#endif
-#if defined(SYZ_EXECUTOR) || defined(SYZ_COLLIDE)
 #include <stdlib.h>
 #endif
 #if defined(SYZ_EXECUTOR) || defined(SYZ_HANDLE_SEGV)

diff --git a/pkg/csource/common.go b/pkg/csource/common.go
@@ -14,8 +14,6 @@ var commonHeader = `
 #include <unistd.h>
 #if defined(SYZ_EXECUTOR) || defined(SYZ_THREADED) || defined(SYZ_COLLIDE)
 #include <pthread.h>
-#endif
-#if defined(SYZ_EXECUTOR) || defined(SYZ_COLLIDE)
 #include <stdlib.h>
 #endif
 #if defined(SYZ_EXECUTOR) || defined(SYZ_HANDLE_SEGV)

diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go
@@ -219,7 +219,7 @@ func generateTestFunc(w io.Writer, opts Options, calls []string, name string) {
 		}
 		fmt.Fprintf(w, "\tfor (i = 0; i < %v; i++) {\n", len(calls))
 		fmt.Fprintf(w, "\t\tpthread_create(&th[i], 0, thr, (void*)i);\n")
-		fmt.Fprintf(w, "\t\tusleep(10000);\n")
+		fmt.Fprintf(w, "\t\tusleep(rand()%%10000);\n")
 		fmt.Fprintf(w, "\t}\n")
 		if opts.Collide {
 			fmt.Fprintf(w, "\tfor (i = 0; i < %v; i++) {\n", len(calls))
@@ -228,7 +228,7 @@ func generateTestFunc(w io.Writer, opts Options, calls []string, name string) {
 			fmt.Fprintf(w, "\t\t\tusleep(rand()%%10000);\n")
 			fmt.Fprintf(w, "\t}\n")
 		}
-		fmt.Fprintf(w, "\tusleep(100000);\n")
+		fmt.Fprintf(w, "\tusleep(rand()%%100000);\n")
 		fmt.Fprintf(w, "}\n\n")
 	}
 }