From 68515fdb13d9103da69ff1e9d919da75099f45cb Mon Sep 17 00:00:00 2001
From: "Alfred E. Heggestad" <alfred.heggestad@gmail.com>
Date: Wed, 27 Apr 2022 16:58:32 +0200
Subject: [PATCH] remove sys_rel_get and epoll_check

---
 CMakeLists.txt    |  1 -
 include/re_sys.h  |  2 --
 src/main/epoll.c  | 47 -------------------------------------------
 src/main/main.c   |  2 --
 src/main/main.h   |  5 -----
 src/main/method.c |  3 +--
 src/main/mod.mk   |  4 ----
 src/sys/sys.c     | 51 -----------------------------------------------
 8 files changed, 1 insertion(+), 114 deletions(-)
 delete mode 100644 src/main/epoll.c

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09d434417..cda5261e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -540,7 +540,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   list(APPEND SRCS
     src/net/linux/rt.c
-    src/main/epoll.c
   )
 elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android")
   list(APPEND SRCS
diff --git a/include/re_sys.h b/include/re_sys.h
index e53cc9af9..b175672fc 100644
--- a/include/re_sys.h
+++ b/include/re_sys.h
@@ -32,8 +32,6 @@
 #endif
 
 struct re_printf;
-int  sys_rel_get(uint32_t *rel, uint32_t *maj, uint32_t *min,
-		 uint32_t *patch);
 int  sys_kernel_get(struct re_printf *pf, void *unused);
 int  sys_build_get(struct re_printf *pf, void *unused);
 const char *sys_arch_get(void);
diff --git a/src/main/epoll.c b/src/main/epoll.c
deleted file mode 100644
index b1126776e..000000000
--- a/src/main/epoll.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @file epoll.c  epoll specific routines
- *
- * Copyright (C) 2010 Creytiv.com
- */
-#include <unistd.h>
-#include <sys/epoll.h>
-#include <re_types.h>
-#include <re_mbuf.h>
-#include <re_sys.h>
-#include "main.h"
-
-
-#define DEBUG_MODULE "epoll"
-#define DEBUG_LEVEL 5
-#include <re_dbg.h>
-
-
-/**
- * Check for working epoll() kernel support
- *
- * @return true if support, false if not
- */
-bool epoll_check(void)
-{
-	uint32_t osrel;
-	int err, epfd;
-
-	err = sys_rel_get(&osrel, NULL, NULL, NULL);
-	if (err)
-		return false;
-
-	if (osrel < 0x020542) {
-		DEBUG_INFO("epoll not supported in osrel=0x%08x\n", osrel);
-		return false;
-	}
-
-	epfd = epoll_create(64);
-	if (-1 == epfd) {
-		DEBUG_NOTICE("epoll_create: %m\n", errno);
-		return false;
-	}
-
-	(void)close(epfd);
-
-	return true;
-}
diff --git a/src/main/main.c b/src/main/main.c
index 8679f034e..104051f18 100644
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -1119,8 +1119,6 @@ int poll_method_set(enum poll_method method)
 #endif
 #ifdef HAVE_EPOLL
 	case METHOD_EPOLL:
-		if (!epoll_check())
-			return EINVAL;
 		break;
 #endif
 #ifdef HAVE_KQUEUE
diff --git a/src/main/main.h b/src/main/main.h
index a934c63af..e049b6d71 100644
--- a/src/main/main.h
+++ b/src/main/main.h
@@ -5,11 +5,6 @@
  */
 
 
-#ifdef HAVE_EPOLL
-bool epoll_check(void);
-#endif
-
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/main/method.c b/src/main/method.c
index fac442bbf..7b11fc1a5 100644
--- a/src/main/method.c
+++ b/src/main/method.c
@@ -29,8 +29,7 @@ enum poll_method poll_method_best(void)
 #ifdef HAVE_EPOLL
 	/* Supported from Linux 2.5.66 */
 	if (METHOD_NULL == m) {
-		if (epoll_check())
-			m = METHOD_EPOLL;
+		m = METHOD_EPOLL;
 	}
 #endif
 
diff --git a/src/main/mod.mk b/src/main/mod.mk
index 7adffae2a..f48a6b373 100644
--- a/src/main/mod.mk
+++ b/src/main/mod.mk
@@ -8,10 +8,6 @@ SRCS	+= main/init.c
 SRCS	+= main/main.c
 SRCS	+= main/method.c
 
-ifneq ($(HAVE_EPOLL),)
-SRCS	+= main/epoll.c
-endif
-
 ifneq ($(USE_OPENSSL),)
 SRCS    += main/openssl.c
 endif
diff --git a/src/sys/sys.c b/src/sys/sys.c
index a68f37756..288192569 100644
--- a/src/sys/sys.c
+++ b/src/sys/sys.c
@@ -22,57 +22,6 @@
 #endif
 
 
-/**
- * Get system release version
- *
- * @param rel   Binary encoded release
- * @param maj   Major version number
- * @param min   Minor version number
- * @param patch Patch number
- *
- * @return 0 if success, otherwise errorcode
- */
-int sys_rel_get(uint32_t *rel, uint32_t *maj, uint32_t *min, uint32_t *patch)
-{
-#ifdef HAVE_UNAME
-	struct utsname u;
-	struct pl pl_mj, pl_mn, pl_p;
-	uint32_t mj, mn, p;
-	int err;
-
-	if (0 != uname(&u))
-		return errno;
-
-	err = re_regex(u.release, strlen(u.release),
-		       "[0-9]+.[0-9]+[.\\-]1[0-9]+",
-		       &pl_mj, &pl_mn, NULL, &pl_p);
-	if (err)
-		return err;
-
-	mj = pl_u32(&pl_mj);
-	mn = pl_u32(&pl_mn);
-	p  = pl_u32(&pl_p);
-
-	if (rel)
-		*rel = mj<<16 | mn<<8 | p;
-	if (maj)
-		*maj = mj;
-	if (min)
-		*min = mn;
-	if (patch)
-		*patch = p;
-
-	return 0;
-#else
-	(void)rel;
-	(void)maj;
-	(void)min;
-	(void)patch;
-	return EINVAL;
-#endif
-}
-
-
 /**
  * Get kernel name and version
  *