lukechilds
/
node
mirror of https://github.com/lukechilds/node.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove coupling dep

v0.7.4-release
Felix Geisendörfer 15 years ago
committed by Ryan Dahl
parent
c143cba590
commit
203561208e
5 changed files with 2 additions and 581 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      deps/coupling/Makefile
  2. 419
      deps/coupling/coupling.c
  3. 42
      deps/coupling/coupling.h
  4. 73
      deps/coupling/test.c
  5. 16
      wscript

33
deps/coupling/Makefile
View File

@ -1,33 +0,0 @@
# CFLAGS and LDFLAGS are for the users to override from the command line.
CFLAGS = -g -I. -Wall -Werror -Wextra #-DNDEBUG=1
LDFLAGS = -pthread
CC = gcc
AR = ar
RANLIB = ranlib
DEP = coupling.h
SRC = coupling.c
OBJ = ${SRC:.c=.o}
NAME=libcoupling
OUTPUT_A=$(NAME).a
all: $(OUTPUT_A)
$(OUTPUT_A): $(OBJ)
$(AR) cru $(OUTPUT_A) $(OBJ)
$(RANLIB) $(OUTPUT_A)
.c.o:
$(CC) -c ${CFLAGS} $<
${OBJ}: ${DEP}
test: test.c $(OUTPUT_A)
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ test.c $(OUTPUT_A)
clean:
rm -f $(OUTPUT_A) *.o test
.PHONY: all clean

419
deps/coupling/coupling.c
View File

@ -1,419 +0,0 @@
/* Copyright (c) 2009 Ryan Dahl (ry@tinyclouds.org)
*
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "coupling.h"
#include <sys/types.h>
#include <sys/uio.h>
#include <sys/select.h>
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <assert.h>
#include <pthread.h>
#ifdef PIPE_BUF
# define BUFSIZE PIPE_BUF
#else
# define BUFSIZE 4096
#endif
#define MAX(a,b) ((a) > (b) ? (a) : (b))
// ring buffer
typedef struct {
int head;
int tail;
int size;
char buf[BUFSIZE];
} ring_buffer;
static inline void
ring_buffer_inspect (ring_buffer *ring)
{
printf("size %5d head %5d tail %5d\n", ring->size, ring->head, ring->tail);
}
static inline void
ring_buffer_init (ring_buffer *ring)
{
ring->head = 0;
ring->tail = 0;
ring->size = 0;
}
static inline int
ring_buffer_filled_p (ring_buffer *ring)
{
assert(BUFSIZE - (long)ring->size >= 0);
return (BUFSIZE == ring->size);
}
static inline int
ring_buffer_empty_p (ring_buffer *ring)
{
return 0 == ring->size;
}
static ssize_t
ring_buffer_pull (ring_buffer *ring, int fd)
{
// DO NOT CALL WHEN FILLED
assert(!ring_buffer_filled_p(ring));
struct iovec iov[2];
int iovcnt = 1;
// Very tough logic. Can you follow? Barely can I.
iov[0].iov_base = ring->buf + ring->tail;
if (ring->tail < ring->head) {
iov[0].iov_len = ring->head - ring->tail;
} else {
iov[0].iov_len = BUFSIZE - ring->tail;
if (ring->head != 0) {
iovcnt = 2;
iov[1].iov_base = ring->buf;
iov[1].iov_len = ring->head;
}
}
int r = readv(fd, iov, iovcnt);
if (r > 0) {
ring->size += r;
ring->tail = (ring->tail + r) % BUFSIZE;
}
assert(ring->size <= BUFSIZE);
return r;
}
static ssize_t
ring_buffer_push (ring_buffer *ring, int fd)
{
// DO NOT CALL WHEN EMPTY
assert(!ring_buffer_empty_p(ring));
struct iovec iov[2];
int iovcnt = 1;
iov[0].iov_base = ring->buf + ring->head;
if (ring->head < ring->tail) {
iov[0].iov_len = ring->tail - ring->head;
} else {
iov[0].iov_len = BUFSIZE - ring->head;
if (ring->tail != 0) {
iovcnt = 2;
iov[1].iov_base = ring->buf;
iov[1].iov_len = ring->tail;
}
}
int r = writev(fd, iov, iovcnt);
if (r > 0) {
ring->size -= r;
ring->head = (ring->head + r) % BUFSIZE;
}
assert(0 <= (long)ring->size);
return r;
}
/* PULL PUMP
*
* This is used to read data from a blocking file descriptor and pump it into
* a non-blocking pipe (or other non-blocking fd). The algorithm is this:
*
* while (true) {
* read(STDIN_FILENO) // blocking
*
* while (!ring.empty) {
* write(pipe) // non-blocking
* select(pipe, writable)
* }
* }
*
*/
static void
pull_pump (int pullfd, int pushfd)
{
int r;
ring_buffer ring;
fd_set writefds, exceptfds;
FD_ZERO(&exceptfds);
FD_ZERO(&writefds);
FD_SET(pushfd, &exceptfds);
FD_SET(pushfd, &writefds);
ring_buffer_init(&ring);
while (pullfd >= 0) {
/* Blocking read from STDIN_FILENO */
r = ring_buffer_pull(&ring, pullfd);
if (r == 0) {
/* eof */
close(pullfd);
pullfd = -1;
} else if (r < 0 && errno != EINTR && errno != EAGAIN) {
/* error */
perror("pull_pump read()");
close(pullfd);
pullfd = -1;
}
/* Push all of the data in the ring buffer out. */
while (!ring_buffer_empty_p(&ring)) {
/* non-blocking write() to the pipe */
r = ring_buffer_push(&ring, pushfd);
if (r < 0 && errno != EAGAIN && errno != EINTR) {
if (errno == EPIPE) {
/* This happens if someone closes the other end of the pipe. This
* is a normal forced close of STDIN. Hopefully there wasn't data
* in the ring buffer. Just close both ends and exit.
*/
close(pushfd);
close(pullfd);
pushfd = pullfd = -1;
} else {
perror("pull_pump write()");
close(pushfd);
close(pullfd);
}
return;
}
/* Select for writablity on the pipe end.
* Very rarely will this stick.
*/
r = select(pushfd+1, NULL, &writefds, &exceptfds, NULL);
if (r < 0 || FD_ISSET(pushfd, &exceptfds)) {
close(pushfd);
close(pullfd);
pushfd = pullfd = -1;
return;
}
}
}
assert(pullfd < 0);
assert(ring_buffer_empty_p(&ring));
close(pushfd);
}
/* PUSH PUMP
*
* This is used to push data out to a blocking file descriptor. It pulls
* data from a non-blocking pipe (pullfd) and pushes to STDOUT_FILENO
* (pushfd).
* When the pipe is closed, then the rest of the data is pushed out and then
* STDOUT_FILENO is closed.
*
* The algorithm looks roughly like this:
*
* while (true) {
* r = read(pipe) // nonblocking
*
* while (!ring.empty) {
* write(STDOUT_FILENO) // blocking
* }
*
* select(pipe, readable);
* }
*/
static void
push_pump (int pullfd, int pushfd)
{
int r;
ring_buffer ring;
fd_set readfds, exceptfds;
FD_ZERO(&exceptfds);
FD_ZERO(&readfds);
FD_SET(pullfd, &exceptfds);
FD_SET(pullfd, &readfds);
ring_buffer_init(&ring);
/* The pipe is open or there is data left to be pushed out
* NOTE: if pushfd (STDOUT_FILENO) ever errors out, then we just exit the
* loop.
*/
while (pullfd >= 0 || !ring_buffer_empty_p(&ring)) {
/* Pull from the non-blocking pipe */
r = ring_buffer_pull(&ring, pullfd);
if (r == 0) {
/* eof */
close(pullfd);
pullfd = -1;
} else if (r < 0 && errno != EINTR && errno != EAGAIN) {
perror("push_pump read()");
close(pullfd);
pullfd = -1;
return;
}
/* Push everything out to STDOUT */
while (!ring_buffer_empty_p(&ring)) {
/* Blocking write() to pushfd (STDOUT_FILENO) */
r = ring_buffer_push(&ring, pushfd);
/* If there was a problem, just exit the entire function */
if (r < 0 && errno != EINTR && errno != EAGAIN) {
close(pushfd);
close(pullfd);
pushfd = pullfd = -1;
return;
}
}
if (pullfd >= 0) {
/* select for readability on the pullfd */
r = select(pullfd+1, &readfds, NULL, &exceptfds, NULL);
if (r < 0 || FD_ISSET(pullfd, &exceptfds)) {
close(pushfd);
close(pullfd);
pushfd = pullfd = -1;
return;
}
}
}
/* If we got here then we got eof on pullfd and pushed all the data out.
* so now just close pushfd */
assert(pullfd < 0);
assert(ring_buffer_empty_p(&ring));
close(pushfd);
}
static inline int
set_nonblock (int fd)
{
int flags = fcntl(fd, F_GETFL, 0);
if (flags == -1) return -1;
int r = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
if (r == -1) return -1;
return 0;
}
struct coupling {
int is_pull;
int pullfd;
int pushfd;
int exposedfd;
pthread_t tid;
};
static void *
pump_thread (void *data)
{
struct coupling *c = (struct coupling*)data;
if (c->is_pull) {
pull_pump(c->pullfd, c->pushfd);
} else {
push_pump(c->pullfd, c->pushfd);
}
return NULL;
}
static struct coupling*
create_coupling (int fd, int is_pull)
{
int pipefd[2];
struct coupling *c = malloc(sizeof(struct coupling));
if (!c) return NULL;
int r = pipe(pipefd);
if (r < 0) return NULL;
r = set_nonblock(pipefd[0]);
if (r < 0) return NULL;
assert(pipefd[0] >= 0);
r = set_nonblock(pipefd[1]);
if (r < 0) return NULL;
assert(pipefd[1] >= 0);
if (is_pull) {
c->is_pull = 1;
c->pullfd = fd;
c->pushfd = pipefd[1];
c->exposedfd = pipefd[0];
} else {
c->is_pull = 0;
c->pushfd = fd;
c->pullfd = pipefd[0];
c->exposedfd = pipefd[1];
}
r = pthread_create(&c->tid, NULL, pump_thread, c);
if (r < 0) return NULL;
return c;
}
struct coupling*
coupling_new_pull (int fd)
{
return create_coupling(fd, 1);
}
struct coupling*
coupling_new_push (int fd)
{
return create_coupling(fd, 0);
}
int
coupling_nonblocking_fd (struct coupling *c)
{
return c->exposedfd;
}
void
coupling_join (struct coupling *c)
{
int r = pthread_join(c->tid, NULL);
assert(r == 0);
}
void
coupling_destroy (struct coupling *c)
{
close(c->is_pull ? c->pushfd : c->pullfd);
free(c);
}

42
deps/coupling/coupling.h
View File

@ -1,42 +0,0 @@
/* Copyright (c) 2009 Ryan Dahl (ry@tinyclouds.org)
*
* All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining
* a copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sublicense, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
* LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
* OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef coupling_h
#define coupling_h
#ifdef __cplusplus
extern "C" {
#endif
struct coupling;
struct coupling* coupling_new_pull (int fd);
struct coupling* coupling_new_push (int fd);
int coupling_nonblocking_fd (struct coupling*);
void coupling_join (struct coupling*);
void coupling_destroy (struct coupling*);
#ifdef __cplusplus
}
#endif
#endif

73
deps/coupling/test.c
View File

@ -1,73 +0,0 @@
#include <unistd.h>
#include <string.h>
#include <stdlib.h>
#include <sys/select.h>
#include <stdio.h>
#include <assert.h>
#include <errno.h>
#include "coupling.h"
#define MIN(a,b) ((a) < (b) ? (a) : (b))
#define CHUNKSIZE 44231
int
main (int argc, char *argv[])
{
struct coupling *c = coupling_new_push(STDERR_FILENO);
int stderr_fd = coupling_nonblocking_fd(c);
int size;
if (argc == 2) {
size = atoi(argv[1]);
printf("size = %d\n", size);
} else {
printf("usage: ./test 123 2> stderr; wc -c stderr\n");
exit(1);
}
char *msg = malloc(CHUNKSIZE);
int i, r;
for (i = 0; i < CHUNKSIZE; i++) {
msg[i] = 'A' + i % 26;
}
int written = 0;
fd_set writefds, exceptfds;
FD_ZERO(&exceptfds);
FD_SET(stderr_fd, &exceptfds);
FD_ZERO(&writefds);
FD_SET(stderr_fd, &writefds);
while (written < size) {
r = select(stderr_fd+1, NULL, &writefds, &exceptfds, NULL);
if (r < 0) {
printf("test.c select(): %s\n", strerror(errno));
exit(1);
}
if (FD_ISSET(stderr_fd, &exceptfds)) {
printf("exception on stderr fd\n");
exit(1);
}
if (FD_ISSET(stderr_fd, &writefds)) {
r = write(stderr_fd, msg, MIN(size - written, CHUNKSIZE));
if (r < 0 && errno != EAGAIN) {
printf("test.c write(): %s\n", strerror(errno));
exit(1);
} else {
written += r;
printf("%d\n", written);
}
}
}
close(stderr_fd);
coupling_join(c);
coupling_destroy(c);
return 0;
}

16
wscript
View File

@ -294,16 +294,6 @@ def build(bld):
if bld.env["USE_DEBUG"]: if bld.env["USE_DEBUG"]:
http_parser.clone("debug") http_parser.clone("debug")
### coupling
coupling = bld.new_task_gen("cc")
coupling.source = "deps/coupling/coupling.c"
coupling.includes = "deps/coupling/"
coupling.name = "coupling"
coupling.target = "coupling"
coupling.install_path = None
if bld.env["USE_DEBUG"]:
coupling.clone("debug")
### src/native.cc ### src/native.cc
def make_macros(loc, content): def make_macros(loc, content):
f = open(loc, 'w') f = open(loc, 'w')
@ -387,13 +377,12 @@ def build(bld):
deps/c-ares deps/c-ares
deps/libeio deps/libeio
deps/http_parser deps/http_parser
deps/coupling
""" """
node.includes += ' deps/c-ares/' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU'] node.includes += ' deps/c-ares/' + bld.env['DEST_OS'] + '-' + bld.env['DEST_CPU']
node.add_objects = 'cares ev eio http_parser coupling' node.add_objects = 'cares ev eio http_parser'
node.uselib_local = '' node.uselib_local = ''
node.uselib = 'RT OPENSSL V8 EXECINFO DL KVM SOCKET NSL' node.uselib = 'RT OPENSSL V8 EXECINFO DL KVM SOCKET NSL'
else: else:
@ -401,9 +390,8 @@ def build(bld):
src/ src/
deps/libeio deps/libeio
deps/http_parser deps/http_parser
deps/coupling
""" """
node.add_objects = 'eio http_parser coupling' node.add_objects = 'eio http_parser'
node.uselib_local = 'eio' node.uselib_local = 'eio'
node.uselib = 'RT EV OPENSSL CARES V8 EXECINFO DL KVM SOCKET NSL' node.uselib = 'RT EV OPENSSL CARES V8 EXECINFO DL KVM SOCKET NSL'

Write Preview
Loading…
Cancel
Save