diff options
| author | Deval Shah <[email protected]> | 2018-11-09 21:14:55 -0800 |
|---|---|---|
| committer | Deval Shah <[email protected]> | 2018-11-09 21:14:55 -0800 |
| commit | 36496d4ab2ff1088979e0f3137c54592652c37da (patch) | |
| tree | ca449a4dc68abd5355764ae1bc50ca6ea5888fec /src/gpuwattch/cacti/Ucache.cc | |
| parent | 0265d747b06c18d0a1ee00fb1641032201425c97 (diff) | |
| parent | 0e8d4f190940681601bdf7f95a5686baa0b6463b (diff) | |
resolving merge conflict
Diffstat (limited to 'src/gpuwattch/cacti/Ucache.cc')
| -rw-r--r-- | src/gpuwattch/cacti/Ucache.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gpuwattch/cacti/Ucache.cc b/src/gpuwattch/cacti/Ucache.cc index e855238..8f733f7 100644 --- a/src/gpuwattch/cacti/Ucache.cc +++ b/src/gpuwattch/cacti/Ucache.cc @@ -224,7 +224,6 @@ void * calc_time_mt_wrapper(void * void_obj) data_arr.pop_back(); tag_arr.pop_back(); - pthread_exit(NULL); } |