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

draft: avoid undefined behaviour in C macro #8

Merged
merged 1 commit into from
Jun 26, 2024
Merged

draft: avoid undefined behaviour in C macro #8

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
47 changes: 27 additions & 20 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ void parseHeader() {
for (auto& rq : iface.requests) {
for (auto& arg : rq.args) {
if (!arg.interface.empty()) {
HEADER += std::format("\nclass {};", camelize((clientCode ? "CC_" : "C_")+ arg.interface));
HEADER += std::format("\nclass {};", camelize((clientCode ? "CC_" : "C_") + arg.interface));
}
}
}
Expand Down Expand Up @@ -300,15 +300,20 @@ void parseHeader() {
const auto IFACE_CLASS_NAME_CAMEL = camelize((clientCode ? "CC_" : "C_") + iface.name);

// begin the class
HEADER +=
std::format(R"#(
HEADER += std::format(R"#(
struct {}DestroyWrapper {{
wl_listener listener;
{}* parent = nullptr;
}};

class {} {{
public:
{}({});
~{}();

)#",
IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, (clientCode ? "wl_resource*" : "wl_client* client, uint32_t version, uint32_t id"), IFACE_CLASS_NAME_CAMEL);
IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL,
(clientCode ? "wl_resource*" : "wl_client* client, uint32_t version, uint32_t id"), IFACE_CLASS_NAME_CAMEL);

if (!clientCode) {
HEADER += std::format(R"#(
Expand Down Expand Up @@ -364,7 +369,7 @@ class {} {{
void* data() {{
return pData;
}}

// get the raw wl_resource (wl_proxy) ptr
wl_resource* resource() {{
return pResource;
Expand Down Expand Up @@ -471,10 +476,10 @@ class {} {{

wl_resource* pResource = nullptr;

wl_listener resourceDestroyListener;
{}DestroyWrapper resourceDestroyListener;

void* pData = nullptr;)#",
IFACE_CLASS_NAME_CAMEL);
IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL);
} else {
HEADER += R"#(
wl_resource* pResource = nullptr;
Expand Down Expand Up @@ -614,11 +619,12 @@ static void {}(void* data, void* resource{}) {{
if (!clientCode) {
SOURCE += std::format(R"#(
static void _{}__DestroyListener(wl_listener* l, void* d) {{
{}* pResource = wl_container_of(l, pResource, resourceDestroyListener);
{}DestroyWrapper *wrap = wl_container_of(l, wrap, listener);
{}* pResource = wrap->parent;
pResource->onDestroyCalled();
}}
)#",
IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL);
IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL, IFACE_CLASS_NAME_CAMEL);
}

// create vtable
Expand Down Expand Up @@ -685,13 +691,13 @@ void {}::{}({}) {{
{} {}::{}({}) {{
if (!pResource)
return{};{}

auto proxy = wl_proxy_marshal_flags((wl_proxy*)pResource, {}, {}, wl_proxy_get_version((wl_proxy*)pResource), {}{}{});{}
}}
)#",
ptrRetType, IFACE_CLASS_NAME_CAMEL, EVENT_NAME, argsC, (ev.newIdType.empty() ? "" : " nullptr"), (ev.destructor ? "\n destroyed = true;" : ""), evid,
(ev.newIdType.empty() ? "nullptr" : "&" + ev.newIdType + "_interface"), flags, (!ev.newIdType.empty() ? ", nullptr" : ""), argsN,
(ev.newIdType.empty() ? "\n proxy;" : "\n\n return proxy;"));
ptrRetType, IFACE_CLASS_NAME_CAMEL, EVENT_NAME, argsC, (ev.newIdType.empty() ? "" : " nullptr"),
(ev.destructor ? "\n destroyed = true;" : ""), evid, (ev.newIdType.empty() ? "nullptr" : "&" + ev.newIdType + "_interface"), flags,
(!ev.newIdType.empty() ? ", nullptr" : ""), argsN, (ev.newIdType.empty() ? "\n proxy;" : "\n\n return proxy;"));
}

evid++;
Expand Down Expand Up @@ -835,16 +841,17 @@ const wl_interface {} = {{
return;

wl_resource_set_user_data(pResource, this);
wl_list_init(&resourceDestroyListener.link);
resourceDestroyListener.notify = _{}__DestroyListener;
wl_resource_add_destroy_listener(pResource, &resourceDestroyListener);
wl_list_init(&resourceDestroyListener.listener.link);
resourceDestroyListener.listener.notify = _{}__DestroyListener;
resourceDestroyListener.parent = this;
wl_resource_add_destroy_listener(pResource, &resourceDestroyListener.listener);

wl_resource_set_implementation(pResource, {}, this, nullptr);
}}

{}::~{}() {{
wl_list_remove(&resourceDestroyListener.link);
wl_list_init(&resourceDestroyListener.link);
wl_list_remove(&resourceDestroyListener.listener.link);
wl_list_init(&resourceDestroyListener.listener.link);

// if we still own the wayland resource,
// it means we need to destroy it.
Expand All @@ -856,8 +863,8 @@ const wl_interface {} = {{

void {}::onDestroyCalled() {{
wl_resource_set_user_data(pResource, nullptr);
wl_list_remove(&resourceDestroyListener.link);
wl_list_init(&resourceDestroyListener.link);
wl_list_remove(&resourceDestroyListener.listener.link);
wl_list_init(&resourceDestroyListener.listener.link);

// set the resource to nullptr,
// as it will be freed. If the consumer does not destroy this resource
Expand Down
Loading