return bytes not void* from Get

tmtfx · tmtfx · commit 5d619110892d · 2024-09-09T14:05:22.000+02:00
diff --git a/bindings/support/BlockCache.cpp b/bindings/support/BlockCache.cpp
@@ -7,6 +7,25 @@
 
 namespace py = pybind11;
 
+/*
+py::bytes Get_wrapper(size_t blockSize) { 
+	void* data = Get(blockSize);
+	py::buffer buffer;
+	
+	if (data == nullptr) { 
+		throw std::runtime_error("Failed to get data");
+	}
+	return py::bytes(static_cast<const char*>(data), blockSize);
+}*/
+py::bytes Get_wrapper2(BBlockCache& self, size_t blockSize) {
+	void* data = self.Get(blockSize);
+	if (data == nullptr) {
+		throw std::runtime_error("Failed to get data");
+	}
+	py::buffer_info buf_info(static_cast<char*>(data), sizeof(char), py::format_descriptor<char>::format(), 1, {blockSize}, {sizeof(char)} );
+	//return py::array(buf_info);
+	return py::bytes(static_cast<const char*>(buf_info.ptr), buf_info.size * buf_info.itemsize); //convert py::buffer to py::bytes
+};
 
 PYBIND11_MODULE(BlockCache, m)
 {
@@ -15,8 +34,9 @@ m.attr("B_MALLOC_CACHE") = 1;//py::cast(B_MALLOC_CACHE);
 
 py::class_<BBlockCache>(m, "BBlockCache")
 .def(py::init<uint32, size_t, uint32>(), "", py::arg("blockCount"), py::arg("blockSize"), py::arg("allocationType"))
-.def("Get", &BBlockCache::Get, "", py::arg("blockSize"))
-.def("Save", &BBlockCache::Save, "", py::arg("pointer"), py::arg("blockSize"))
+//.def("Get", &BBlockCache::Get, "", py::arg("blockSize"))//TODO this returns a void * -- let's return a py::bytes or a py::buffer
+.def("Get", &Get_wrapper2, "", py::arg("blockSize"))
+.def("Save", &BBlockCache::Save, "", py::arg("pointer"), py::arg("blockSize"))//TODO: pointer is a void * -> python can't use void *
 ;
 
 
