Various sys_net improvements

Implement P2PS select
Adjust P2P sendto return value

rpcs3/Emu/Cell/lv2/sys_net.cpp

@@ -1279,10 +1279,26 @@ error_code sys_net_bnet_select(ppu_thread& ppu, s32 nfds, vm::ptr<sys_net_fd_set
 
 			if (auto sock = idm::check_unlocked<lv2_socket>((lv2_socket::id_base & -1024) + i))
 			{
-				if (sock->select(selected, _fds[i]))
+				auto [read_set, write_set, except_set] = sock->select(selected, _fds[i]);
+
+				if (read_set || write_set || except_set)
+				{
+					signaled++;
+				}
+
+				if (read_set)
 				{
 					rread.set(i);
-					signaled++;
+				}
+
+				if (write_set)
+				{
+					rwrite.set(i);
+				}
+
+				if (except_set)
+				{
+					rexcept.set(i);
 				}
 
 #ifdef _WIN32

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket.h

@@ -21,7 +21,6 @@
 #endif
 #endif
 
-
 #ifdef _WIN32
 using socket_type = uptr;
 #else
@@ -73,7 +72,6 @@ public:
 #endif
 
 public:
-
 	virtual std::tuple<bool, s32, sys_net_sockaddr> accept(bool is_lock = true) = 0;
 	virtual s32 bind(const sys_net_sockaddr& addr, s32 ps3_id)                  = 0;
 
@@ -95,7 +93,7 @@ public:
 	virtual s32 shutdown(s32 how) = 0;
 
 	virtual s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd)                           = 0;
-	virtual s32 select(bs_t<poll_t> selected, pollfd& native_pfd) = 0;
+	virtual std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) = 0;
 
 public:
 	// IDM data

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.cpp

@@ -969,7 +969,7 @@ s32 lv2_socket_native::poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd)
 	return 0;
 }
 
-s32 lv2_socket_native::select(bs_t<lv2_socket::poll_t> selected, pollfd& native_pfd)
+std::tuple<bool, bool, bool> lv2_socket_native::select(bs_t<lv2_socket::poll_t> selected, pollfd& native_pfd)
 {
 	native_pfd.fd = socket;
 	if (selected & lv2_socket::poll_t::read)
@@ -981,7 +981,7 @@ s32 lv2_socket_native::select(bs_t<lv2_socket::poll_t> selected, pollfd& native_
 		native_pfd.events |= POLLOUT;
 	}
 
-	return 0;
+	return {};
 }
 
 void lv2_socket_native::set_default_buffers()

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_native.h

@@ -48,7 +48,7 @@ public:
 	std::optional<s32> sendto(s32 flags, const std::vector<u8>& buf, std::optional<sys_net_sockaddr> opt_sn_addr, bool is_lock = true) override;
 
 	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
-	s32 select(bs_t<poll_t> selected, pollfd& native_pfd) override;
+	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
 
 	s32 listen(s32 backlog) override;
 	void close() override;

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.cpp

@@ -221,7 +221,7 @@ std::optional<s32> lv2_socket_p2p::sendto(s32 flags, const std::vector<u8>& buf,
 
 	if (native_result >= 0)
 	{
-		return {native_result};
+		return {std::max<s32>(native_result - sizeof(u16), 0l)};
 	}
 
 	s32 result = get_last_error(!so_nbio && (flags & SYS_NET_MSG_DONTWAIT) == 0);
@@ -281,15 +281,25 @@ s32 lv2_socket_p2p::poll(sys_net_pollfd& sn_pfd, [[maybe_unused]] pollfd& native
 	return sn_pfd.revents ? 1 : 0;
 }
 
-s32 lv2_socket_p2p::select(bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
+std::tuple<bool, bool, bool> lv2_socket_p2p::select(bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
 {
 	std::lock_guard lock(mutex);
+
+	bool read_set  = false;
+	bool write_set = false;
+
 	// Check if it's a bound P2P socket
 	if ((selected & lv2_socket::poll_t::read) && vport && !data.empty())
 	{
 		sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", vport, data.size());
-		return 1;
+		read_set = true;
 	}
 
-	return 0;
+	if (selected & lv2_socket::poll_t::write)
+	{
+		sys_net.trace("[P2P] p2p_data for vport %d contains %d elements", vport, data.size());
+		write_set = true;
+	}
+
+	return {read_set, write_set, false};
 }

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2p.h

@@ -28,7 +28,7 @@ class lv2_socket_p2p : public lv2_socket
 	s32 shutdown(s32 how) override;
 
 	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
-	s32 select(bs_t<poll_t> selected, pollfd& native_pfd) override;
+	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
 
 	void handle_new_data(sys_net_sockaddr_in_p2p p2p_addr, std::vector<u8> p2p_data);
 

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.cpp

@@ -796,3 +796,37 @@ s32 lv2_socket_p2ps::poll(sys_net_pollfd& sn_pfd, [[maybe_unused]] pollfd& nativ
 
 	return 0;
 }
+
+std::tuple<bool, bool, bool> lv2_socket_p2ps::select(bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
+{
+	std::lock_guard lock(mutex);
+
+	bool read_set  = false;
+	bool write_set = false;
+
+	if (status == p2ps_stream_status::stream_connected)
+	{
+		if ((selected & lv2_socket::poll_t::read) && data_available)
+		{
+			sys_net.trace("[P2PS] socket has %d bytes available", data_available);
+			read_set = true;
+		}
+
+		if (selected & lv2_socket::poll_t::write)
+		{
+			sys_net.trace("[P2PS] socket is writeable");
+			write_set = true;
+		}
+	}
+	else if (status == p2ps_stream_status::stream_listening)
+	{
+		const auto bsize = backlog.size();
+		if ((selected & lv2_socket::poll_t::read) && bsize)
+		{
+			sys_net.trace("[P2PS] socket has %d clients available", bsize);
+			read_set = true;
+		}
+	}
+
+	return {read_set, write_set, false};
+}

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_p2ps.h

@@ -82,6 +82,7 @@ public:
 	s32 shutdown(s32 how) override;
 
 	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
+	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
 
 protected:
 	static constexpr usz MAX_RECEIVED_BUFFER = (1024 * 1024 * 10);

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.cpp

@@ -91,7 +91,7 @@ s32 lv2_socket_raw::poll([[maybe_unused]] sys_net_pollfd& sn_pfd, [[maybe_unused
 	return {};
 }
 
-s32 lv2_socket_raw::select([[maybe_unused]] bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
+std::tuple<bool, bool, bool> lv2_socket_raw::select([[maybe_unused]] bs_t<lv2_socket::poll_t> selected, [[maybe_unused]] pollfd& native_pfd)
 {
 	sys_net.todo("lv2_socket_raw::select");
 	return {};

rpcs3/Emu/Cell/lv2/sys_net/lv2_socket_raw.h

@@ -28,5 +28,5 @@ public:
 	s32 shutdown(s32 how) override;
 
 	s32 poll(sys_net_pollfd& sn_pfd, pollfd& native_pfd) override;
-	s32 select(bs_t<poll_t> selected, pollfd& native_pfd) override;
+	std::tuple<bool, bool, bool> select(bs_t<poll_t> selected, pollfd& native_pfd) override;
 };

rpcs3/Emu/Cell/lv2/sys_net/sys_net_helpers.h

@@ -15,7 +15,6 @@
 #endif
 #endif
 
-
 #include "Emu/Cell/lv2/sys_net.h"
 
 int get_native_error();