[threads] Remove ThreadState_StopRequested (#4462)

[mono.git] / mono / metadata / w32socket.c

diff --git a/mono/metadata/w32socket.c b/mono/metadata/w32socket.c
index d8851e8b70fab5b23fb1384f53314098e81fc2b9..8bc8b49a8c5b70bb2043829c7bb12797141bf069 100644 (file)
--- a/mono/metadata/w32socket.c
+++ b/mono/metadata/w32socket.c
@@ -825,7 +825,7 @@ create_object_from_sockaddr (struct sockaddr *saddr, int sa_size, gint32 *werror
        MonoArray *data;
        MonoAddressFamily family;
 
-       mono_error_init (error);
+       error_init (error);
 
        /* Build a System.Net.SocketAddress object instance */
        if (!domain->sockaddr_class)
@@ -1058,7 +1058,7 @@ create_sockaddr_from_object (MonoObject *saddr_obj, socklen_t *sa_size, gint32 *
        gint32 family;
        int len;
 
-       mono_error_init (error);
+       error_init (error);
 
        if (!domain->sockaddr_class)
                domain->sockaddr_class = mono_class_load_from_name (get_socket_assembly (), "System.Net", "SocketAddress");
@@ -1270,7 +1270,7 @@ ves_icall_System_Net_Sockets_Socket_Poll_internal (gsize sock, gint mode,
                }
 
                if (ret == -1 && errno == EINTR) {
-                       if (mono_thread_test_state (thread, (MonoThreadState)(ThreadState_AbortRequested | ThreadState_StopRequested))) {
+                       if (mono_thread_test_state (thread, ThreadState_AbortRequested)) {
                                g_free (pfds);
                                return FALSE;
                        }
@@ -1777,7 +1777,7 @@ ves_icall_System_Net_Sockets_Socket_Select_internal (MonoArray **sockets, gint32
                }
 
                if (ret == -1 && errno == EINTR) {
-                       if (mono_thread_test_state (thread, (MonoThreadState)(ThreadState_AbortRequested | ThreadState_StopRequested))) {
+                       if (mono_thread_test_state (thread, ThreadState_AbortRequested)) {
                                g_free (pfds);
                                *sockets = NULL;
                                return;
@@ -2406,7 +2406,7 @@ addrinfo_to_IPHostEntry (MonoAddressInfo *info, MonoString **h_name, MonoArray *
        int addr_index;
        MonoDomain *domain = mono_domain_get ();
 
-       mono_error_init (error);
+       error_init (error);
        addr_index = 0;
        *h_aliases = mono_array_new_checked (domain, mono_get_string_class (), 0, error);
        return_val_if_nok (error, FALSE);
@@ -2638,12 +2638,14 @@ ves_icall_System_Net_Sockets_Socket_SendFile_internal (gsize sock, MonoString *f
        gboolean interrupted;
        TRANSMIT_FILE_BUFFERS buffers;
 
+       *werror = 0;
+
        if (filename == NULL)
                return FALSE;
 
        /* FIXME: replace file by a proper fd that we can call open and close on, as they are interruptible */
 
-       file = mono_w32file_create (mono_string_chars (filename), OPEN_EXISTING, GENERIC_READ, FILE_SHARE_READ, 0);
+       file = mono_w32file_create (mono_string_chars (filename), GENERIC_READ, FILE_SHARE_READ, OPEN_EXISTING, 0);
        if (file == INVALID_HANDLE_VALUE) {
                *werror = mono_w32error_get_last ();
                return FALSE;
@@ -2680,12 +2682,8 @@ ves_icall_System_Net_Sockets_Socket_SendFile_internal (gsize sock, MonoString *f
                return FALSE;
        }
 
-       MONO_ENTER_GC_SAFE;
-
        mono_w32file_close (file);
 
-       MONO_EXIT_GC_SAFE;
-
        if (*werror)
                return FALSE;