diff options
| author | Dan Gudmundsson <[email protected]> | 2015-03-27 09:24:39 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2015-03-27 09:24:39 +0100 |
| commit | 558923fcdd7f0ade12d23daf31c15dca802c1b8e (patch) | |
| tree | b2c20133d1d80206b61b9aeef568ad2f09910d94 /erts | |
| parent | f299a96c88eccbcfce1deed1bbf20d20f455805c (diff) | |
| parent | 09db67d581e1e5858909aafec7d29226020cd227 (diff) | |
| download | otp-558923fcdd7f0ade12d23daf31c15dca802c1b8e.tar.gz otp-558923fcdd7f0ade12d23daf31c15dca802c1b8e.tar.bz2 otp-558923fcdd7f0ade12d23daf31c15dca802c1b8e.zip | |
Merge branch 'dgud/erts/fix-driver-thread-name'
* dgud/erts/fix-driver-thread-name:
Fix thread name from driver api
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/erl_drv_thread.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_drv_thread.c b/erts/emulator/beam/erl_drv_thread.c index 31b05d22af..240faa823d 100644 --- a/erts/emulator/beam/erl_drv_thread.c +++ b/erts/emulator/beam/erl_drv_thread.c @@ -604,10 +604,12 @@ erl_drv_thread_create(char *name, ethr_thr_opts ethr_opts = ETHR_THR_OPTS_DEFAULT_INITER; ethr_thr_opts *use_opts; - if (!opts) + if (!opts && !name) use_opts = NULL; else { - ethr_opts.suggested_stack_size = opts->suggested_stack_size; + if(opts) + ethr_opts.suggested_stack_size = opts->suggested_stack_size; + ethr_opts.name = name; use_opts = ðr_opts; } |