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

Rework injection and synchronisation for Linux on musl-libc #3231

Closed
wants to merge 2 commits into from
Closed

Rework injection and synchronisation for Linux on musl-libc #3231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0e6fcb
Add missing time.h include to define time_t type
jmaselbas Jan 5, 2024
41ac532
Rework injection and synchronisaion on linux
jmaselbas Jan 22, 2024
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
1 change: 1 addition & 0 deletions renderdoc/os/os_specific.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
#include <stddef.h>
#include <stdint.h>
#include <stdio.h>
#include <time.h>
#include <functional>
#include "api/replay/rdcarray.h"
#include "api/replay/rdcpair.h"
Expand Down
2 changes: 0 additions & 2 deletions renderdoc/os/posix/linux/linux_hook.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,6 @@ __attribute__((visibility("default"))) pid_t fork()
{
if(Linux_Debug_PtraceLogging())
RDCLOG("hooked fork() in child %d", getpid());

StopAtMainInChild();
}
else if(ret > 0)
{
Expand Down
5 changes: 4 additions & 1 deletion renderdoc/os/posix/linux/linux_network.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@

#include "os/os_specific.h"
#include "os/posix/posix_network.h"
void StopAtMainInChild();

namespace Network
{
Expand All @@ -39,6 +40,8 @@ uint32_t Socket::GetRemoteIP() const

Socket *CreateServerSocket(const rdcstr &bindaddr, uint16_t port, int queuesize)
{
return CreateTCPServerSocket(bindaddr, port, queuesize);
Socket *s = CreateTCPServerSocket(bindaddr, port, queuesize);
StopAtMainInChild();
return s;
}
};
Loading