fixed memory leaks and python ownership problems

Author: mdorier

include/flock/cxx/group.hpp

@@ -194,7 +194,7 @@ class GroupHandle {
         flock_group_handle_t gh;
         auto err = flock_group_handle_create_from_file(client, filename, mode, &gh);
         FLOCK_CONVERT_AND_THROW(err);
-        return GroupHandle{gh};
+        return GroupHandle{gh, false};
     }
 
     /**
@@ -223,7 +223,7 @@ class GroupHandle {
         auto err = flock_group_handle_create_from_serialized(
             client, serialized_view.data(), serialized_view.size(), mode, &gh);
         FLOCK_CONVERT_AND_THROW(err);
-        return GroupHandle{gh};
+        return GroupHandle{gh, false};
     }
 
     /**

python/mochi/flock/test_client.py

@@ -11,7 +11,6 @@ def test_init_client_from_address(self):
     def test_init_client_from_engine(self):
         with Engine("na+sm") as engine:
             client = mfc.Client(engine)
-            del client
 
 
 if __name__ == '__main__':

python/mochi/flock/test_provider.py

@@ -18,7 +18,6 @@ def test_init_provider(self):
             initial_view = view.GroupView()
             initial_view.members.add(address, 42)
             provider = mfs.Provider(engine, 42, json.dumps(config), initial_view)
-            del provider
             engine.finalize()
 
 

python/src/py-flock-client.cpp

@@ -38,21 +38,24 @@ PYBIND11_MODULE(pyflock_client, m) {
              },
              "Create a GroupHandle instance",
              "address"_a,
-             "provider_id"_a=0)
+             "provider_id"_a=0,
+             py11::keep_alive<0,1>())
         .def("make_group_handle_from_file",
              [](const flock::Client& client,
                 const std::string& filename) {
                 return flock::GroupHandle::FromFile(client, filename.c_str());
              },
              "Create a GroupHandle instance",
-             "filename"_a)
+             "filename"_a,
+             py11::keep_alive<0,1>())
         .def("make_group_handle_from_serialized",
              [](const flock::Client& client,
                 std::string_view serialized) {
                 return flock::GroupHandle::FromSerialized(client, serialized);
              },
              "Create a GroupHandle instance",
-             "serialized"_a)
+             "serialized"_a,
+             py11::keep_alive<0,1>())
     ;
     py11::class_<flock::GroupHandle, std::shared_ptr<flock::GroupHandle>>(m, "GroupHandle")
         .def("update", &flock::GroupHandle::update)

src/centralized/centralized-backend.c

@@ -1036,6 +1036,7 @@ static flock_return_t centralized_destroy_group(void* ctx)
     if(context->get_view_rpc_id) margo_deregister(context->mid, context->get_view_rpc_id);
     if(context->membership_update_rpc_id) margo_deregister(context->mid, context->membership_update_rpc_id);
     if(context->leave_rpc_id) margo_deregister(context->mid, context->leave_rpc_id);
+    if(context->primary.address) margo_addr_free(context->mid, context->primary.address);
     if(context->config) json_object_put(context->config);
     flock_group_view_clear(&context->view);
     free(context);

src/provider.c

@@ -263,6 +263,8 @@ flock_return_t flock_provider_register(
     if(provider)
         *provider = p;
 
+    margo_instance_ref_incr(mid);
+
     margo_trace(mid, "[flock] Provider registered with ID %d", (int)provider_id);
 
 finish:
@@ -301,6 +303,7 @@ static void flock_finalize_provider(void* p)
     free(provider->self_addr_str);
     margo_instance_id mid = provider->mid;
     free(provider);
+    margo_instance_release(mid);
     margo_trace(mid, "[flock] Provider successfuly finalized");
 }