Skip to content

Commit

Permalink
Added serialization and service module for RPC functionality.
Browse files Browse the repository at this point in the history
  • Loading branch information
danielnorberg committed Jan 16, 2011
1 parent 0d1be90 commit 4ff6b6d
Show file tree
Hide file tree
Showing 16 changed files with 15,904 additions and 1,474 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from setuptools import setup
from setuptools.extension import Extension

modules = ['ropebuffer', 'channel', 'messenger']
modules = ['ropebuffer', 'channel', 'messenger', 'serialize', 'service']

extensions = [Extension(
name ='socketless.%s' % module,
Expand Down
4 changes: 3 additions & 1 deletion socketless/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
__all__ = ['ropebuffer', 'channel', 'messenger', 'channelserver']
__all__ = ['ropebuffer', 'channel', 'messenger', 'channelserver', 'service', 'serialize']

import ropebuffer
import messenger
import channelserver
import service
import serialize
1,117 changes: 567 additions & 550 deletions socketless/channel.c

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions socketless/channel.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ from ropebuffer import RopeBuffer

from syncless import coio

import logging

cdef extern from "stdint.h":
ctypedef unsigned int uint32_t

Expand Down Expand Up @@ -94,7 +96,7 @@ cdef class Channel:
self.buffer.add(read(self.socket))
size = self.unpack(self.header_spec, self.buffer.read(4))[0]
if not size:
return None
return ''
while self.buffer.len < size:
self.buffer.add(read(self.socket))
message = self.buffer.read(size)
Expand All @@ -104,8 +106,8 @@ cdef class Channel:

cpdef close(self):
if self.socket:
self.send('')
self.flush()
# self.send('')
# self.flush()
try:
self.socket.close()
except socket.error:
Expand Down
8 changes: 6 additions & 2 deletions socketless/channelserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@ def _serve(self):
coio.stackless.schedule()

def stop(self):
self.listening_tasklet.kill()
self.listening_tasklet = None
if self.listening_tasklet:
self.listening_tasklet.kill()
self.listening_tasklet = None
if self.listening_socket:
self.listening_socket.close()
self.listening_socket = None

def serve_forever(self):
self._serve()
Loading

0 comments on commit 4ff6b6d

Please sign in to comment.