aboutsummaryrefslogtreecommitdiff
path: root/src/allocators/scalloc/scalloc_fix_log.patch
diff options
context:
space:
mode:
authorFlorian Fischer <florian.fl.fischer@fau.de>2019-06-24 14:51:21 +0200
committerFlorian Fischer <florian.fl.fischer@fau.de>2019-06-24 14:51:21 +0200
commit2d86e20f5a44aea66725686531463931f38aa2dc (patch)
treeb3e42e10e212aa61069775812cc821a2445a3b45 /src/allocators/scalloc/scalloc_fix_log.patch
parent366c9e27b13e976ce26ec6a97c6796eb1cdca887 (diff)
downloadallocbench-2d86e20f5a44aea66725686531463931f38aa2dc.tar.gz
allocbench-2d86e20f5a44aea66725686531463931f38aa2dc.zip
rework allocator definitions #2
bench.py no evals only if argument to -a is file path. Otherwise it will check if "arg".py is found in src/allocators/ then it imports it. Collection definitions must export a iterable member called allocators. Allocator definitions must export a member named "arg".
Diffstat (limited to 'src/allocators/scalloc/scalloc_fix_log.patch')
-rw-r--r--src/allocators/scalloc/scalloc_fix_log.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/src/allocators/scalloc/scalloc_fix_log.patch b/src/allocators/scalloc/scalloc_fix_log.patch
new file mode 100644
index 0000000..eaae806
--- /dev/null
+++ b/src/allocators/scalloc/scalloc_fix_log.patch
@@ -0,0 +1,35 @@
+diff --git a/src/log.h b/src/log.h
+index 3edc36d..e1d181c 100644
+--- a/src/log.h
++++ b/src/log.h
+@@ -46,13 +46,13 @@ inline void LogPrintf(
+
+ snprintf(line_buffer, sizeof(line_buffer), "%d", line);
+ // Start with "__FILENAME__:__LINE__ ".
+- strncat(buffer, file, strlen(file));
++ strncat(buffer, file, rest);
+ rest -= strlen(file);
+- strncat(buffer, ":", 1);
++ strncat(buffer, ":", rest);
+ rest -= 1;
+- strncat(buffer, line_buffer, strlen(line_buffer));
++ strncat(buffer, line_buffer, rest);
+ rest -= strlen(line_buffer);
+- strncat(buffer, " ", 1);
++ strncat(buffer, " ", rest);
+ rest -= 1;
+
+ // Sanity check.
+@@ -69,10 +69,10 @@ inline void LogPrintf(
+ // For copying the suffix we need actual rest value again.
+ strncpy(rest_start + (rest - strlen(truncate_suffix)),
+ truncate_suffix,
+- strlen(truncate_suffix));
++ rest);
+ }
+
+- strncat(buffer, "\n", 1);
++ strncat(buffer, "\n", rest);
+
+ // Sanity check.
+ if (buffer[kLogLen-1] != 0) {