Skip to content

Add Poll and Fcntl #22

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
Makonede wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add Poll and Fcntl #22

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c19fa6
Add Poll and Fcntl
Makonede Jun 2, 2023
9cf056b
nfds is an unsigned long
Makonede Jun 10, 2023
b80ce45
Merge branch 'open-ead:master' into patch-1
Makonede Jun 10, 2023
918f1e1
Merge branch 'master' into patch-1
Makonede Sep 30, 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
4 changes: 4 additions & 0 deletions include/nn/socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <poll.h>
#include <sys/select.h>
#include <sys/socket.h>
#include <poll.h>

namespace nn {
class TimeSpan;
Expand Down Expand Up @@ -60,6 +61,9 @@ s32 GetSockName(int, sockaddr*, u32*);
s32 GetSockOpt(int, int, int, void*, u32*);
s32 Listen(int, int);
s32 SetSockOpt(s32 socket, s32 socketLevel, s32 option, const void*, u32 len);
s32 Poll(pollfd *fds, unsigned long nfds, s32 timeout);
Copy link
Collaborator

@ThePixelGamer ThePixelGamer Jun 16, 2023

Choose a reason for hiding this comment

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

Can the unsigned long just be nfds_t as to match how poll is done in UNIX
https://man7.org/linux/man-pages/man2/poll.2.html

Copy link
Author

@Makonede Makonede Jun 17, 2023

Choose a reason for hiding this comment

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

@ThePixelGamer no, the mangled name won't link if you use nfds_t, i tried

Copy link
Collaborator

@ThePixelGamer ThePixelGamer Jun 17, 2023

Choose a reason for hiding this comment

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

mangled name? the type should exist seeing how you're including poll.h, am I missing something?

Copy link

@leoetlino leoetlino Jun 17, 2023

Choose a reason for hiding this comment

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

Also, nfds_t is a typedef so it won't even show up in the mangled symbol.

Copy link
Author

@Makonede Makonede Jun 17, 2023

Choose a reason for hiding this comment

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

@leoetlino it's typedefed as an unsigned int and not an unsigned long, so the mangled name changes

Copy link

@leoetlino leoetlino Jun 18, 2023

Choose a reason for hiding this comment

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

musl (which is the libc NintendoSDK uses) typedefs it to an unsigned long.

Copy link
Author

@Makonede Makonede Jun 18, 2023

Choose a reason for hiding this comment

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

@leoetlino i tried, and it seemed to mangle it as j and not m. not sure why

Copy link

@leoetlino leoetlino Jun 18, 2023

Choose a reason for hiding this comment

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

		 ::= j	# unsigned int
		 ::= l	# long
		 ::= m	# unsigned long

Sounds like your header include path is set up incorrectly and you might be using your host system's poll.h (which typedefs it to unsigned int?) rather than the one from musl.

s32 Fcntl(s32 fd, s32 cmd, ...);
u64 Send(s32 socket, const void* buffer, u64 bufferLength, s32 flags);
s32 SockAtMark(int);
s32 Shutdown(int, int);
s32 ShutdownAllSockets(bool);
Expand Down