aboutsummaryrefslogtreecommitdiffstats
path: root/erts/etc
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-02-24 13:27:33 +0100
committerRickard Green <[email protected]>2014-02-24 13:27:33 +0100
commit59c3f29702baaade9f8dbba5daec35b4b88df2a0 (patch)
tree0bcb3de1d052cb749e9aaecfaceae6ae3194bc9f /erts/etc
parente2896b5f3922b8397024aee8f541d46ba5cb0f1d (diff)
parent3e8b423a2cb11f819f3cede7ef817f4012f18944 (diff)
downloadotp-59c3f29702baaade9f8dbba5daec35b4b88df2a0.tar.gz
otp-59c3f29702baaade9f8dbba5daec35b4b88df2a0.tar.bz2
otp-59c3f29702baaade9f8dbba5daec35b4b88df2a0.zip
Merge branch 'vinoski/ds2'
* vinoski/ds2: further enhancements for dirty schedulers allow optional whitespace in dirty scheduler erl options
Diffstat (limited to 'erts/etc')
-rw-r--r--erts/etc/common/erlexec.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 2cf7280ebc..709c6f02d1 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -833,9 +833,13 @@ int main(int argc, char **argv)
#ifdef ERTS_DIRTY_SCHEDULERS
else if (argv[i][2] == 'D') {
char* type = argv[i]+3;
- if (strcmp(type, "cpu") != 0 &&
- strcmp(type, "Pcpu") != 0 &&
- strcmp(type, "io") != 0)
+ if (strncmp(type, "cpu", 3) != 0 &&
+ strncmp(type, "Pcpu", 4) != 0 &&
+ strncmp(type, "io", 2) != 0)
+ usage(argv[i]);
+ if ((argv[i][3] == 'c' && argv[i][6] != '\0') ||
+ (argv[i][3] == 'P' && argv[i][7] != '\0') ||
+ (argv[i][3] == 'i' && argv[i][5] != '\0'))
goto the_default;
}
#endif