Merge pull request #3074 from perspective-dev/fix-segfault-2

Fix `View::expand`, `View::collapse` unlocked server section

Author: texodus

packages/viewer-d3fc/src/ts/axis/valueFormatter.ts

@@ -18,10 +18,15 @@ export const getValueFormatterForRange = (min: number, max: number) => {
     let precision = Math.ceil(Math.abs(Math.log10(max - min))) + 1;
 
     return (d: number) => {
-        return Math.abs(d) >= SI_MIN
-            ? d3.format(".3s")(d)
-            : Number.isInteger(d)
-              ? d3.format(",.0f")(d)
-              : d3.format(`,.${precision}f`)(d);
+        try {
+            return Math.abs(d) >= SI_MIN
+                ? d3.format(".3s")(d)
+                : Number.isInteger(d)
+                  ? d3.format(",.0f")(d)
+                  : d3.format(`,.${precision}f`)(d);
+        } catch (e) {
+            console.warn(e);
+            return "<err>";
+        }
     };
 };

rust/perspective-python/perspective/tests/multi_threaded/test_multi_threaded.py

@@ -160,6 +160,7 @@ def run_perspective():
         thread2.join()
 
     def test_concurrent_view_creation_with_updates_are_threadsafe(self):
+        global running
         s = Server()
         schema = {
             "a": "string",

rust/perspective-server/cpp/perspective/src/cpp/server.cpp

@@ -130,19 +130,19 @@ make_context(
 
     auto pool = table->get_pool();
     auto gnode = table->get_gnode();
+    if (row_pivot_depth > -1) {
+        ctx1->set_depth(row_pivot_depth - 1);
+    } else {
+        ctx1->set_depth(row_pivots.size());
+    }
+
     pool->register_context(
         gnode->get_id(),
         name,
         ONE_SIDED_CONTEXT,
         reinterpret_cast<std::uintptr_t>(ctx1.get())
     );
 
-    if (row_pivot_depth > -1) {
-        ctx1->set_depth(row_pivot_depth - 1);
-    } else {
-        ctx1->set_depth(row_pivots.size());
-    }
-
     return ctx1;
 }
 
@@ -193,13 +193,6 @@ make_context(
         ctx2->column_sort_by(col_sortspec);
     }
 
-    pool->register_context(
-        gnode->get_id(),
-        name,
-        TWO_SIDED_CONTEXT,
-        reinterpret_cast<std::uintptr_t>(ctx2.get())
-    );
-
     if (row_pivot_depth > -1) {
         ctx2->set_depth(t_header::HEADER_ROW, row_pivot_depth - 1);
     } else {
@@ -212,6 +205,13 @@ make_context(
         ctx2->set_depth(t_header::HEADER_COLUMN, column_pivots.size());
     }
 
+    pool->register_context(
+        gnode->get_id(),
+        name,
+        TWO_SIDED_CONTEXT,
+        reinterpret_cast<std::uintptr_t>(ctx2.get())
+    );
+
     return ctx2;
 }
 

rust/perspective-server/cpp/perspective/src/cpp/view.cpp

@@ -1448,12 +1448,18 @@ View<t_ctx0>::expand(std::int32_t ridx, std::int32_t row_pivot_length) {
 template <>
 t_index
 View<t_ctx1>::expand(std::int32_t ridx, std::int32_t row_pivot_length) {
+#ifdef PSP_PARALLEL_FOR
+    PSP_WRITE_LOCK(*get_lock())
+#endif
     return m_ctx->open(ridx);
 }
 
 template <>
 t_index
 View<t_ctx2>::expand(std::int32_t ridx, std::int32_t row_pivot_length) {
+#ifdef PSP_PARALLEL_FOR
+    PSP_WRITE_LOCK(*get_lock())
+#endif
     if (m_ctx->unity_get_row_depth(ridx) < t_uindex(row_pivot_length)) {
         return m_ctx->open(t_header::HEADER_ROW, ridx);
     }
@@ -1475,12 +1481,18 @@ View<t_ctx0>::collapse(std::int32_t ridx) {
 template <>
 t_index
 View<t_ctx1>::collapse(std::int32_t ridx) {
+#ifdef PSP_PARALLEL_FOR
+    PSP_WRITE_LOCK(*get_lock())
+#endif
     return m_ctx->close(ridx);
 }
 
 template <>
 t_index
 View<t_ctx2>::collapse(std::int32_t ridx) {
+#ifdef PSP_PARALLEL_FOR
+    PSP_WRITE_LOCK(*get_lock())
+#endif
     return m_ctx->close(t_header::HEADER_ROW, ridx);
 }
 

tools/scripts/bench.mjs

@@ -15,10 +15,9 @@ import sh from "./sh.mjs";
 import { get_scope } from "./sh_perspective.mjs";
 
 dotenv.config({ path: "./.perspectiverc", quiet: true });
-
 const scope = get_scope();
-if (scope.includes("perspective")) {
-    sh`pnpm run --recursive --filter perspective-bench bench_js`.runSync();
-} else if (scope.includes("perspective-python")) {
-    sh`pnpm run --recursive --filter perspective-bench bench_python`.runSync();
+if (scope.includes("client")) {
+    sh`pnpm run --recursive --filter bench bench_js`.runSync();
+} else if (scope.includes("python")) {
+    sh`pnpm run --recursive --filter bench bench_python`.runSync();
 }