You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ra...@apache.org on 2013/05/28 09:54:30 UTC
[1/4] git commit: updated refs/heads/1.3.x to 1421a22
Updated Branches:
refs/heads/1.3.x 7720cecb2 -> 1421a2246
refs/heads/master b1c87da66 -> 3357462ad
[couchjs] make stack size option effective
The previous way this was coded changes the chunk size that is used
whenever the stack grows but does not change the maximum memory
allowed by the runtime.
Closes COUCHDB-1792
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/cfaa66cd
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/cfaa66cd
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/cfaa66cd
Branch: refs/heads/1.3.x
Commit: cfaa66cd6f5590bc317cf063112bb27e23ee06d8
Parents: 7720cec
Author: Randall Leeds <ra...@apache.org>
Authored: Tue May 14 17:34:40 2013 -0700
Committer: Randall Leeds <ra...@apache.org>
Committed: Tue May 28 00:41:13 2013 -0700
----------------------------------------------------------------------
src/couchdb/priv/couch_js/help.h | 4 ++--
src/couchdb/priv/couch_js/sm170.c | 6 +++---
src/couchdb/priv/couch_js/sm180.c | 6 +++---
src/couchdb/priv/couch_js/sm185.c | 4 ++--
src/couchdb/priv/couch_js/util.c | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/help.h
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/couch_js/help.h b/src/couchdb/priv/couch_js/help.h
index b31bb8c..f4ddb24 100644
--- a/src/couchdb/priv/couch_js/help.h
+++ b/src/couchdb/priv/couch_js/help.h
@@ -48,8 +48,8 @@ static const char USAGE_TEMPLATE[] =
" -V display version information and exit\n"
" -H enable %s cURL bindings (only avaiable\n"
" if package was built with cURL available)\n"
- " -S SIZE specify that the interpreter should set the\n"
- " stack quota for JS contexts to SIZE bytes\n"
+ " -S SIZE specify that the runtime should allow at\n"
+ " most SIZE bytes of memory to be allocated\n"
" -u FILE path to a .uri file containing the address\n"
" (or addresses) of one or more servers\n"
"\n"
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm170.c
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/couch_js/sm170.c b/src/couchdb/priv/couch_js/sm170.c
index 4a18d8f..51e4f4d 100644
--- a/src/couchdb/priv/couch_js/sm170.c
+++ b/src/couchdb/priv/couch_js/sm170.c
@@ -313,12 +313,12 @@ main(int argc, const char* argv[])
int i;
couch_args* args = couch_parse_args(argc, argv);
-
- rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+ rt = JS_NewRuntime(args->stack_size);
if(rt == NULL)
return 1;
- cx = JS_NewContext(rt, args->stack_size);
+ cx = JS_NewContext(rt, 8L * 1024L);
if(cx == NULL)
return 1;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm180.c
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/couch_js/sm180.c b/src/couchdb/priv/couch_js/sm180.c
index 9ffd1df..5fb8ce0 100644
--- a/src/couchdb/priv/couch_js/sm180.c
+++ b/src/couchdb/priv/couch_js/sm180.c
@@ -322,12 +322,12 @@ main(int argc, const char* argv[])
int i;
couch_args* args = couch_parse_args(argc, argv);
-
- rt = JS_NewRuntime(64L * 1024L * 1024L);
+
+ rt = JS_NewRuntime(args->stack_size);
if(rt == NULL)
return 1;
- cx = JS_NewContext(rt, args->stack_size);
+ cx = JS_NewContext(rt, 8L * 1024L);
if(cx == NULL)
return 1;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/sm185.c
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/couch_js/sm185.c b/src/couchdb/priv/couch_js/sm185.c
index bfee023..c378d4a 100644
--- a/src/couchdb/priv/couch_js/sm185.c
+++ b/src/couchdb/priv/couch_js/sm185.c
@@ -335,11 +335,11 @@ main(int argc, const char* argv[])
couch_args* args = couch_parse_args(argc, argv);
- rt = JS_NewRuntime(64L * 1024L * 1024L);
+ rt = JS_NewRuntime(args->stack_size);
if(rt == NULL)
return 1;
- cx = JS_NewContext(rt, args->stack_size);
+ cx = JS_NewContext(rt, 8L * 1024L);
if(cx == NULL)
return 1;
http://git-wip-us.apache.org/repos/asf/couchdb/blob/cfaa66cd/src/couchdb/priv/couch_js/util.c
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/couch_js/util.c b/src/couchdb/priv/couch_js/util.c
index 5c88402..b4700de 100644
--- a/src/couchdb/priv/couch_js/util.c
+++ b/src/couchdb/priv/couch_js/util.c
@@ -77,7 +77,7 @@ couch_parse_args(int argc, const char* argv[])
return NULL;
memset(args, '\0', sizeof(couch_args));
- args->stack_size = 8L * 1024L;
+ args->stack_size = 64L * 1024L * 1024L;
while(i < argc) {
if(strcmp("-h", argv[i]) == 0) {
[4/4] git commit: updated refs/heads/master to 3357462
Posted by ra...@apache.org.
Update NEWS and CHANGES w 1.3.1 entries
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/3357462a
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/3357462a
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/3357462a
Branch: refs/heads/master
Commit: 3357462ad3841afbd0df90f606f9bc915439fd30
Parents: b1c87da
Author: Randall Leeds <ra...@apache.org>
Authored: Tue May 28 00:46:56 2013 -0700
Committer: Randall Leeds <ra...@apache.org>
Committed: Tue May 28 00:53:18 2013 -0700
----------------------------------------------------------------------
CHANGES | 19 +++++++++++++++++++
NEWS | 6 ++++++
2 files changed, 25 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3357462a/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 5d5e52b..578efaa 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,6 +25,25 @@ Apache CouchDB CHANGES
#
# This version has not been released yet.
+# Replicator:
+
+# * Tolerate missing source and target fields in _replicator docs
+ (COUCHDB-1788).
+
+# Log System:
+
+# * Don't log about missing .compact files.
+# * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+
+# View Server:
+
+# * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+
+# Misc:
+
+# * Improve documentation: better structure, improve language, less duplication.
+# * Improvements to test suite.
+
Version 1.3.0
-------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/3357462a/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 6ed3f20..efa79aa 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,12 @@ Each release section notes when backwards incompatible changes have been made.
#
# This version has not been released yet.
+# * Tolerate missing source and target fields in _replicator docs.
+# * Don't log about missing .compact files.
+# * Fix bug in WARN level logging from 1.3.0.
+# * Improve documentation: better structure, improve language, less duplication.
+# * Improvements to test suite.
+
Version 1.3.0
-------------
[3/4] git commit: updated refs/heads/1.3.x to 1421a22
Posted by ra...@apache.org.
match indent in NEWS/CHANGES with older releases
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/1421a224
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/1421a224
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/1421a224
Branch: refs/heads/1.3.x
Commit: 1421a224672d59c2eee1780c8cba11693e6b3abb
Parents: 62cc707
Author: Randall Leeds <ra...@apache.org>
Authored: Tue May 28 00:47:54 2013 -0700
Committer: Randall Leeds <ra...@apache.org>
Committed: Tue May 28 00:48:22 2013 -0700
----------------------------------------------------------------------
CHANGES | 14 +++++++-------
NEWS | 10 +++++-----
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1421a224/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 3ecd19c..8057814 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,22 +8,22 @@ This version has not been released yet.
Replicator:
-* Tolerate missing source and target fields in _replicator docs
- (COUCHDB-1788).
+ * Tolerate missing source and target fields in _replicator docs
+ (COUCHDB-1788).
Log System:
-* Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
View Server:
-* Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+ * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
Misc:
-* Improve documentation: better structure, improve language, less duplication.
-* Improvements to test suite.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
Version 1.3.0
-------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/1421a224/NEWS
----------------------------------------------------------------------
diff --git a/NEWS b/NEWS
index 4a05320..486daf0 100644
--- a/NEWS
+++ b/NEWS
@@ -10,11 +10,11 @@ Each release section notes when backwards incompatible changes have been made.
Version 1.3.1
-------------
-* Tolerate missing source and target fields in _replicator docs.
-* Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0.
-* Improve documentation: better structure, improve language, less duplication.
-* Improvements to test suite.
+ * Tolerate missing source and target fields in _replicator docs.
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
Version 1.3.0
-------------
[2/4] git commit: updated refs/heads/1.3.x to 1421a22
Posted by ra...@apache.org.
Update CHANGES with bug numbers and add 1792
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/62cc707e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/62cc707e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/62cc707e
Branch: refs/heads/1.3.x
Commit: 62cc707e5121a947643f262f8103cc01c6119430
Parents: cfaa66c
Author: Randall Leeds <ra...@apache.org>
Authored: Tue May 28 00:46:56 2013 -0700
Committer: Randall Leeds <ra...@apache.org>
Committed: Tue May 28 00:46:56 2013 -0700
----------------------------------------------------------------------
CHANGES | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/62cc707e/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index f422f89..3ecd19c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,12 +8,17 @@ This version has not been released yet.
Replicator:
-* Tolerate missing source and target fields in _replicator docs.
+* Tolerate missing source and target fields in _replicator docs
+ (COUCHDB-1788).
Log System:
* Don't log about missing .compact files.
-* Fix bug in WARN level logging from 1.3.0.
+* Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+
+View Server:
+
+* Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
Misc: