From f3b722b9d6e2757c22b6d9857cbc89e12c033e81 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Tue, 5 Oct 2021 20:06:00 -0700 Subject: [PATCH] fix: Fixes epoll calls on linux (#818) --- Projects/Server/Network/PollGroup/EPollGroup.cs | 8 ++++---- Projects/UOContent/World Saves/AutoArchive.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Projects/Server/Network/PollGroup/EPollGroup.cs b/Projects/Server/Network/PollGroup/EPollGroup.cs index bf615e4cc..ff00b44b2 100755 --- a/Projects/Server/Network/PollGroup/EPollGroup.cs +++ b/Projects/Server/Network/PollGroup/EPollGroup.cs @@ -93,16 +93,16 @@ namespace Server.Network private static class Linux { - [DllImport("libc", SetLastError = true)] + [DllImport("libc.so.6", SetLastError = true)] public static extern int epoll_create1(epoll_flags flags); - [DllImport("libc", SetLastError = true)] + [DllImport("libc.so.6", SetLastError = true)] public static extern int epoll_close(int epfd); - [DllImport("libc", SetLastError = true)] + [DllImport("libc.so.6", SetLastError = true)] public static extern int epoll_ctl(int epfd, epoll_op op, int fd, ref epoll_event ee); - [DllImport("libc", SetLastError = true)] + [DllImport("libc.so.6", SetLastError = true)] public static extern int epoll_wait(int epfd, [In, Out] epoll_event[] ee, int maxevents, int timeout); } diff --git a/Projects/UOContent/World Saves/AutoArchive.cs b/Projects/UOContent/World Saves/AutoArchive.cs index fc839e830..ed4dd4afd 100755 --- a/Projects/UOContent/World Saves/AutoArchive.cs +++ b/Projects/UOContent/World Saves/AutoArchive.cs @@ -380,7 +380,7 @@ namespace Server.Saves private static IEnumerable PathsByTimestampName(string path, bool files = false) { - var allItems = files ? Directory.GetFiles(path) : Directory.GetDirectories(path); + var allItems = files ? Directory.EnumerateFiles(path) : Directory.GetDirectories(path); var items = new SortedDictionary(new DescendingComparer()); foreach (var item in allItems) {