Skip to content

Commit c88063d

Browse files
committed
Add cleanup of loader dispatch
Signed-off-by: Neil R. Spruit <neil.r.spruit@intel.com>
1 parent 543d147 commit c88063d

5 files changed

Lines changed: 11 additions & 5 deletions

File tree

scripts/templates/ldrddi.cpp.mako

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,4 +336,4 @@ ${tbl['export']['name']}(
336336

337337
#if defined(__cplusplus)
338338
};
339-
#endif
339+
#endif

source/loader/ze_ldrddi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7486,4 +7486,4 @@ zeGetFabricVertexExpProcAddrTable(
74867486

74877487
#if defined(__cplusplus)
74887488
};
7489-
#endif
7489+
#endif

source/loader/ze_loader.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,6 +229,8 @@ namespace loader
229229

230230
if (!desc) {
231231
auto pfnInit = driver.dditable.ze.Global.pfnInit;
232+
printf("pfnInit: %p\n", pfnInit);
233+
printf("globalInitStored->pfnInit: %p\n", globalInitStored->pfnInit);
232234
if(nullptr == pfnInit || globalInitStored->pfnInit == nullptr) {
233235
if (debugTraceEnabled) {
234236
std::string errorMessage = "init driver " + driver.name + " failed, zeInit function pointer null. Returning ";
@@ -401,6 +403,7 @@ namespace loader
401403
if (driverEnvironmentQueried) {
402404
return ZE_RESULT_SUCCESS;
403405
}
406+
printf("init\n");
404407
loader::loaderDispatch = new ze_handle_t();
405408
loader::loaderDispatch->pCore = new ze_dditable_driver_t();
406409
loader::loaderDispatch->pCore->version = ZE_API_VERSION_CURRENT;
@@ -618,7 +621,10 @@ namespace loader
618621
}
619622
}
620623
}
621-
624+
delete loader::loaderDispatch->pCore;
625+
delete loader::loaderDispatch->pTools;
626+
delete loader::loaderDispatch->pSysman;
627+
delete loader::loaderDispatch;
622628
};
623629

624630
void context_t::add_loader_version(){

source/loader/zes_ldrddi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5711,4 +5711,4 @@ zesGetVFManagementExpProcAddrTable(
57115711

57125712
#if defined(__cplusplus)
57135713
};
5714-
#endif
5714+
#endif

source/loader/zet_ldrddi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3152,4 +3152,4 @@ zetGetTracerExpProcAddrTable(
31523152

31533153
#if defined(__cplusplus)
31543154
};
3155-
#endif
3155+
#endif

0 commit comments

Comments
 (0)