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

Jump to bottom

Reorganize Socket code #1698

Merged
merged 36 commits into from
Apr 9, 2015
Merged

Reorganize Socket code #1698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
ecc6aba
[Socket] Move SocketOperation out of Socket_2_1.cs
luhenry Apr 8, 2015
17df15e
[Socket] Move SocketAsyncResult out of Socket_2_1.cs
luhenry Apr 8, 2015
6c72a6e
[Socket] Move Worker out of Socket_2_1.cs to SocketAsyncWorker.cs
luhenry Apr 8, 2015
0916f91
[Socket] Move SocketAsyncCall out of Socket_2_1.cs to SocketAsyncCall…
luhenry Apr 8, 2015
c049a8b
[Socket] Move Socket fields out of Socket_2_1.cs to Socket.cs
luhenry Apr 8, 2015
3fed6ef
[Socket] Move Socket constructors to Socket.cs
luhenry Apr 8, 2015
66886a5
[Socket] Move CheckProtocolSupport to static constructor
luhenry Apr 8, 2015
e2e2229
[Socket] Move Select related methods to their own region
luhenry Apr 8, 2015
9103278
[Socket] Move properties to their own region
luhenry Apr 8, 2015
3555555
[Socket] Move Accept related methods to their own region
luhenry Apr 8, 2015
d82106d
[Socket] Move Connect related methods to their region
luhenry Apr 8, 2015
eb4e038
[Socket] Move Disconnect related methods to their region
luhenry Apr 8, 2015
4a358f9
[Socket] Move Receive related methods to their region
luhenry Apr 8, 2015
5ed347d
[Socket] Move ReceiveFrom related methods to their region
luhenry Apr 8, 2015
7299a2b
[Socket] Move ReceiveMessageFrom related methods to their region
luhenry Apr 8, 2015
4907ad6
[Socket] Move Send related methods to their region
luhenry Apr 8, 2015
abe9bc8
[Socket] Move SendTo related methods to their region
luhenry Apr 9, 2015
d924998
[Socket] Move SendFile related methods to their region
luhenry Apr 9, 2015
54f36e4
[Socket] Move Bind related methods to their region
luhenry Apr 9, 2015
9346cd1
[Socket] Remove unused CheckRange method
luhenry Apr 9, 2015
1dd589c
[Socket] Move DuplicateAndClose related methods to their region
luhenry Apr 9, 2015
2250570
[Socket] Move Listen related methods to their region
luhenry Apr 9, 2015
d9b72bb
[Socket] Move SendPackets related methods to their region
luhenry Apr 9, 2015
66204d1
[Socket] Move GetSocketOption related methods to their region
luhenry Apr 9, 2015
c45161d
[Socket] Move SetSocketOption related methods to their region
luhenry Apr 9, 2015
96a51d0
[Socket] Move Poll related methods to their region
luhenry Apr 9, 2015
badcf36
[Socket] Move IOControl related methods to their region
luhenry Apr 9, 2015
a9031bf
[Socket] Move Close related methods to their region
luhenry Apr 9, 2015
80445ad
[Socket] Move Shutdown related methods to their region
luhenry Apr 9, 2015
1c0c785
[Socket] Move Dispose related methods to their region
luhenry Apr 9, 2015
dfc6fbb
[Socket] Inline InvalidAsyncOp into ValidateEndIAsyncResult
luhenry Apr 9, 2015
0341f06
[Socket] Move remaining icalls and struct from Socket_2_1.cs to Socke…
luhenry Apr 9, 2015
6ab21e3
[runtime] Remove system from mono_defaults.system as it is a unloadab…
luhenry Apr 9, 2015
1c41e59
[Socket] Refactor SocketAsyncResult enqueuing
luhenry Apr 9, 2015
333a93a
[Socket] Cleanup of SocketAsyncWorker, SocketAsyncResult and SocketAs…
luhenry Apr 9, 2015
52d761a
[Socket] Use type specific read and write queue for SocketAsyncWorker
luhenry Apr 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion mcs/class/System/ReferenceSources/MonoSocketRuntimeWorkItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ namespace System.Net.Sockets
{
internal sealed class MonoSocketRuntimeWorkItem : IThreadPoolWorkItem
{
Socket.SocketAsyncResult socket_async_result;
SocketAsyncResult socket_async_result;

[MethodImplAttribute(MethodImplOptions.InternalCall)]
public extern void ExecuteWorkItem();
Expand Down
8 changes: 4 additions & 4 deletions mcs/class/System/ReferenceSources/Socket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ partial class Socket
// this version does not throw.
internal void InternalShutdown (SocketShutdown how)
{
if (!connected || disposed)
if (!is_connected || is_disposed)
return;
int error;
Shutdown_internal (socket, how, out error);
Shutdown_internal (safe_handle, how, out error);
}

internal IAsyncResult UnsafeBeginConnect (EndPoint remoteEP, AsyncCallback callback, object state)
Expand Down Expand Up @@ -86,15 +86,15 @@ internal void MultipleSend (BufferOffsetSize[] buffers, SocketFlags socketFlags)

internal void SetSocketOption (SocketOptionLevel optionLevel, SocketOptionName optionName, int optionValue, bool silent)
{
if (disposed && closed) {
if (is_disposed && is_closed) {
if (silent)
return;
throw new ObjectDisposedException (GetType ().ToString ());
}

int error;

SetSocketOption_internal (socket, optionLevel, optionName, null,
SetSocketOption_internal (safe_handle, optionLevel, optionName, null,
null, optionValue, out error);

if (!silent && error != 0)
Expand Down