Skip to content

refactor: restructure treeland codebase for better maintainability #542

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

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

refactor: restructure treeland codebase for better maintainability #542

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
75 changes: 16 additions & 59 deletions waylib/src/server/kernel/wsocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,39 +145,6 @@ class Q_DECL_HIDDEN WSocketPrivate : public WObjectPrivate
QList<WClient*> clients;
};

struct Q_DECL_HIDDEN WlClientDestroyListener {
WlClientDestroyListener(WClient *client)
: client(client)
{
destroy.notify = handle_destroy;
}

~WlClientDestroyListener();

static WlClientDestroyListener *get(const wl_client *client);
static void handle_destroy(struct wl_listener *listener, void *);

wl_listener destroy;
QPointer<WClient> client;
};

WlClientDestroyListener::~WlClientDestroyListener()
{
wl_list_remove(&destroy.link);
}

WlClientDestroyListener *WlClientDestroyListener::get(const wl_client *client)
{
wl_listener *listener = wl_client_get_destroy_listener(const_cast<wl_client*>(client),
WlClientDestroyListener::handle_destroy);
if (!listener) {
return nullptr;
}

WlClientDestroyListener *tmp = wl_container_of(listener, tmp, destroy);
return tmp;
}

static bool pauseClient(wl_client *client, bool pause)
{
pid_t pid = 0;
Expand Down Expand Up @@ -232,49 +199,40 @@ class Q_DECL_HIDDEN WClientPrivate : public WObjectPrivate
, handle(handle)
, socket(socket)
{
auto listener = new WlClientDestroyListener(qq);
wl_client_add_destroy_listener(handle, &listener->destroy);
destroyListener.notify = destroyListenerCallback;
wl_client_add_destroy_listener(handle, &destroyListener);
Copy link
Member

@zccrs zccrs Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

从这个改动看，并没有解决时序问题呀

vioken/waylib#479

}

~WClientPrivate() {
if (pidFD >= 0)
close(pidFD);

if (handle) {
auto listener = WlClientDestroyListener::get(handle);
Q_ASSERT(listener);
delete listener;
}
if (destroyListener.link.next && destroyListener.link.prev)
wl_list_remove(&destroyListener.link);
}

static void destroyListenerCallback(struct wl_listener *listener, void *data) {
wl_client *handle = static_cast<wl_client *>(data);
WClient *client = WClient::get(handle);
Q_ASSERT(client);
wl_list_remove(&client->d_func()->destroyListener.link);
client->socket()->removeClient(handle);
}

W_DECLARE_PUBLIC(WClient)

wl_listener destroyListener;
wl_client *handle = nullptr;
WSocket *socket = nullptr;
mutable QSharedPointer<WClient::Credentials> credentials;
mutable int pidFD = -1;
};

void WlClientDestroyListener::handle_destroy(wl_listener *listener, void *data)
{
WlClientDestroyListener *self = wl_container_of(listener, self, destroy);
if (self->client) {
Q_ASSERT(reinterpret_cast<wl_client*>(data) == self->client->handle());
self->client->d_func()->handle = nullptr;
auto socket = self->client->socket();
Q_ASSERT(socket);
bool ok = socket->removeClient(self->client);
Q_ASSERT(ok);
}

delete self;
Copy link
Member

@zccrs zccrs Sep 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

新的实现里，WClient 对象在哪里销毁的？

}

WClient::WClient(wl_client *client, WSocket *socket)
: QObject(nullptr)
, WObject(*new WClientPrivate(client, socket, this))
{

wl_client_set_user_data(client, this, nullptr);
}

WSocket *WClient::socket() const
Expand Down Expand Up @@ -324,9 +282,8 @@ QSharedPointer<WClient::Credentials> WClient::getCredentials(const wl_client *cl

WClient *WClient::get(const wl_client *client)
{
if (auto tmp = WlClientDestroyListener::get(client))
return tmp->client;
return nullptr;
return static_cast<WClient *>(
wl_client_get_user_data(const_cast<wl_client *>(client)));
}

void WClient::freeze()
Expand Down
Loading