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

daemon: Fix slow start with Ruby 3 #85

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

daemon: Fix slow start with Ruby 3 #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 16 additions & 32 deletions lib/win32/daemon.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,25 +186,6 @@ class Daemon
end
end

ThreadProc = FFI::Function.new(:ulong, [:pointer]) do |lpParameter|
ste = FFI::MemoryPointer.new(SERVICE_TABLE_ENTRY, 2)

s = SERVICE_TABLE_ENTRY.new(ste[0])
s[:lpServiceName] = FFI::MemoryPointer.from_string("")
s[:lpServiceProc] = lpParameter

s = SERVICE_TABLE_ENTRY.new(ste[1])
s[:lpServiceName] = nil
s[:lpServiceProc] = nil

# No service to step, no service handle, no ruby exceptions, just terminate the thread..
unless StartServiceCtrlDispatcher(ste)
return 1
end

return 0
end

# This is a shortcut for Daemon.new + Daemon#mainloop.
#
def self.mainloop
Expand Down Expand Up @@ -254,26 +235,29 @@ def mainloop
raise SystemCallError.new("CreateEvent", FFI.errno)
end

hThread = CreateThread(nil, 0, ThreadProc, Service_Main, 0, nil)
hThread = Thread.new(Service_Main) do |lp_proc|
ste = FFI::MemoryPointer.new(SERVICE_TABLE_ENTRY, 2)

if hThread == 0
raise SystemCallError.new("CreateThread", FFI.errno)
end
s = SERVICE_TABLE_ENTRY.new(ste[0])
s[:lpServiceName] = FFI::MemoryPointer.from_string("")
s[:lpServiceProc] = lp_proc

events = FFI::MemoryPointer.new(:pointer, 2)
events.put_pointer(0, FFI::Pointer.new(hThread))
events.put_pointer(FFI::Pointer.size, FFI::Pointer.new(@@hStartEvent))
s = SERVICE_TABLE_ENTRY.new(ste[1])
s[:lpServiceName] = nil
s[:lpServiceProc] = nil

while (index = WaitForMultipleObjects(2, events, 0, 1000)) == WAIT_TIMEOUT
# When returning 'false', there is no service to stop, no service handle,
# no ruby exceptions, just terminate the thread.
StartServiceCtrlDispatcher(ste)
end

if index == WAIT_FAILED
raise SystemCallError.new("WaitForMultipleObjects", FFI.errno)
while (index = WaitForSingleObject(@@hStartEvent, 1000)) == WAIT_TIMEOUT
# The thread exited, so the show is off.
raise "Service_Main thread exited abnormally" unless hThread.alive?
end

# The thread exited, so the show is off.
if index == WAIT_OBJECT_0
raise "Service_Main thread exited abnormally"
if index == WAIT_FAILED
raise SystemCallError.new("WaitForSingleObject", FFI.errno)
end

thr = Thread.new do
Expand Down
2 changes: 0 additions & 2 deletions lib/win32/windows/functions.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,13 @@ def attach_pfunc(*args)

attach_pfunc :CloseHandle, [:handle], :bool
attach_pfunc :CreateEvent, :CreateEventA, %i{ptr int int str}, :handle
attach_pfunc :CreateThread, %i{ptr size_t ptr ptr dword ptr}, :handle, blocking: true
attach_pfunc :EnterCriticalSection, [:ptr], :void
attach_pfunc :FormatMessage, :FormatMessageA, %i{ulong ptr ulong ulong str ulong ptr}, :ulong
attach_pfunc :GetCurrentProcess, [], :handle
attach_pfunc :InitializeCriticalSection, [:ptr], :void
attach_pfunc :LeaveCriticalSection, [:ptr], :void
attach_pfunc :SetEvent, [:handle], :bool
attach_pfunc :WaitForSingleObject, %i{handle dword}, :dword, blocking: true
attach_pfunc :WaitForMultipleObjects, %i{dword ptr int dword}, :dword

ffi_lib :advapi32

Expand Down