From: Damjan Marion <damarion@cisco.com>
Date: Thu, 17 Apr 2025 20:04:29 +0000 (+0200)
Subject: vlib: move file_main to vlib/file.[ch]
X-Git-Tag: v25.10-rc0~77
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=2fa70d66482adb21178bad9ebf0d748358cd416e;p=vpp.git

vlib: move file_main to vlib/file.[ch]

mechanical change to accomodate following patch...

Type: refactor
Change-Id: I74be905534d8061d0f192b969cfbfd94272922f0
Signed-off-by: Damjan Marion <damarion@cisco.com>
---

diff --git a/src/plugins/af_packet/af_packet.c b/src/plugins/af_packet/af_packet.c
index 8cb2af27d7f..f3a1f495fe7 100644
--- a/src/plugins/af_packet/af_packet.c
+++ b/src/plugins/af_packet/af_packet.c
@@ -30,7 +30,7 @@
 
 #include <vppinfra/linux/sysfs.h>
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vnet/ip/ip.h>
 #include <vnet/devices/netlink.h>
 #include <vnet/ethernet/ethernet.h>
diff --git a/src/plugins/af_xdp/device.c b/src/plugins/af_xdp/device.c
index 63a276ce51e..8d9496206d2 100644
--- a/src/plugins/af_xdp/device.c
+++ b/src/plugins/af_xdp/device.c
@@ -24,7 +24,7 @@
 #include <linux/limits.h>
 #include <bpf/bpf.h>
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vlib/pci/pci.h>
 #include <vppinfra/linux/netns.h>
 #include <vppinfra/linux/sysfs.h>
diff --git a/src/plugins/dpdk/device/common.c b/src/plugins/dpdk/device/common.c
index 5e7961fe0f1..7671fc2639c 100644
--- a/src/plugins/dpdk/device/common.c
+++ b/src/plugins/dpdk/device/common.c
@@ -17,7 +17,7 @@
 #include <vppinfra/vec.h>
 #include <vppinfra/format.h>
 #include <vppinfra/file.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <assert.h>
 
 #include <vnet/ip/ip.h>
diff --git a/src/plugins/dpdk/device/device.c b/src/plugins/dpdk/device/device.c
index cb42bed3de0..842c83813af 100644
--- a/src/plugins/dpdk/device/device.c
+++ b/src/plugins/dpdk/device/device.c
@@ -22,7 +22,7 @@
 #include <dpdk/device/dpdk.h>
 #include <dpdk/device/dpdk_priv.h>
 #include <vppinfra/error.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 #define foreach_dpdk_tx_func_error			\
   _(PKT_DROP, "Tx packet drops (dpdk tx failure)")
diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 8aba4ec25e7..83c2614e97e 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -18,7 +18,7 @@
 #include <vppinfra/format.h>
 #include <vppinfra/bitmap.h>
 #include <vppinfra/linux/sysfs.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vlib/log.h>
 
 #include <vnet/vnet.h>
diff --git a/src/plugins/linux-cp/lcp_nl.c b/src/plugins/linux-cp/lcp_nl.c
index 916877939f0..55d2ea54245 100644
--- a/src/plugins/linux-cp/lcp_nl.c
+++ b/src/plugins/linux-cp/lcp_nl.c
@@ -29,7 +29,7 @@
 #include <netlink/route/addr.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vppinfra/error.h>
 #include <vppinfra/linux/netns.h>
 
diff --git a/src/plugins/memif/memif.c b/src/plugins/memif/memif.c
index 7e3dd44db2c..c28c52f13ff 100644
--- a/src/plugins/memif/memif.c
+++ b/src/plugins/memif/memif.c
@@ -31,7 +31,7 @@
 #include <limits.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vnet/plugin/plugin.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/interface/rx_queue_funcs.h>
diff --git a/src/plugins/memif/socket.c b/src/plugins/memif/socket.c
index 001f26f13ef..c2b11fc2ecb 100644
--- a/src/plugins/memif/socket.c
+++ b/src/plugins/memif/socket.c
@@ -30,7 +30,7 @@
 #include <limits.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vnet/plugin/plugin.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vpp/app/version.h>
diff --git a/src/plugins/rdma/device.c b/src/plugins/rdma/device.c
index 8aeb586a42d..a4dbdb02831 100644
--- a/src/plugins/rdma/device.c
+++ b/src/plugins/rdma/device.c
@@ -23,7 +23,7 @@
 
 #include <vppinfra/linux/sysfs.h>
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vlib/pci/pci.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/interface/rx_queue_funcs.h>
diff --git a/src/plugins/vhost/vhost_user.c b/src/plugins/vhost/vhost_user.c
index 4c48c2320cc..35aca37926c 100644
--- a/src/plugins/vhost/vhost_user.c
+++ b/src/plugins/vhost/vhost_user.c
@@ -31,7 +31,7 @@
 #include <linux/if_tun.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/devices/devices.h>
diff --git a/src/plugins/vhost/vhost_user_input.c b/src/plugins/vhost/vhost_user_input.c
index ca5072485ff..5dc1eedf52a 100644
--- a/src/plugins/vhost/vhost_user_input.c
+++ b/src/plugins/vhost/vhost_user_input.c
@@ -31,7 +31,7 @@
 #include <linux/if_tun.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/devices/devices.h>
diff --git a/src/plugins/vhost/vhost_user_output.c b/src/plugins/vhost/vhost_user_output.c
index 58fd4309f8c..2ae5c56d4c6 100644
--- a/src/plugins/vhost/vhost_user_output.c
+++ b/src/plugins/vhost/vhost_user_output.c
@@ -32,7 +32,7 @@
 #include <linux/if_tun.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/devices/devices.h>
diff --git a/src/vlib/CMakeLists.txt b/src/vlib/CMakeLists.txt
index edada1bc798..3448f08cd58 100644
--- a/src/vlib/CMakeLists.txt
+++ b/src/vlib/CMakeLists.txt
@@ -92,6 +92,7 @@ add_vpp_library(vlib
   counter.c
   drop.c
   error.c
+  file.c
   format.c
   handoff_trace.c
   init.c
@@ -143,6 +144,7 @@ add_vpp_library(vlib
   dma/dma.h
   error_funcs.h
   error.h
+  file.h
   format_funcs.h
   global_funcs.h
   init.h
diff --git a/src/vlib/cli.c b/src/vlib/cli.c
index 47fba14365d..38a8c2aa19c 100644
--- a/src/vlib/cli.c
+++ b/src/vlib/cli.c
@@ -39,6 +39,7 @@
 
 #include <vlib/vlib.h>
 #include <vlib/stats/stats.h>
+#include <vlib/file.h>
 #include <vlib/unix/unix.h>
 #include <vppinfra/callback.h>
 #include <vppinfra/cpu.h>
diff --git a/src/vlib/file.c b/src/vlib/file.c
new file mode 100644
index 00000000000..b9688e9439f
--- /dev/null
+++ b/src/vlib/file.c
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2025 Cisco Systems, Inc.
+ */
+
+#include <vlib/vlib.h>
+#include <vlib/unix/unix.h>
+
+#include <sys/epoll.h>
+#include <sys/eventfd.h>
+#include <limits.h>
+
+clib_file_main_t file_main;
diff --git a/src/vlib/file.h b/src/vlib/file.h
new file mode 100644
index 00000000000..c10c1edc990
--- /dev/null
+++ b/src/vlib/file.h
@@ -0,0 +1,12 @@
+/* SPDX-License-Identifier: Apache-2.0
+ * Copyright (c) 2025 Cisco Systems, Inc.
+ */
+
+#ifndef __vlib_file_h__
+#define __vlib_file_h__
+
+#include <vppinfra/file.h>
+
+extern clib_file_main_t file_main;
+
+#endif /* __vlib_file_h__ */
diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c
index 29ca3d97523..5d33e533197 100644
--- a/src/vlib/linux/pci.c
+++ b/src/vlib/linux/pci.c
@@ -42,6 +42,7 @@
 #include <vppinfra/unix.h>
 
 #include <vlib/vlib.h>
+#include <vlib/file.h>
 #include <vlib/pci/pci.h>
 #include <vlib/unix/unix.h>
 #include <vlib/linux/vfio.h>
diff --git a/src/vlib/main.c b/src/vlib/main.c
index ee8126b1000..f083bd2693e 100644
--- a/src/vlib/main.c
+++ b/src/vlib/main.c
@@ -41,6 +41,7 @@
 #include <vppinfra/format.h>
 #include <vlib/vlib.h>
 #include <vlib/threads.h>
+#include <vlib/file.h>
 #include <vlib/stats/stats.h>
 #include <vppinfra/tw_timer_1t_3w_1024sl_ov.h>
 
diff --git a/src/vlib/stats/init.c b/src/vlib/stats/init.c
index 8b382daf333..212ce5791c2 100644
--- a/src/vlib/stats/init.c
+++ b/src/vlib/stats/init.c
@@ -3,6 +3,7 @@
  */
 
 #include <vlib/vlib.h>
+#include <vlib/file.h>
 #include <vlib/unix/unix.h>
 #include <vlib/stats/stats.h>
 
diff --git a/src/vlib/unix/cli.c b/src/vlib/unix/cli.c
index debe53f8786..59ad8381bed 100644
--- a/src/vlib/unix/cli.c
+++ b/src/vlib/unix/cli.c
@@ -46,6 +46,7 @@
 /*? %%syscfg:group_label Command line session %% ?*/
 
 #include <vlib/vlib.h>
+#include <vlib/file.h>
 #include <vlib/unix/unix.h>
 
 #include <ctype.h>
diff --git a/src/vlib/unix/input.c b/src/vlib/unix/input.c
index a6e88f028d4..33c778e4124 100644
--- a/src/vlib/unix/input.c
+++ b/src/vlib/unix/input.c
@@ -38,6 +38,7 @@
  */
 
 #include <vlib/vlib.h>
+#include <vlib/file.h>
 #include <vlib/unix/unix.h>
 #include <signal.h>
 #include <unistd.h>
diff --git a/src/vlib/unix/main.c b/src/vlib/unix/main.c
index 49aa5d3a8ab..37ca5b1fdb5 100644
--- a/src/vlib/unix/main.c
+++ b/src/vlib/unix/main.c
@@ -68,7 +68,6 @@ char *vlib_default_runtime_dir __attribute__ ((weak));
 char *vlib_default_runtime_dir = "vlib";
 
 unix_main_t unix_main;
-clib_file_main_t file_main;
 
 static clib_error_t *
 unix_main_init (vlib_main_t * vm)
diff --git a/src/vlib/unix/unix.h b/src/vlib/unix/unix.h
index 4b5f98a2e66..d0b7a4c7005 100644
--- a/src/vlib/unix/unix.h
+++ b/src/vlib/unix/unix.h
@@ -121,7 +121,6 @@ typedef enum
 
 /* Global main structure. */
 extern unix_main_t unix_main;
-extern clib_file_main_t file_main;
 
 always_inline void
 unix_save_error (unix_main_t * um, clib_error_t * error)
diff --git a/src/vlibapi/api.h b/src/vlibapi/api.h
index 74957a6f0f6..2729b88dd26 100644
--- a/src/vlibapi/api.h
+++ b/src/vlibapi/api.h
@@ -25,6 +25,7 @@
 #include <svm/svm.h>
 #include <svm/queue.h>
 #include <vlib/vlib.h>
+#include <vlib/file.h>
 #include <vlib/unix/unix.h>
 #include <vlibapi/api_common.h>
 
diff --git a/src/vnet/dev/bus/pci.c b/src/vnet/dev/bus/pci.c
index 4bb8660f4b4..a5713349b6f 100644
--- a/src/vnet/dev/bus/pci.c
+++ b/src/vnet/dev/bus/pci.c
@@ -6,7 +6,7 @@
 #include <vnet/dev/dev.h>
 #include <vnet/dev/bus/pci.h>
 #include <vnet/dev/log.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 VLIB_REGISTER_LOG_CLASS (dev_log, static) = {
   .class_name = "dev",
diff --git a/src/vnet/devices/virtio/virtio.c b/src/vnet/devices/virtio/virtio.c
index 682ec32ceff..3ac209aa571 100644
--- a/src/vnet/devices/virtio/virtio.c
+++ b/src/vnet/devices/virtio/virtio.c
@@ -29,7 +29,7 @@
 
 #include <vlib/vlib.h>
 #include <vlib/pci/pci.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 #include <vnet/ethernet/ethernet.h>
 #include <vnet/ip/ip4_packet.h>
 #include <vnet/ip/ip6_packet.h>
diff --git a/src/vnet/interface/rx_queue.c b/src/vnet/interface/rx_queue.c
index b1fc82f38e9..00201302a07 100644
--- a/src/vnet/interface/rx_queue.c
+++ b/src/vnet/interface/rx_queue.c
@@ -16,7 +16,7 @@
 #include <vnet/vnet.h>
 #include <vnet/devices/devices.h>
 #include <vnet/interface/rx_queue_funcs.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 VLIB_REGISTER_LOG_CLASS (if_rxq_log, static) = {
   .class_name = "interface",
diff --git a/src/vnet/ip/punt.c b/src/vnet/ip/punt.c
index 3c46549634a..220a71ad5df 100644
--- a/src/vnet/ip/punt.c
+++ b/src/vnet/ip/punt.c
@@ -27,13 +27,12 @@
 #include <vnet/udp/udp.h>
 #include <vnet/tcp/tcp.h>
 #include <vnet/ip/punt.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
-#include <stdlib.h>
 
 punt_main_t punt_main;
 
diff --git a/src/vnet/unix/tuntap.c b/src/vnet/unix/tuntap.c
index f1102dc321e..eca846d3a1a 100644
--- a/src/vnet/unix/tuntap.c
+++ b/src/vnet/unix/tuntap.c
@@ -42,7 +42,7 @@
 #include <linux/if_tun.h>
 
 #include <vlib/vlib.h>
-#include <vlib/unix/unix.h>
+#include <vlib/file.h>
 
 #include <vnet/ip/ip.h>
 #include <vnet/fib/fib_table.h>