aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2010-11-02 11:52:22 +0100
committerRickard Green <[email protected]>2010-11-02 11:52:22 +0100
commit158ed71a5ddc5050809723a214a8d8c841022871 (patch)
tree13f2cfedca8745942abf0572dcbb9044e6ab3df1 /erts/etc
parent96419fe8c795656c46ba50b1aac92c98acc73a0b (diff)
parent8faf1746ece60fc5fa634e5fd16e98df1ef7f3ba (diff)
downloadotp-158ed71a5ddc5050809723a214a8d8c841022871.tar.gz
otp-158ed71a5ddc5050809723a214a8d8c841022871.tar.bz2
otp-158ed71a5ddc5050809723a214a8d8c841022871.zip
Merge branch 'sf/erts_de_busy_limit' into dev
* sf/erts_de_busy_limit: Add flag-based setting for the distribution buffer busy limit
Diffstat (limited to 'erts/etc')
-rw-r--r--erts/etc/common/erlexec.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 6ec2c8b52c..60b3af7db7 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -138,6 +138,12 @@ static char *plusr_val_switches[] = {
NULL
};
+/* +z arguments with values */
+static char *plusz_val_switches[] = {
+ "dbbl",
+ NULL
+};
+
/*
* Define sleep(seconds) in terms of Sleep() on Windows.
@@ -909,6 +915,20 @@ int main(int argc, char **argv)
i++;
}
break;
+ case 'z':
+ if (!is_one_of_strings(&argv[i][2], plusz_val_switches)) {
+ goto the_default;
+ } else {
+ if (i+1 >= argc
+ || argv[i+1][0] == '-'
+ || argv[i+1][0] == '+')
+ usage(argv[i]);
+ argv[i][0] = '-';
+ add_Eargs(argv[i]);
+ add_Eargs(argv[i+1]);
+ i++;
+ }
+ break;
default:
the_default:
argv[i][0] = '-'; /* Change +option to -option. */
@@ -1096,7 +1116,7 @@ usage_aux(void)
"[+l] [+M<SUBSWITCH> <ARGUMENT>] [+P MAX_PROCS] [+R COMPAT_REL] "
"[+r] [+rg READER_GROUPS_LIMIT] [+s SCHEDULER_OPTION] "
"[+S NO_SCHEDULERS:NO_SCHEDULERS_ONLINE] [+T LEVEL] [+V] [+v] "
- "[+W<i|w>] [args ...]\n");
+ "[+W<i|w>] [+z MISC_OPTION] [args ...]\n");
exit(1);
}