diff options
| author | Ilya Verbin <ilya.verbin@intel.com> | 2015-10-26 14:38:02 +0000 |
|---|---|---|
| committer | Ilya Verbin <iverbin@gcc.gnu.org> | 2015-10-26 14:38:02 +0000 |
| commit | 0b7c37ee712fdc5164db6cd6acb816fcf6752c02 (patch) | |
| tree | 13c66ea2a6047f853a3a1325b9ed79848c78df4a /liboffloadmic | |
| parent | 6a112b50ef2741a635b9235ca68890033b17322f (diff) | |
offload_host.cpp (OffloadDescriptor::setup_misc_data): Use calloc instead of malloc.
liboffloadmic/
* runtime/offload_host.cpp (OffloadDescriptor::setup_misc_data): Use
calloc instead of malloc.
(__offload_fini_library): Set mic_engines_total to zero.
Co-Authored-By: Aleksander Ivanushenko <aleksander.ivanushenko@intel.com>
From-SVN: r229368
Diffstat (limited to 'liboffloadmic')
| -rw-r--r-- | liboffloadmic/ChangeLog | 7 | ||||
| -rw-r--r-- | liboffloadmic/runtime/offload_host.cpp | 5 |
2 files changed, 10 insertions, 2 deletions
diff --git a/liboffloadmic/ChangeLog b/liboffloadmic/ChangeLog index 82e7999188c..93419bdfaaf 100644 --- a/liboffloadmic/ChangeLog +++ b/liboffloadmic/ChangeLog @@ -1,3 +1,10 @@ +2015-10-26 Ilya Verbin <ilya.verbin@intel.com> + Aleksander Ivanushenko <aleksander.ivanushenko@intel.com> + + * runtime/offload_host.cpp (OffloadDescriptor::setup_misc_data): Use + calloc instead of malloc. + (__offload_fini_library): Set mic_engines_total to zero. + 2015-10-13 Ilya Verbin <ilya.verbin@intel.com> * plugin/libgomp-plugin-intelmic.cpp (GOMP_OFFLOAD_dev2dev): New diff --git a/liboffloadmic/runtime/offload_host.cpp b/liboffloadmic/runtime/offload_host.cpp index eec457d386a..c10dc4efb55 100644 --- a/liboffloadmic/runtime/offload_host.cpp +++ b/liboffloadmic/runtime/offload_host.cpp @@ -2421,8 +2421,8 @@ bool OffloadDescriptor::setup_misc_data(const char *name) } // initialize function descriptor - m_func_desc = (FunctionDescriptor*) malloc(m_func_desc_size + - misc_data_size); + m_func_desc = (FunctionDescriptor*) calloc(1, m_func_desc_size + + misc_data_size); if (m_func_desc == NULL) LIBOFFLOAD_ERROR(c_malloc); m_func_desc->console_enabled = console_enabled; @@ -5087,6 +5087,7 @@ static void __offload_fini_library(void) OFFLOAD_DEBUG_TRACE(2, "Cleanup offload library ...\n"); if (mic_engines_total > 0) { delete[] mic_engines; + mic_engines_total = 0; if (mic_proxy_fs_root != 0) { free(mic_proxy_fs_root); |