aboutsummaryrefslogtreecommitdiff
path: root/src/os/unix
diff options
context:
space:
mode:
Diffstat (limited to 'src/os/unix')
-rw-r--r--src/os/unix/ngx_freebsd.h8
-rw-r--r--src/os/unix/ngx_freebsd_init.c56
-rw-r--r--src/os/unix/ngx_linux_init.c71
3 files changed, 83 insertions, 52 deletions
diff --git a/src/os/unix/ngx_freebsd.h b/src/os/unix/ngx_freebsd.h
index 4e865a3c0..f202f8f87 100644
--- a/src/os/unix/ngx_freebsd.h
+++ b/src/os/unix/ngx_freebsd.h
@@ -11,10 +11,10 @@
ngx_chain_t *ngx_freebsd_sendfile_chain(ngx_connection_t *c, ngx_chain_t *in,
off_t limit);
-extern int ngx_freebsd_kern_osreldate;
-extern int ngx_freebsd_hw_ncpu;
-extern int ngx_freebsd_net_inet_tcp_sendspace;
-extern int ngx_freebsd_kern_ipc_zero_copy_send;
+extern int ngx_freebsd_kern_osreldate;
+extern int ngx_freebsd_hw_ncpu;
+extern u_long ngx_freebsd_net_inet_tcp_sendspace;
+extern int ngx_freebsd_kern_ipc_zero_copy_send;
extern ngx_uint_t ngx_freebsd_sendfile_nbytes_bug;
extern ngx_uint_t ngx_freebsd_use_tcp_nopush;
diff --git a/src/os/unix/ngx_freebsd_init.c b/src/os/unix/ngx_freebsd_init.c
index f82a6ac20..cb4482947 100644
--- a/src/os/unix/ngx_freebsd_init.c
+++ b/src/os/unix/ngx_freebsd_init.c
@@ -9,18 +9,18 @@
/* FreeBSD 3.0 at least */
-char ngx_freebsd_kern_ostype[16];
-char ngx_freebsd_kern_osrelease[128];
-int ngx_freebsd_kern_osreldate;
-int ngx_freebsd_hw_ncpu;
-int ngx_freebsd_net_inet_tcp_sendspace;
-int ngx_freebsd_kern_ipc_somaxconn;
+char ngx_freebsd_kern_ostype[16];
+char ngx_freebsd_kern_osrelease[128];
+int ngx_freebsd_kern_osreldate;
+int ngx_freebsd_hw_ncpu;
+int ngx_freebsd_kern_ipc_somaxconn;
+u_long ngx_freebsd_net_inet_tcp_sendspace;
/* FreeBSD 4.9 */
-int ngx_freebsd_machdep_hlt_logical_cpus;
+int ngx_freebsd_machdep_hlt_logical_cpus;
/* FreeBSD 5.0 */
-int ngx_freebsd_kern_ipc_zero_copy_send;
+int ngx_freebsd_kern_ipc_zero_copy_send;
ngx_uint_t ngx_freebsd_sendfile_nbytes_bug;
@@ -43,7 +43,7 @@ static ngx_os_io_t ngx_freebsd_io = {
typedef struct {
char *name;
- int *value;
+ void *value;
size_t size;
ngx_uint_t exists;
} sysctl_t;
@@ -52,23 +52,23 @@ typedef struct {
sysctl_t sysctls[] = {
{ "hw.ncpu",
&ngx_freebsd_hw_ncpu,
- sizeof(int), 0 },
+ sizeof(ngx_freebsd_hw_ncpu), 0 },
{ "machdep.hlt_logical_cpus",
&ngx_freebsd_machdep_hlt_logical_cpus,
- sizeof(int), 0 },
+ sizeof(ngx_freebsd_machdep_hlt_logical_cpus), 0 },
{ "net.inet.tcp.sendspace",
&ngx_freebsd_net_inet_tcp_sendspace,
- sizeof(int), 0 },
+ sizeof(ngx_freebsd_net_inet_tcp_sendspace), 0 },
{ "kern.ipc.somaxconn",
&ngx_freebsd_kern_ipc_somaxconn,
- sizeof(int), 0 },
+ sizeof(ngx_freebsd_kern_ipc_somaxconn), 0 },
{ "kern.ipc.zero_copy.send",
&ngx_freebsd_kern_ipc_zero_copy_send,
- sizeof(int), 0 },
+ sizeof(ngx_freebsd_kern_ipc_zero_copy_send), 0 },
{ NULL, NULL, 0, 0 }
};
@@ -177,11 +177,10 @@ ngx_os_specific_init(ngx_log_t *log)
for (i = 0; sysctls[i].name; i++) {
- *sysctls[i].value = 0;
size = sysctls[i].size;
if (sysctlbyname(sysctls[i].name, sysctls[i].value, &size, NULL, 0)
- == 0)
+ == 0)
{
sysctls[i].exists = 1;
continue;
@@ -193,12 +192,6 @@ ngx_os_specific_init(ngx_log_t *log)
continue;
}
-#if 0
- if (sysctls[i].value == &ngx_freebsd_machdep_hlt_logical_cpus) {
- continue;
- }
-#endif
-
ngx_log_error(NGX_LOG_ALERT, log, err,
"sysctlbyname(%s) failed", sysctls[i].name);
return NGX_ERROR;
@@ -206,15 +199,12 @@ ngx_os_specific_init(ngx_log_t *log)
if (ngx_freebsd_machdep_hlt_logical_cpus) {
ngx_ncpu = ngx_freebsd_hw_ncpu / 2;
+
} else {
ngx_ncpu = ngx_freebsd_hw_ncpu;
}
- if (version < 600008) {
- somaxconn = 32767;
- } else {
- somaxconn = 65535;
- }
+ somaxconn = version < 600008 ? 32676 : 65535;
if (ngx_freebsd_kern_ipc_somaxconn > somaxconn) {
ngx_log_error(NGX_LOG_ALERT, log, 0,
@@ -234,6 +224,7 @@ ngx_os_specific_init(ngx_log_t *log)
void
ngx_os_specific_status(ngx_log_t *log)
{
+ u_long value;
ngx_uint_t i;
ngx_log_error(NGX_LOG_NOTICE, log, 0, "OS: %s %s",
@@ -251,8 +242,15 @@ ngx_os_specific_status(ngx_log_t *log)
for (i = 0; sysctls[i].name; i++) {
if (sysctls[i].exists) {
- ngx_log_error(NGX_LOG_NOTICE, log, 0, "%s: %d",
- sysctls[i].name, *sysctls[i].value);
+ if (sysctls[i].size == sizeof(long)) {
+ value = *(long *) sysctls[i].value;
+
+ } else {
+ value = *(int *) sysctls[i].value;
+ }
+
+ ngx_log_error(NGX_LOG_NOTICE, log, 0, "%s: %l",
+ sysctls[i].name, value);
}
}
}
diff --git a/src/os/unix/ngx_linux_init.c b/src/os/unix/ngx_linux_init.c
index 8d2f7915e..195d64d81 100644
--- a/src/os/unix/ngx_linux_init.c
+++ b/src/os/unix/ngx_linux_init.c
@@ -8,10 +8,14 @@
#include <ngx_core.h>
-char ngx_linux_kern_ostype[50];
-char ngx_linux_kern_osrelease[20];
+static ngx_int_t ngx_linux_procfs(char *name, char *buf, size_t len,
+ ngx_log_t *log);
-int ngx_linux_rtsig_max;
+
+char ngx_linux_kern_ostype[50];
+char ngx_linux_kern_osrelease[20];
+
+int ngx_linux_rtsig_max;
static ngx_os_io_t ngx_linux_io = {
@@ -35,35 +39,31 @@ ngx_os_specific_init(ngx_log_t *log)
size_t len;
ngx_err_t err;
- name[0] = CTL_KERN;
- name[1] = KERN_OSTYPE;
- len = sizeof(ngx_linux_kern_ostype);
-
- if (sysctl(name, 2, ngx_linux_kern_ostype, &len, NULL, 0) == -1) {
- ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
- "sysctl(KERN_OSTYPE) failed");
+ if (ngx_linux_procfs("/proc/sys/kernel/ostype",
+ ngx_linux_kern_ostype,
+ sizeof(ngx_linux_kern_ostype), log)
+ == -1)
+ {
return NGX_ERROR;
}
- /* name[0] = CTL_KERN; */
- name[1] = KERN_OSRELEASE;
- len = sizeof(ngx_linux_kern_osrelease);
-
- if (sysctl(name, 2, ngx_linux_kern_osrelease, &len, NULL, 0) == -1) {
- ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
- "sysctl(KERN_OSRELEASE) failed");
+ if (ngx_linux_procfs("/proc/sys/kernel/osrelease",
+ ngx_linux_kern_osrelease,
+ sizeof(ngx_linux_kern_osrelease), log)
+ == -1)
+ {
return NGX_ERROR;
}
- /* name[0] = CTL_KERN; */
+ name[0] = CTL_KERN;
name[1] = KERN_RTSIGMAX;
len = sizeof(ngx_linux_rtsig_max);
if (sysctl(name, 2, &ngx_linux_rtsig_max, &len, NULL, 0) == -1) {
err = ngx_errno;
- if (err != NGX_ENOTDIR) {
+ if (err != NGX_ENOTDIR && err != NGX_ENOSYS) {
ngx_log_error(NGX_LOG_ALERT, log, err,
"sysctl(KERN_RTSIGMAX) failed");
@@ -89,3 +89,36 @@ ngx_os_specific_status(ngx_log_t *log)
ngx_log_error(NGX_LOG_NOTICE, log, 0, "sysctl(KERN_RTSIGMAX): %d",
ngx_linux_rtsig_max);
}
+
+
+static ngx_int_t
+ngx_linux_procfs(char *name, char *buf, size_t len, ngx_log_t *log)
+{
+ int n;
+ ngx_fd_t fd;
+
+ fd = open(name, O_RDONLY);
+
+ if (fd == NGX_INVALID_FILE) {
+ ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+ "open(\"%s\") failed", name);
+
+ return NGX_ERROR;
+ }
+
+ n = read(fd, buf, len);
+
+ if (n == -1) {
+ ngx_log_error(NGX_LOG_ALERT, log, ngx_errno,
+ "read(\"%s\") failed", name);
+
+ } else {
+ if (buf[n - 1] == '\n') {
+ buf[--n] = '\0';
+ }
+ }
+
+ ngx_close_file(fd);
+
+ return n;
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-02 23:06:40 +0000