← Back to branch summary

~ubuntu-branches/ubuntu/precise/pyzmq/precise

« back to all changes in this revision

Viewing changes to zmq/core/device.pyx

  • Committer: Package Import Robot
  • Author(s): Julian Taylor, Julian Taylor
  • Date: 2012-02-19 14:53:20 UTC
  • mfrom: (1.1.6)
  • mto: This revision was merged to the branch mainline in revision 9.
  • Revision ID: package-import@ubuntu.com-20120219145320-u8un3j0q1e82dx01
http://bugs.debian.org/655793
[ Julian Taylor ]
* New upstream release (Closes: #655793)
* added myself to Uploaders
* properly clean to allow building twice in a row
* ignore testsuite result due to random failures on armel and mips
  probably caused by libzmq or toolchain
* add Python3 to short description of py3 packages
* wrap-and-sort debian/
* add python-nose to build depends to get better test result output
* add python-numpy to build depends to get more tests
* use githubredir.debian.net in debian/watch

Show diffs side-by-side

added added

removed removed

Lines of Context:
zmq/core/device.pyx
55
55
        raise ZMQError()
56
56
    return rc
57
57
 
58
 
# inner loop inlined, to prevent duplication
 
58
# inner loop inlined, to prevent code duplication for up/downstream
59
59
cdef inline int _relay(void * insocket, void *outsocket, zmq_msg_t msg) nogil:
60
60
    cdef int more=0
61
61
    cdef int label=0
69
69
        if (rc < 0):
70
70
            return -1
71
71
 
 
72
        flags = 0
72
73
        rc = zmq_getsockopt(insocket, ZMQ_RCVMORE, &more, &flagsz)
73
74
        if (rc < 0):
74
75
            return -1
75
 
        rc = zmq_getsockopt(insocket, ZMQ_RCVLABEL, &label, &flagsz)
76
 
        if (rc < 0):
77
 
            return -1
78
 
        
79
 
        flags = 0
80
76
        if more:
81
77
            flags = flags | ZMQ_SNDMORE
82
 
        if label:
83
 
            flags = flags | ZMQ_SNDLABEL
 
78
        
 
79
        # LABELs have been removed:
 
80
        # rc = zmq_getsockopt(insocket, ZMQ_RCVLABEL, &label, &flagsz)
 
81
        # if (rc < 0):
 
82
        #     return -1
 
83
        # if label:
 
84
        #     flags = flags | ZMQ_SNDLABEL
84
85
        
85
86
        rc = zmq_sendmsg(outsocket, &msg, flags)
86
87