-
Notifications
You must be signed in to change notification settings - Fork 29.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Conflicts: Makefile lib/buffer.js lib/smalloc.js src/node_buffer.cc src/node_version.h vcbuild.bat
- Loading branch information
Showing
1,759 changed files
with
165,676 additions
and
12,268 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -52,6 +52,7 @@ Igor Zinkovsky <[email protected]> | |
| Isaac Z. Schlueter <[email protected]> | ||
| Isaac Z. Schlueter <[email protected]> <[email protected]> | ||
| Jake Verbaten <[email protected]> | ||
| James Hartig <[email protected]> <[email protected]> | ||
| Jered Schmidt <[email protected]> | ||
| Jeremiah Senkpiel <[email protected]> | ||
| Joe Shaw <[email protected]> <[email protected]> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -260,7 +260,7 @@ Adam Malcontenti-Wilson <[email protected]> | |
| Avi Flax <[email protected]> | ||
| Pedro Teixeira <[email protected]> | ||
| Johan Bergström <[email protected]> | ||
| James Hartig <james.hartig@grooveshark.com> | ||
| James Hartig <fastest963@gmail.com> | ||
| Shannen Saez <[email protected]> | ||
| Seong-Rak Choi <[email protected]> | ||
| Dave Irvine <[email protected]> | ||
|
|
@@ -764,5 +764,14 @@ Frederic Hemberger <[email protected]> | |
| Sharat M R <[email protected]> | ||
| Rich Trott <[email protected]> | ||
| Felipe Batista <[email protected]> | ||
| Rebecca Turner <[email protected]> | ||
| Tyler Anton <[email protected]> | ||
| João Reis <[email protected]> | ||
| Kat Marchán <[email protected]> | ||
| Ryan Petschek <[email protected]> | ||
| Pierre Inglebert <[email protected]> | ||
| Ivan Yan <[email protected]> | ||
| Sangmin Yoon <[email protected]> | ||
| Mark Plomer <[email protected]> | ||
|
|
||
| # Generated by tools/update-authors.sh | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -119,6 +119,12 @@ To read the documentation: | |
| $ man doc/iojs.1 | ||
| ``` | ||
|
|
||
| To test if io.js was built correctly: | ||
|
|
||
| ``` | ||
| $ iojs -e "console.log('Hello from io.js ' + process.version)" | ||
| ``` | ||
|
|
||
| ### Windows | ||
|
|
||
| Prerequisites: | ||
|
|
@@ -140,6 +146,12 @@ To run the tests: | |
| > vcbuild test | ||
| ``` | ||
|
|
||
| To test if io.js was built correctly: | ||
|
|
||
| ``` | ||
| $ iojs -e "console.log('Hello from io.js ' + process.version)" | ||
| ``` | ||
|
|
||
| ### Android / Android based devices, aka. Firefox OS | ||
|
|
||
| Be sure you have downloaded and extracted [Android NDK] | ||
|
|
@@ -319,10 +331,10 @@ information about the governance of the io.js project, see | |
| * **Nikolai Vavilov** <[email protected]> ([@seishun](https://github.com/seishun)) | ||
| * **Nicu Micleușanu** <[email protected]> ([@micnic](https://github.com/micnic)) | ||
| * **Aleksey Smolenchuk** <[email protected]> ([@lxe](https://github.com/lxe)) | ||
| * **Shigeki Ohtsu** <[email protected]> ([@shigeki](https://github.com/shigeki)) | ||
| * **Shigeki Ohtsu** <[email protected]> ([@shigeki](https://github.com/shigeki)) (Technical Committee) | ||
| * **Sam Roberts** <[email protected]> ([@sam-github](https://github.com/sam-github)) | ||
| * **Wyatt Preul** <[email protected]> ([@geek](https://github.com/geek)) | ||
| * **Brian White** <[email protected]> ([@mscdex](https://github.com/mscdex)) | ||
| * **Brian White** <[email protected]> ([@mscdex](https://github.com/mscdex)) (Technical Committee) | ||
| * **Christian Tellnes** <[email protected]> ([@tellnes](https://github.com/tellnes)) | ||
| * **Robert Kowalski** <[email protected]> ([@robertkowalski](https://github.com/robertkowalski)) | ||
| * **Julian Duque** <[email protected]> ([@julianduque](https://github.com/julianduque)) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| 'use strict'; | ||
|
|
||
| const common = require('../common.js'); | ||
|
|
||
| const bench = common.createBenchmark(main, { | ||
| arg: [true, false], | ||
| len: [0, 1, 64, 1024], | ||
| n: [1e7] | ||
| }); | ||
|
|
||
| function main(conf) { | ||
| const arg = conf.arg; | ||
| const len = conf.len | 0; | ||
| const n = conf.n | 0; | ||
| const buf = Buffer(len).fill(42); | ||
|
|
||
| bench.start(); | ||
| if (arg) { | ||
| for (var i = 0; i < n; i += 1) | ||
| buf.toString('utf8'); | ||
| } else { | ||
| for (var i = 0; i < n; i += 1) | ||
| buf.toString(); | ||
| } | ||
| bench.end(n); | ||
| } |
Oops, something went wrong.