Permalink
Browse files

Spaces -> Tabs

I'm going through my biennial spaces and tabs identity crisis. Tabs,
you've hurt me in the past.. I just hope that I've learned enough so
that it won't happen again. I'm putting a lot of faith in you, please
don't leave me cold and alone.
  • Loading branch information...
1 parent 7b8e2ef commit ac01c73fd04984382b9f0d0af307daeed44096e8 @laverdet committed Feb 18, 2011
Showing with 1,085 additions and 1,085 deletions.
  1. +244 −244 README.md
  2. +14 −14 bin/fiber-shim
  3. +13 −13 fibers.js
  4. +23 −23 package.json
  5. +4 −4 src/Makefile
  6. +252 −252 src/coroutine.cc
  7. +65 −65 src/coroutine.h
  8. +463 −463 src/fibers.cc
  9. +7 −7 src/platform.mk
View
488 README.md

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -2,23 +2,23 @@
# assume fibers.node and coroutine.so are in same directory
if [[ -e `dirname "$0"`/../src/fibers.node ]]; then
- FIBERS_ROOT=`dirname "$0"`/../src
+ FIBERS_ROOT=`dirname "$0"`/../src
else
- FIBERS_ROOT=`node --vars | egrep ^NODE_PREFIX: | cut -c14-`/lib/node/.npm/fibers/active/package/src
- if [[ ! -e "$FIBERS_ROOT/fibers.node" ]]; then
- echo "Could not find the coroutine shim!" 1>&2
- exit 1
- fi
+ FIBERS_ROOT=`node --vars | egrep ^NODE_PREFIX: | cut -c14-`/lib/node/.npm/fibers/active/package/src
+ if [[ ! -e "$FIBERS_ROOT/fibers.node" ]]; then
+ echo "Could not find the coroutine shim!" 1>&2
+ exit 1
+ fi
fi
UNAME=`uname`
if [[ "$UNAME" == "Linux" ]]; then
- FIBER_SHIM=1 \
- LD_PRELOAD="$FIBERS_ROOT/coroutine.so" \
- "$@"
+ FIBER_SHIM=1 \
+ LD_PRELOAD="$FIBERS_ROOT/coroutine.so" \
+ "$@"
elif [[ "$UNAME" == "Darwin" ]]; then
- FIBER_SHIM=1 \
- DYLD_INSERT_LIBRARIES="$FIBERS_ROOT/coroutine.dylib" \
- DYLD_FORCE_FLAT_NAMESPACE=1 \
- DYLD_LIBRARY_PATH="$FIBERS_ROOT" \
- "$@"
+ FIBER_SHIM=1 \
+ DYLD_INSERT_LIBRARIES="$FIBERS_ROOT/coroutine.dylib" \
+ DYLD_FORCE_FLAT_NAMESPACE=1 \
+ DYLD_LIBRARY_PATH="$FIBERS_ROOT" \
+ "$@"
fi
View
@@ -1,20 +1,20 @@
var fs = require('fs');
if (fs.statSync(process.execPath).mtime >
- fs.statSync(__dirname + '/src/fibers.node').mtime) {
- throw new Error(
- '`node` has a newer mtime than `fiber`; it is possible your build is out of date. This ' +
- 'could happen if you upgrade node. Try `npm rebuild fibers` to rebuild. If that doesn\'t ' +
- 'work you could consider running `touch ' + __dirname + 'src/fibers` and maybe there won\'t ' +
- 'be a problem.');
+ fs.statSync(__dirname + '/src/fibers.node').mtime) {
+ throw new Error(
+ '`node` has a newer mtime than `fiber`; it is possible your build is out of date. This ' +
+ 'could happen if you upgrade node. Try `npm rebuild fibers` to rebuild. If that doesn\'t ' +
+ 'work you could consider running `touch ' + __dirname + 'src/fibers` and maybe there won\'t ' +
+ 'be a problem.');
} else if (!process.env.FIBER_SHIM) {
- throw new Error(
- 'Fiber support was not enabled when you ran node. To enable support for fibers, please run ' +
- 'node with the included `node-fibers` script. For example, instead of running:\n\n' +
- ' node script.js\n\n' +
- 'You should run:\n\n' +
- ' node-fibers script.js\n\n' +
- 'You will not be able to use Fiber without this support enabled.');
+ throw new Error(
+ 'Fiber support was not enabled when you ran node. To enable support for fibers, please run ' +
+ 'node with the included `node-fibers` script. For example, instead of running:\n\n' +
+ ' node script.js\n\n' +
+ 'You should run:\n\n' +
+ ' node-fibers script.js\n\n' +
+ 'You will not be able to use Fiber without this support enabled.');
}
require('./src/fibers');
View
@@ -1,25 +1,25 @@
{
- "name": "fibers",
- "version": "0.1.4",
- "description": "Cooperative multi-tasking for Javascript; or, the closest thing to a thread you'll see in node",
- "keywords": ["fiber", "fibers", "coroutine", "thread", "async", "parallel", "worker"],
- "homepage": "https://github.com/laverdet/node-fibers",
- "author": "Marcel Laverdet <marcel@laverdet.com> (https://github.com/laverdet/)",
- "main": "fibers",
- "scripts": {
- "install": "make clean all"
- },
- "bin": {
- "node-fibers": "./bin/node-fibers",
- "fiber-shim": "./bin/fiber-shim"
- },
- "man": "./man/fibers.1",
- "repository": {
- "type": "git",
- "url": "git://github.com/laverdet/node-fibers.git"
- },
- "os": ["macos", "linux"],
- "engines": {
- "node": ">=0.2.0"
- }
+ "name": "fibers",
+ "version": "0.1.4",
+ "description": "Cooperative multi-tasking for Javascript; or, the closest thing to a thread you'll see in node",
+ "keywords": ["fiber", "fibers", "coroutine", "thread", "async", "parallel", "worker"],
+ "homepage": "https://github.com/laverdet/node-fibers",
+ "author": "Marcel Laverdet <marcel@laverdet.com> (https://github.com/laverdet/)",
+ "main": "fibers",
+ "scripts": {
+ "install": "make clean all"
+ },
+ "bin": {
+ "node-fibers": "./bin/node-fibers",
+ "fiber-shim": "./bin/fiber-shim"
+ },
+ "man": "./man/fibers.1",
+ "repository": {
+ "type": "git",
+ "url": "git://github.com/laverdet/node-fibers.git"
+ },
+ "os": ["macos", "linux"],
+ "engines": {
+ "node": ">=0.2.0"
+ }
}
View
@@ -1,12 +1,12 @@
include platform.mk
ifeq ($(NODE_PLATFORM), linux)
- CPP_DYFLAGS = -fPIC -shared
- CPP_NODEFLAGS = -fPIC -shared -Wl,-Bdynamic
+ CPP_DYFLAGS = -fPIC -shared
+ CPP_NODEFLAGS = -fPIC -shared -Wl,-Bdynamic
endif
ifeq ($(NODE_PLATFORM), darwin)
- CPP_DYFLAGS = -dynamiclib
- CPP_NODEFLAGS = -bundle -undefined dynamic_lookup
+ CPP_DYFLAGS = -dynamiclib
+ CPP_NODEFLAGS = -bundle -undefined dynamic_lookup
endif
COROUTINE_SO_FULL := $(shell echo `pwd`/$(COROUTINE_SO))
Oops, something went wrong.

0 comments on commit ac01c73

Please sign in to comment.