Fix move ownership in C++ API (#59)

marioskogias · web-flow · commit b0cab1d70c63 · 2025-04-10T11:19:45.000Z
diff --git a/src/rt/cpp/when.h b/src/rt/cpp/when.h
@@ -140,7 +140,7 @@ namespace verona::cpp
   template<typename T>
   auto convert_access(cown_ptr<T>&& c)
   {
-    return Access<T>(c);
+    return Access<T>(std::move(c));
   }
 
   template<typename T>
diff --git a/src/rt/sched/behaviourcore.h b/src/rt/sched/behaviourcore.h
@@ -824,12 +824,13 @@ namespace verona::rt
           // If the body is the same, then we have an overlap within a single
           // behaviour.
           auto body_next = bodies[std::get<0>(cown_to_behaviour_slot_map[i])];
+
+          // Check if the caller passed an RC and add to the total.
+          transfer_count +=
+            std::get<1>(cown_to_behaviour_slot_map[i])->is_move();
+
           if (body_next == body)
           {
-            // Check if the caller passed an RC and add to the total.
-            transfer_count +=
-              std::get<1>(cown_to_behaviour_slot_map[i])->is_move();
-
             Logging::cout() << "Duplicate " << cown << " for " << body
                             << " Index " << i << Logging::endl;
             // We need to reduce the execution count by one, as we can't wait
diff --git a/test/func/when-transfer/transfer.cc b/test/func/when-transfer/transfer.cc
@@ -64,7 +64,7 @@ void test_sched_many_move()
   Logging::cout() << "test_body()" << Logging::endl;
 
   auto log1 = make_cown<Body>();
-  auto log2 = cown_ptr<Body>(log1);
+  auto log2 = make_cown<Body>();
 
   (when(std::move(log1)) <<
    [=](auto) { Logging::cout() << "log" << Logging::endl; }) +
@@ -77,7 +77,7 @@ void test_sched_many_move_busy()
   Logging::cout() << "test_body()" << Logging::endl;
 
   auto log1 = make_cown<Body>();
-  auto log2 = cown_ptr<Body>(log1);
+  auto log2 = make_cown<Body>();
 
   when(log1) << [=](auto) { Logging::cout() << "log" << Logging::endl; };
   (when(std::move(log1)) <<
@@ -91,7 +91,7 @@ void test_sched_many_mixed()
   Logging::cout() << "test_body()" << Logging::endl;
 
   auto log1 = make_cown<Body>();
-  auto log2 = cown_ptr<Body>(log1);
+  auto log2 = make_cown<Body>();
 
   (when(log1) << [=](auto) { Logging::cout() << "log" << Logging::endl; }) +
     (when(std::move(log2)) <<
@@ -103,14 +103,27 @@ void test_sched_many_mixed_busy()
   Logging::cout() << "test_body()" << Logging::endl;
 
   auto log1 = make_cown<Body>();
-  auto log2 = cown_ptr<Body>(log1);
+  auto log2 = make_cown<Body>();
 
   when(log1) << [=](auto) { Logging::cout() << "log" << Logging::endl; };
   (when(log1) << [=](auto) { Logging::cout() << "log" << Logging::endl; }) +
     (when(std::move(log2)) <<
      [=](auto) { Logging::cout() << "log" << Logging::endl; });
 }
 
+void test_sched_many_move_same()
+{
+  Logging::cout() << "test_body()" << Logging::endl;
+
+  auto log1 = make_cown<Body>();
+  auto log2 = cown_ptr<Body>(log1);
+
+  (when(std::move(log1)) <<
+   [=](auto) { Logging::cout() << "log" << Logging::endl; }) +
+    (when(std::move(log2)) <<
+     [=](auto) { Logging::cout() << "log" << Logging::endl; });
+}
+
 int main(int argc, char** argv)
 {
   SystematicTestHarness harness(argc, argv);
@@ -123,6 +136,7 @@ int main(int argc, char** argv)
   harness.run(test_sched_many_move_busy);
   harness.run(test_sched_many_mixed);
   harness.run(test_sched_many_mixed_busy);
+  harness.run(test_sched_many_move_same);
 
   return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ namespace verona::cpp`
`140`	`140`	`template<typename T>`
`141`	`141`	`auto convert_access(cown_ptr<T>&& c)`
`142`	`142`	`{`
`143`		`- return Access<T>(c);`
	`143`	`+ return Access<T>(std::move(c));`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`template<typename T>`