From 8409f94041028ab58b859b112894d9f37bcb9682 Mon Sep 17 00:00:00 2001
From: "Dmitriy A. Gerasimov" <dmitriy.gerasimov@demlabs.net>
Date: Mon, 24 Aug 2020 23:29:26 +0700
Subject: [PATCH] [*] Fixes because changes in SDK
---
modules/dap-sdk/net/core/src/dap_events_python.c | 4 ++--
modules/dap-sdk/net/core/src/dap_events_socket_python.c | 4 ++--
setup.py | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/dap-sdk/net/core/src/dap_events_python.c b/modules/dap-sdk/net/core/src/dap_events_python.c
index f9c02d58..31223e46 100644
--- a/modules/dap-sdk/net/core/src/dap_events_python.c
+++ b/modules/dap-sdk/net/core/src/dap_events_python.c
@@ -20,7 +20,7 @@ PyObject *dap_events_socket_remove_and_delete_py(PyDapEventsObject *self, PyObje
bool preserve_inheritor = true;
if (in_bool == Py_False)
preserve_inheritor = false;
- dap_events_socket_queue_remove_and_delete(((PyDapEventsSocketObject*)in_obj)->t_events_socket);
+ dap_events_socket_remove_and_delete_mt(((PyDapEventsSocketObject*)in_obj)->t_events_socket->worker,((PyDapEventsSocketObject*)in_obj)->t_events_socket);
return PyLong_FromLong(0);
}
@@ -29,7 +29,7 @@ PyObject *dap_events_socket_kill_socket_py(PyDapEventsObject *self, PyObject *ar
if (!PyArg_ParseTuple(args, "O", &in_obj)){
return NULL;
}
- dap_events_socket_queue_remove_and_delete(((PyDapEventsSocketObject*)in_obj)->t_events_socket);
+ dap_events_socket_remove_and_delete_mt(((PyDapEventsSocketObject*)in_obj)->t_events_socket->worker,((PyDapEventsSocketObject*)in_obj)->t_events_socket);
return PyLong_FromLong(0);
}
diff --git a/modules/dap-sdk/net/core/src/dap_events_socket_python.c b/modules/dap-sdk/net/core/src/dap_events_socket_python.c
index a77eadc2..b5de2f09 100644
--- a/modules/dap-sdk/net/core/src/dap_events_socket_python.c
+++ b/modules/dap-sdk/net/core/src/dap_events_socket_python.c
@@ -19,7 +19,7 @@ PyObject *dap_events_socket_find_py(PyDapEventsSocketObject *self, PyObject *arg
if (!PyArg_ParseTuple(args, "i|O", &socket, &in_object)){
return NULL;
}
- self->t_events_socket = dap_events_socket_find(socket, ((PyDapEventsObject*)in_object)->t_events);
+ self->t_events_socket = dap_events_socket_find_unsafe(socket, ((PyDapEventsObject*)in_object)->t_events);
return PyLong_FromLong(0);
}
PyObject *dap_events_socket_set_readable_py(PyDapEventsSocketObject *self, PyObject *args){
@@ -106,7 +106,7 @@ PyObject *dap_events_socket_delete_py(PyDapEventsSocketObject *self, PyObject *a
bool boolean = true;
if (in_bool == Py_False)
boolean = false;
- dap_events_socket_queue_remove_and_delete( self->t_events_socket);
+ dap_events_socket_remove_and_delete_mt(self->t_events_socket->worker, self->t_events_socket);
return PyLong_FromLong(0);
}
diff --git a/setup.py b/setup.py
index d2f13f46..e2893f37 100755
--- a/setup.py
+++ b/setup.py
@@ -70,7 +70,7 @@ class CMakeBuild(build_ext):
setup(
name="CellFrame",
- version="0.9-post15",
+ version="0.10-post1",
description="CellFrame SDK",
author='Demlabs (2007-2020)',
license="GNU GPLv3",
--
GitLab