asyncproxy 1.0__tar.gz → 1.2__tar.gz

asyncproxy-1.2/MANIFEST.in

@@ -0,0 +1,2 @@
+include src/Symbol.map src/asp_iostats.h src/asp_sock.c src/asp_sock.h src/asyncproxy.c src/asyncproxy.h
+include README.md

{asyncproxy-1.0/asyncproxy.egg-info → asyncproxy-1.2}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: asyncproxy
-Version: 1.0
+Version: 1.2
 Summary: Background TCP proxy for async IO
 Home-page: https://github.com/sippy/libasyncproxy.git
 Author: Maksym Sobolyev
 Author-email: sobomax@sippysoft.com
-Classifier: License :: OSI Approved :: BSD License
+License: BSD-2-Clause
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python
@@ -17,9 +17,12 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license
 Dynamic: license-file
 Dynamic: summary
 
+[![Build, Test & Publush](https://github.com/sippy/libasyncproxy/actions/workflows/build_and_test.yml/badge.svg)](https://github.com/sippy/libasyncproxy/actions/workflows/build_and_test.yml)
+
 # libasyncproxy
 
 ## Introduction
@@ -67,6 +70,12 @@ Forwarder if that fails to load or initialize.
 We use this library to allow applications to be redirected to one of several
 available DB replicas and re-routed instantly if the configuration changes.
 
+## Install Python module from PyPy:
+
+```
+pip install asyncproxy
+```
+
 ## Build and Install Python module from source code:
 
 ```

{asyncproxy-1.0 → asyncproxy-1.2}/README.md

@@ -1,3 +1,5 @@
+[![Build, Test & Publush](https://github.com/sippy/libasyncproxy/actions/workflows/build_and_test.yml/badge.svg)](https://github.com/sippy/libasyncproxy/actions/workflows/build_and_test.yml)
+
 # libasyncproxy
 
 ## Introduction
@@ -45,6 +47,12 @@ Forwarder if that fails to load or initialize.
 We use this library to allow applications to be redirected to one of several
 available DB replicas and re-routed instantly if the configuration changes.
 
+## Install Python module from PyPy:
+
+```
+pip install asyncproxy
+```
+
 ## Build and Install Python module from source code:
 
 ```

{asyncproxy-1.0 → asyncproxy-1.2/asyncproxy.egg-info}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: asyncproxy
-Version: 1.0
+Version: 1.2
 Summary: Background TCP proxy for async IO
 Home-page: https://github.com/sippy/libasyncproxy.git
 Author: Maksym Sobolyev
 Author-email: sobomax@sippysoft.com
-Classifier: License :: OSI Approved :: BSD License
+License: BSD-2-Clause
 Classifier: Operating System :: POSIX
 Classifier: Programming Language :: C
 Classifier: Programming Language :: Python
@@ -17,9 +17,12 @@ Dynamic: classifier
 Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
+Dynamic: license
 Dynamic: license-file
 Dynamic: summary
 
+[![Build, Test & Publush](https://github.com/sippy/libasyncproxy/actions/workflows/build_and_test.yml/badge.svg)](https://github.com/sippy/libasyncproxy/actions/workflows/build_and_test.yml)
+
 # libasyncproxy
 
 ## Introduction
@@ -67,6 +70,12 @@ Forwarder if that fails to load or initialize.
 We use this library to allow applications to be redirected to one of several
 available DB replicas and re-routed instantly if the configuration changes.
 
+## Install Python module from PyPy:
+
+```
+pip install asyncproxy
+```
+
 ## Build and Install Python module from source code:
 
 ```

{asyncproxy-1.0 → asyncproxy-1.2}/setup.py

@@ -24,10 +24,13 @@ extra_link_args = ['-flto'] if not is_win else []
 
 debug_opts = ('-g3', '-O0')
 nodebug_opts = ('-DNO_DEBUG',)
-if not is_mac and not is_win:
-    nodebug_opts += ('-march=native', '-O3')
-else:
-    nodebug_opts += ('-O3',) if not is_win else ()
+nodebug_opts += ('-O3',) if not is_win else ()
+
+if get_platform() == 'linux-x86_64':
+    # This is to disable x86-64-v2, see
+    # https://github.com/pypa/manylinux/issues/1725
+    extra_compile_args.append('-march=x86-64')
+
 if False:
     extra_compile_args.extend(debug_opts)
     extra_link_args.extend(debug_opts)
@@ -53,7 +56,7 @@ with open("README.md", "r") as fh:
     long_description = fh.read()
 
 kwargs = {'name':'asyncproxy',
-      'version':'1.0',
+      'version':'1.2',
       'description':'Background TCP proxy for async IO',
       'long_description': long_description,
       'long_description_content_type': "text/markdown",
@@ -63,8 +66,8 @@ kwargs = {'name':'asyncproxy',
       'packages':['asyncproxy',],
       'package_dir':{'asyncproxy':'python'},
       'ext_modules': get_ex_mod(),
+      'license': 'BSD-2-Clause',
       'classifiers': [
-            'License :: OSI Approved :: BSD License',
             'Operating System :: POSIX',
             'Programming Language :: C',
             'Programming Language :: Python'

{asyncproxy-1.0 → asyncproxy-1.2}/src/asp_sock.c

@@ -26,21 +26,23 @@ asp_sock_recv(struct asp_sock *asp, void *buf, size_t len)
      int update_stats;
 
      update_stats = 0;
-     pthread_mutex_lock(&asp->mutex);
      r.len = recv(asp->fd, buf, len, 0);
      if (r.len > 0) {
+         pthread_mutex_lock(&asp->mutex);
          asp->stats.in.nops++;
          asp->stats.in.btotal += r.len;
          if (asp->on_stats_update != NULL) {
              tstats = asp->stats;
              update_stats = 1;
+         } else {
+             pthread_mutex_unlock(&asp->mutex);
          }
      } else {
          r.errnom = errno;
      }
-     pthread_mutex_unlock(&asp->mutex);
      if (update_stats) {
          asp->on_stats_update(&tstats);
+         pthread_mutex_unlock(&asp->mutex);
      }
      return (r);
 }
@@ -50,12 +52,12 @@ asp_sock_send(struct asp_sock *asp, const void *msg, size_t len)
 {
      ssize_t rlen;
 
-     pthread_mutex_lock(&asp->mutex);
      rlen = send(asp->fd, msg, len, 0);
      if (rlen > 0) {
+         pthread_mutex_lock(&asp->mutex);
          asp->stats.out.nops++;
          asp->stats.out.btotal += rlen;
+         pthread_mutex_unlock(&asp->mutex);
      }
-     pthread_mutex_unlock(&asp->mutex);
      return (rlen);
 }

{asyncproxy-1.0 → asyncproxy-1.2}/src/asyncproxy.c

@@ -200,7 +200,7 @@ asyncproxy_run(void *args)
 
     ap = (struct asyncproxy *)args;
     if (ap->debug > 1) {
-        fprintf(stderr, "asyncproxy_run(%p)\n", ap);
+        fprintf(stderr, "asyncproxy_run(%p)\n", (void *)ap);
         fflush(stderr);
     }
     pthread_mutex_lock(&ap->mutex);
@@ -239,7 +239,7 @@ asyncproxy_run(void *args)
         pthread_mutex_unlock(&ap->mutex);
         if (state != AP_STATE_RUN) {
             if (ap->debug > 2) {
-                fprintf(stderr, "asyncproxy_run(%p): exit on state %d\n", ap, state);
+                fprintf(stderr, "asyncproxy_run(%p): exit on state %d\n", (void *)ap, state);
                 fflush(stderr);
             }
             break;
@@ -250,7 +250,7 @@ asyncproxy_run(void *args)
                 fflush(stderr);
         }
         if (ap->debug > 3) {
-            fprintf(stderr, "asyncproxy_run(%p): poll() = %d\n", ap, n);
+            fprintf(stderr, "asyncproxy_run(%p): poll() = %d\n", (void *)ap, n);
             fflush(stderr);
         }
         if (n <= 0) {
@@ -260,14 +260,15 @@ asyncproxy_run(void *args)
         for (i = 0; i < 2; i++) {
             if (ap->debug > 0) {
                 if (ap->debug > 3) {
-                    fprintf(stderr, "asyncproxy_run(%p): pfds[%d] = {.events = %d, .revents = %d}\n", ap, i, pfds[i].events, pfds[i].revents);
+                    fprintf(stderr, "asyncproxy_run(%p): pfds[%d] = {.events = %d, .revents = %d}\n",
+                      (void *)ap, i, pfds[i].events, pfds[i].revents);
                     fflush(stderr);
                 }
                 assert((pfds[i].revents & POLLNVAL) == 0);
             }
-            if (pfds[i].revents & POLLHUP) {
+            if (pfds[i].revents & (POLLHUP | POLLERR)) {
                 if (ap->debug > 1) {
-                    fprintf(stderr, "asyncproxy_run(%p): fd %d is gone, out\n", ap, pfds[i].fd);
+                    fprintf(stderr, "asyncproxy_run(%p): fd %d is gone, out\n", (void *)ap, pfds[i].fd);
                     fflush(stderr);
                 }
                 eidx = i;
@@ -279,13 +280,13 @@ asyncproxy_run(void *args)
                 r = asp_sock_recv(asps[i], BUF_P(&bufs[i]), BUF_FREE(&bufs[i]));
                 if (ap->debug > 2) {
                     assert(pfds[i].fd == asps[i]->fd);
-                    fprintf(stderr, "asyncproxy_run(%p): received %ld bytes from %d\n", ap, r.len, pfds[i].fd);
+                    fprintf(stderr, "asyncproxy_run(%p): received %ld bytes from %d\n", (void *)ap, r.len, pfds[i].fd);
                     fflush(stderr);
                 }
                 if (r.len <= 0) {
                     if (ap->debug > 1) {
                         fprintf(stderr, "asyncproxy_run(%p): fd %d recv "
-                          "failed with error %d, out\n", ap, pfds[i].fd,
+                          "failed with error %d, out\n", (void *)ap, pfds[i].fd,
                           r.errnom);
                         fflush(stderr);
                     }
@@ -335,7 +336,7 @@ asyncproxy_run(void *args)
                 rlen = asp_sock_send(asps[j], bufs[i].data, bufs[i].len);
                 if (ap->debug > 2) {
                     assert(pfds[j].fd == asps[j]->fd);
-                    fprintf(stderr, "asyncproxy_run(%p): sent %ld bytes to %d\n", ap, rlen, pfds[j].fd);
+                    fprintf(stderr, "asyncproxy_run(%p): sent %ld bytes to %d\n", (void *)ap, rlen, pfds[j].fd);
                     fflush(stderr);
                 }
                 if (rlen < (ssize_t)bufs[i].len) {
@@ -373,7 +374,7 @@ out:
     pthread_mutex_unlock(&ap->mutex);
 
     if (ap->debug > 0) {
-        fprintf(stderr, "cease asyncproxy_run(%p)\n", ap);
+        fprintf(stderr, "cease asyncproxy_run(%p)\n", (void *)ap);
         fflush(stderr);
     }
 
@@ -407,7 +408,7 @@ asyncproxy_ctor(const struct asyncproxy_ctor_args *acap)
         return (NULL);
     }
     if (dbg_level > 0) {
-        fprintf(stderr, "%p\n", ap);
+        fprintf(stderr, "%p\n", (void *)ap);
         fflush(stderr);
     }
     memset(ap, '\0', sizeof(struct asyncproxy));
@@ -492,7 +493,7 @@ finalize:
         goto e3;
     }
 
-#if defined(PYTHON_AWARE)
+#if defined(PYTHON_AWARE) && PY_VERSION_HEX < 0x03070000
     PyEval_InitThreads();
 #endif
 
@@ -517,7 +518,7 @@ asyncproxy_start(void *_ap)
 
     ap = (struct asyncproxy *)_ap;
     if (ap->debug > 0) {
-        fprintf(stderr, "asyncproxy_start(%p)\n", ap);
+        fprintf(stderr, "asyncproxy_start(%p)\n", (void *)ap);
         fflush(stderr);
     }
     pthread_mutex_lock(&ap->mutex);
@@ -545,7 +546,7 @@ asyncproxy_dtor(void *_ap)
 
     ap = (struct asyncproxy *)_ap;
     if (ap->debug > 0) {
-        fprintf(stderr, "asyncproxy_dtor(%p)\n", ap);
+        fprintf(stderr, "asyncproxy_dtor(%p)\n", (void *)ap);
         fflush(stderr);
     }
 
@@ -573,7 +574,7 @@ asyncproxy_isalive(void *_ap)
     pthread_mutex_unlock(&ap->mutex);
 
     if (ap->debug > 1 && ap->last_seen_alive != rval) {
-        fprintf(stderr, "asyncproxy_isalive(%p) = %d->%d\n", ap, ap->last_seen_alive, rval);
+        fprintf(stderr, "asyncproxy_isalive(%p) = %d->%d\n", (void *)ap, ap->last_seen_alive, rval);
         fflush(stderr);
         ap->last_seen_alive = rval;
     }

asyncproxy-1.0/MANIFEST.in

@@ -1,2 +0,0 @@
-include src/Symbol.map src/asp_iostats.h src/asp_sock.So src/asp_sock.c src/asp_sock.h src/asyncproxy.So src/asyncproxy.c src/asyncproxy.h
-include README.md