Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add log file support. #150

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add log file support. #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions layer/dispatch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateDevice(VkPhysicalDevice gpu, const V
const VkAllocationCallbacks *pAllocator, VkDevice *pDevice)
{
auto *layer = get_instance_layer(gpu);
layer->setLogCallback();
auto *chainInfo = getChainInfo(pCreateInfo, VK_LAYER_LINK_INFO);

auto fpGetInstanceProcAddr = chainInfo->u.pLayerInfo->pfnNextGetInstanceProcAddr;
Expand Down Expand Up @@ -222,6 +223,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateGraphicsPipelines(VkDevice device, V
VkPipeline *pPipelines)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

#ifdef FOSSILIZE_LAYER_CAPTURE_SIGSEGV
if (layer->getInstance()->capturesCrashes())
Expand Down Expand Up @@ -305,6 +307,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateComputePipelines(VkDevice device, Vk
VkPipeline *pPipelines)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

#ifdef FOSSILIZE_LAYER_CAPTURE_SIGSEGV
if (layer->getInstance()->capturesCrashes())
Expand Down Expand Up @@ -395,6 +398,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateRayTracingPipelinesKHR(
VkPipeline *pPipelines)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

#ifdef FOSSILIZE_LAYER_CAPTURE_SIGSEGV
if (layer->getInstance()->capturesCrashes())
Expand All @@ -419,6 +423,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreatePipelineLayout(VkDevice device,
VkPipelineLayout *pLayout)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

VkResult result = layer->getTable()->CreatePipelineLayout(device, pCreateInfo, pAllocator, pLayout);

Expand All @@ -436,6 +441,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateDescriptorSetLayout(VkDevice device,
VkDescriptorSetLayout *pSetLayout)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

VkResult result = layer->getTable()->CreateDescriptorSetLayout(device, pCreateInfo, pAllocator, pSetLayout);

Expand Down Expand Up @@ -473,6 +479,7 @@ static VKAPI_ATTR void VKAPI_CALL DestroyDevice(VkDevice device, const VkAllocat

void *key = getDispatchKey(device);
auto *layer = getLayerData(key, deviceData);
layer->getInstance()->setLogCallback();

layer->getTable()->DestroyDevice(device, pAllocator);
destroyLayerData(key, deviceData);
Expand All @@ -482,6 +489,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateSampler(VkDevice device, const VkSam
const VkAllocationCallbacks *pCallbacks, VkSampler *pSampler)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();
auto res = layer->getTable()->CreateSampler(device, pCreateInfo, pCallbacks, pSampler);

if (res == VK_SUCCESS)
Expand All @@ -498,6 +506,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateShaderModule(VkDevice device, const
VkShaderModule *pShaderModule)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

*pShaderModule = VK_NULL_HANDLE;

Expand All @@ -516,6 +525,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass(VkDevice device, const Vk
const VkAllocationCallbacks *pCallbacks, VkRenderPass *pRenderPass)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

auto res = layer->getTable()->CreateRenderPass(device, pCreateInfo, pCallbacks, pRenderPass);

Expand All @@ -531,6 +541,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass2(VkDevice device, const V
const VkAllocationCallbacks *pCallbacks, VkRenderPass *pRenderPass)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

// Split calls since 2 and KHR variants might not be present even if the other one is.
auto res = layer->getTable()->CreateRenderPass2(device, pCreateInfo, pCallbacks, pRenderPass);
Expand All @@ -547,6 +558,7 @@ static VKAPI_ATTR VkResult VKAPI_CALL CreateRenderPass2KHR(VkDevice device, cons
const VkAllocationCallbacks *pCallbacks, VkRenderPass *pRenderPass)
{
auto *layer = get_device_layer(device);
layer->getInstance()->setLogCallback();

// Split calls since 2 and KHR variants might not be present even if the other one is.
auto res = layer->getTable()->CreateRenderPass2KHR(device, pCreateInfo, pCallbacks, pRenderPass);
Expand Down Expand Up @@ -600,6 +612,7 @@ VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL VK_LAYER_fossilize_GetD
layer = getLayerData(getDispatchKey(device), deviceData);
}

layer->getInstance()->setLogCallback();
auto proc = layer->getTable()->GetDeviceProcAddr(device, pName);

// If the underlying implementation returns nullptr, we also need to return nullptr.
Expand All @@ -626,6 +639,7 @@ VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL VK_LAYER_fossilize_GetI
lock_guard<mutex> holder{globalLock};
layer = getLayerData(getDispatchKey(instance), instanceData);
}
layer->setLogCallback();

proc = layer->getProcAddr(pName);

Expand Down
30 changes: 30 additions & 0 deletions layer/instance.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,10 @@ static std::string getSystemProperty(const char *key)
#define FOSSILIZE_DUMP_PATH_ENV "FOSSILIZE_DUMP_PATH"
#endif

#ifndef FOSSILIZE_LOG_PATH_ENV
#define FOSSILIZE_LOG_PATH_ENV "FOSSILIZE_LOG_PATH"
#endif

#ifndef FOSSILIZE_DUMP_PATH_READ_ONLY_ENV
#define FOSSILIZE_DUMP_PATH_READ_ONLY_ENV "FOSSILIZE_DUMP_PATH_READ_ONLY"
#endif
Expand Down Expand Up @@ -283,6 +287,32 @@ Instance::Instance()
}
#endif
#endif

const char *log_path = getenv(FOSSILIZE_LOG_PATH_ENV);
if (log_path)
{
log_file = fopen(log_path, "w");
setLogCallback();
}
}

Instance::~Instance()
{
set_thread_log_callback(nullptr, nullptr);
if (log_file)
fclose(log_file);
}

void Instance::setLogCallback()
{
if (log_file)
{
set_thread_log_callback([](LogLevel, const char *message, void *userdata) {
auto *file = static_cast<FILE *>(userdata);
fprintf(file, "%s", message);
fflush(file);
}, log_file);
}
}

StateRecorder *Instance::getStateRecorderForDevice(const VkPhysicalDeviceProperties2 *props,
Expand Down
4 changes: 4 additions & 0 deletions layer/instance.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ class Instance
{
public:
Instance();
~Instance();

VkInstance getInstance()
{
Expand Down Expand Up @@ -71,6 +72,8 @@ class Instance
static void completedPipelineCompilation();
#endif

void setLogCallback();

private:
ScratchAllocator alloc;
VkApplicationInfo *pAppInfo = nullptr;
Expand All @@ -81,5 +84,6 @@ class Instance
#ifdef FOSSILIZE_LAYER_CAPTURE_SIGSEGV
bool enableCrashHandler = false;
#endif
FILE *log_file = nullptr;
};
}