diff options
| author | Rickard Green <[email protected]> | 2014-01-28 15:53:03 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-01-28 15:53:03 +0100 |
| commit | 3c112fbde20a21db0cafc140aa72346f60315b90 (patch) | |
| tree | 9355dc94fae68ce2b1d9d08ca0a23484c8c59dfe /erts/etc/common | |
| parent | f65764907faba7ea6ca1a6bb266b6c6612e06b7b (diff) | |
| parent | c1c03ae4ee50e58b7669ea88ec4d29c6b2b67c7b (diff) | |
| download | otp-3c112fbde20a21db0cafc140aa72346f60315b90.tar.gz otp-3c112fbde20a21db0cafc140aa72346f60315b90.tar.bz2 otp-3c112fbde20a21db0cafc140aa72346f60315b90.zip | |
Merge branch 'vinoski/ds'
* vinoski/ds:
initial support for dirty schedulers and dirty NIFs
Diffstat (limited to 'erts/etc/common')
| -rw-r--r-- | erts/etc/common/erlexec.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c index 78a50744ef..2cf7280ebc 100644 --- a/erts/etc/common/erlexec.c +++ b/erts/etc/common/erlexec.c @@ -829,7 +829,17 @@ int main(int argc, char **argv) if (argv[i][2] == 'P') { if (argv[i][3] != '\0') goto the_default; - } else if (argv[i][2] != '\0') + } +#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) + goto the_default; + } +#endif + else if (argv[i][2] != '\0') goto the_default; if (i+1 >= argc) usage(argv[i]); |