Skip to content

Commit 1445b11

Browse files
jmacatojmacato
committed
rename DBusWireWorker to LibDBusWireWorker.
1 parent d07f31b commit 1445b11

3 files changed

Lines changed: 18 additions & 18 deletions

File tree

‎src/Avalonia.DBus/LibDBusWireConnection.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ namespace Avalonia.DBus;
1212
/// </summary>
1313
internal sealed class LibDBusWireConnection : IDBusWireConnection
1414
{
15-
private readonly LibDbusWireWorker _worker;
15+
private readonly LibDBusWireWorker _worker;
1616

17-
private LibDBusWireConnection(LibDbusWireWorker worker)
17+
private LibDBusWireConnection(LibDBusWireWorker worker)
1818
{
1919
_worker = worker ?? throw new ArgumentNullException(nameof(worker));
2020
}
@@ -42,7 +42,7 @@ internal static Task<LibDBusWireConnection> ConnectAsync(
4242
return ConnectSystemAsync(diagnostics, cancellationToken);
4343

4444
cancellationToken.ThrowIfCancellationRequested();
45-
var worker = LibDbusWireWorker.OpenAddress(address, diagnostics);
45+
var worker = LibDBusWireWorker.OpenAddress(address, diagnostics);
4646
return Task.FromResult(new LibDBusWireConnection(worker));
4747
}
4848

@@ -58,7 +58,7 @@ internal static Task<LibDBusWireConnection> ConnectSessionAsync(
5858
CancellationToken cancellationToken = default)
5959
{
6060
cancellationToken.ThrowIfCancellationRequested();
61-
var worker = LibDbusWireWorker.OpenBus(DBusBusType.DBUS_BUS_SESSION, diagnostics);
61+
var worker = LibDBusWireWorker.OpenBus(DBusBusType.DBUS_BUS_SESSION, diagnostics);
6262
return Task.FromResult(new LibDBusWireConnection(worker));
6363
}
6464

@@ -74,7 +74,7 @@ internal static Task<LibDBusWireConnection> ConnectSystemAsync(
7474
CancellationToken cancellationToken = default)
7575
{
7676
cancellationToken.ThrowIfCancellationRequested();
77-
var worker = LibDbusWireWorker.OpenBus(DBusBusType.DBUS_BUS_SYSTEM, diagnostics);
77+
var worker = LibDBusWireWorker.OpenBus(DBusBusType.DBUS_BUS_SYSTEM, diagnostics);
7878
return Task.FromResult(new LibDBusWireConnection(worker));
7979
}
8080

@@ -85,7 +85,7 @@ internal static Task<LibDBusWireConnection> ConnectSystemAsync(
8585
public Task<string?> GetUniqueNameAsync()
8686
{
8787
var tcs = new TaskCompletionSource<string?>(TaskCreationOptions.RunContinuationsAsynchronously);
88-
_worker.TryEnqueue(new LibDbusWireWorker.FetchUniqueNameMessage(tcs));
88+
_worker.TryEnqueue(new LibDBusWireWorker.FetchUniqueNameMessage(tcs));
8989
return tcs.Task;
9090
}
9191

@@ -100,7 +100,7 @@ public async Task SendAsync(
100100
cancellationToken.ThrowIfCancellationRequested();
101101

102102
var tcs = new TaskCompletionSource<DBusMessage>(TaskCreationOptions.RunContinuationsAsynchronously);
103-
_worker.TryEnqueue(new LibDbusWireWorker.EnqueueSendItemMessage(
103+
_worker.TryEnqueue(new LibDBusWireWorker.EnqueueSendItemMessage(
104104
message,
105105
tcs,
106106
false,
@@ -121,7 +121,7 @@ public async Task<DBusMessage> SendWithReplyAsync(
121121

122122
var tcs = new TaskCompletionSource<DBusMessage>(TaskCreationOptions.RunContinuationsAsynchronously);
123123

124-
_worker.TryEnqueue(new LibDbusWireWorker.EnqueueSendItemMessage(
124+
_worker.TryEnqueue(new LibDBusWireWorker.EnqueueSendItemMessage(
125125
message,
126126
tcs,
127127
true,
@@ -142,7 +142,7 @@ public async Task<DBusMessage> SendWithReplyAsync(
142142
/// </summary>
143143
public ValueTask DisposeAsync()
144144
{
145-
_worker.TryEnqueue(new LibDbusWireWorker.DisposeMessage());
145+
_worker.TryEnqueue(new LibDBusWireWorker.DisposeMessage());
146146
return new ValueTask(_worker.DisposeTask);
147147
}
148148
}

src/Avalonia.DBus/DbusWireWorker.Records.cs renamed to src/Avalonia.DBus/LibDBusWireWorker.Records.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
namespace Avalonia.DBus;
88

9-
internal sealed partial class LibDbusWireWorker
9+
internal sealed partial class LibDBusWireWorker
1010
{
1111

1212
internal abstract record WireWorkerMessage;
@@ -32,7 +32,7 @@ internal sealed record RemoveWatchMessage(DBusWatchPtr WatchPtr) : WireWorkerMes
3232
private sealed record CancelSendItemMessage(SendWorkItem WorkItem) : WireWorkerMessage;
3333

3434
private record WatchState(int Fd, PollEvents Events, bool Enabled);
35-
private record CancelRegistrationState(LibDbusWireWorker Worker, SendWorkItem WorkItem);
35+
private record CancelRegistrationState(LibDBusWireWorker Worker, SendWorkItem WorkItem);
3636

3737
private record SendWorkItem(
3838
DBusMessage Message,

src/Avalonia.DBus/LibDbusWireWorker.cs renamed to src/Avalonia.DBus/LibDBusWireWorker.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
namespace Avalonia.DBus;
1919

20-
internal sealed partial class LibDbusWireWorker
20+
internal sealed partial class LibDBusWireWorker
2121
{
2222
private static readonly unsafe DBusAddWatchFunction AddWatchDelegate = AddWatchCallback;
2323
private static readonly unsafe DBusRemoveWatchFunction RemoveWatchDelegate = RemoveWatchCallback;
@@ -35,7 +35,7 @@ internal sealed partial class LibDbusWireWorker
3535
private static readonly DBusNativeMessagePtr
3636
HandleMsgPtr = Marshal.GetFunctionPointerForDelegate(HandleMsgDelegate);
3737

38-
private static readonly ConcurrentDictionary<int, LibDbusWireWorker> ActiveWorkers = new();
38+
private static readonly ConcurrentDictionary<int, LibDBusWireWorker> ActiveWorkers = new();
3939
private static int _activeWorkerCounter;
4040

4141
private readonly unsafe DBusNativeConnection* _connection;
@@ -69,7 +69,7 @@ private static readonly DBusNativeMessagePtr
6969
internal ChannelReader<DBusMessage> ReceivingReader => _receiving.Reader;
7070
internal Task DisposeTask => _disposeCompletion.Task;
7171

72-
private unsafe LibDbusWireWorker(DBusNativeConnection* connection, bool closeOnDispose, IDBusDiagnostics? diagnostics)
72+
private unsafe LibDBusWireWorker(DBusNativeConnection* connection, bool closeOnDispose, IDBusDiagnostics? diagnostics)
7373
{
7474
_poll = PosixPollFactory.Create();
7575
_curWakeupFd = new WakeupFd(_poll);
@@ -99,7 +99,7 @@ private unsafe LibDbusWireWorker(DBusNativeConnection* connection, bool closeOnD
9999
StartEventLoop();
100100
}
101101

102-
internal static unsafe LibDbusWireWorker OpenBus(DBusBusType busType, IDBusDiagnostics? diagnostics = null)
102+
internal static unsafe LibDBusWireWorker OpenBus(DBusBusType busType, IDBusDiagnostics? diagnostics = null)
103103
{
104104
DbusHelpers.EnsureThreadsInitialized();
105105
DBusError error = default;
@@ -110,10 +110,10 @@ internal static unsafe LibDbusWireWorker OpenBus(DBusBusType busType, IDBusDiagn
110110
ThrowErrorAndFree(ref error, "Failed to connect to D-Bus bus.");
111111

112112
dbus_connection_set_exit_on_disconnect(connection, 0);
113-
return new LibDbusWireWorker(connection, closeOnDispose: true, diagnostics);
113+
return new LibDBusWireWorker(connection, closeOnDispose: true, diagnostics);
114114
}
115115

116-
internal static unsafe LibDbusWireWorker OpenAddress(string address, IDBusDiagnostics? diagnostics = null)
116+
internal static unsafe LibDBusWireWorker OpenAddress(string address, IDBusDiagnostics? diagnostics = null)
117117
{
118118
DbusHelpers.EnsureThreadsInitialized();
119119
DBusError error = default;
@@ -134,7 +134,7 @@ internal static unsafe LibDbusWireWorker OpenAddress(string address, IDBusDiagno
134134
}
135135

136136
dbus_connection_set_exit_on_disconnect(connection, 0);
137-
return new LibDbusWireWorker(connection, closeOnDispose: true, diagnostics);
137+
return new LibDBusWireWorker(connection, closeOnDispose: true, diagnostics);
138138
}
139139

140140
internal bool TryEnqueue(WireWorkerMessage message)

0 commit comments

Comments
 (0)