feat: 视频与控制程序合并

python/omnisocket/_omnisocket.c

@@ -87,6 +87,30 @@ static PyObject *build_stats_dict(const omnisocket_session_stats_t *stats) {
     );
 }
 
+static PyObject *build_kcp_stats_dict(const omnisocket_session_kcp_stats_t *stats) {
+    return Py_BuildValue(
+        "{s:i,s:I,s:I,s:i,s:i,s:I,s:I,s:I,s:I}",
+        "connected",
+        stats->connected,
+        "conv",
+        stats->conv,
+        "rto_ms",
+        stats->rto_ms,
+        "srtt_ms",
+        stats->srtt_ms,
+        "srttvar_ms",
+        stats->srttvar_ms,
+        "snd_queue",
+        stats->snd_queue,
+        "rcv_queue",
+        stats->rcv_queue,
+        "snd_buffer",
+        stats->snd_buffer,
+        "xmit_total",
+        stats->xmit_total
+    );
+}
+
 static PyObject *PyOmniSession_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) {
     PyOmniSession *self;
     (void) args;
@@ -314,6 +338,14 @@ static PyObject *PyOmniSession_stats(PyOmniSession *self, PyObject *Py_UNUSED(ig
     return build_stats_dict(&stats);
 }
 
+static PyObject *PyOmniSession_kcp_stats(PyOmniSession *self, PyObject *Py_UNUSED(ignored)) {
+    omnisocket_session_kcp_stats_t stats;
+
+    memset(&stats, 0, sizeof(stats));
+    omnisocket_session_kcp_stats_snapshot(&self->session, &stats);
+    return build_kcp_stats_dict(&stats);
+}
+
 static PyMethodDef PyOmniSession_methods[] = {
     {"connect", (PyCFunction) PyOmniSession_connect, METH_VARARGS | METH_KEYWORDS, NULL},
     {"close", (PyCFunction) PyOmniSession_close, METH_NOARGS, NULL},
@@ -321,6 +353,7 @@ static PyMethodDef PyOmniSession_methods[] = {
     {"recv", (PyCFunction) PyOmniSession_recv, METH_VARARGS | METH_KEYWORDS, PyOmniSession_recv_doc},
     {"recv_into", (PyCFunction) PyOmniSession_recv_into, METH_VARARGS | METH_KEYWORDS, PyOmniSession_recv_into_doc},
     {"stats", (PyCFunction) PyOmniSession_stats, METH_NOARGS, NULL},
+    {"kcp_stats", (PyCFunction) PyOmniSession_kcp_stats, METH_NOARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 

python/omnisocket/omnisocket_client.c

@@ -247,6 +247,32 @@ void omnisocket_session_stats_snapshot(omnisocket_session_t *session, omnisocket
     pthread_mutex_unlock(&session->mutex);
 }
 
+void omnisocket_session_kcp_stats_snapshot(omnisocket_session_t *session, omnisocket_session_kcp_stats_t *out_stats) {
+    kcp_runtime_stats_t runtime_stats;
+
+    if (session == NULL || out_stats == NULL) {
+        return;
+    }
+
+    memset(&runtime_stats, 0, sizeof(runtime_stats));
+    pthread_mutex_lock(&session->mutex);
+    if (session->client != NULL) {
+        kcp_client_runtime_stats_snapshot(session->client, &runtime_stats);
+    }
+    pthread_mutex_unlock(&session->mutex);
+
+    memset(out_stats, 0, sizeof(*out_stats));
+    out_stats->connected = runtime_stats.connected;
+    out_stats->conv = runtime_stats.conv;
+    out_stats->rto_ms = runtime_stats.rto_ms;
+    out_stats->srtt_ms = runtime_stats.srtt_ms;
+    out_stats->srttvar_ms = runtime_stats.srttvar_ms;
+    out_stats->snd_queue = runtime_stats.snd_queue;
+    out_stats->rcv_queue = runtime_stats.rcv_queue;
+    out_stats->snd_buffer = runtime_stats.snd_buffer;
+    out_stats->xmit_total = runtime_stats.xmit_total;
+}
+
 int omnisocket_udp_session_init(omnisocket_udp_session_t *session) {
     int rc;
 

python/omnisocket/omnisocket_client.h

@@ -15,6 +15,18 @@ typedef struct omnisocket_session_stats {
     int connected;
 } omnisocket_session_stats_t;
 
+typedef struct omnisocket_session_kcp_stats {
+    int connected;
+    uint32_t conv;
+    uint32_t rto_ms;
+    int32_t srtt_ms;
+    int32_t srttvar_ms;
+    uint32_t snd_queue;
+    uint32_t rcv_queue;
+    uint32_t snd_buffer;
+    uint32_t xmit_total;
+} omnisocket_session_kcp_stats_t;
+
 typedef struct omnisocket_session {
     pthread_mutex_t mutex;
     pthread_cond_t idle_cond;
@@ -57,6 +69,7 @@ int omnisocket_session_recv_into(
     int timeout_ms
 );
 void omnisocket_session_stats_snapshot(omnisocket_session_t *session, omnisocket_session_stats_t *out_stats);
+void omnisocket_session_kcp_stats_snapshot(omnisocket_session_t *session, omnisocket_session_kcp_stats_t *out_stats);
 
 int omnisocket_udp_session_init(omnisocket_udp_session_t *session);
 void omnisocket_udp_session_destroy(omnisocket_udp_session_t *session);