Changeset 1920

Timestamp:

Apr 26, 2005, 4:22:50 AM (20 years ago)

Author:

bird

Message:

Having some fun.

Location:

trunk/src/emx/src/lib/misc

Files:

• sysctl.c (modified) (3 diffs, 1 prop)
• sysctl_mib.c (modified) (2 diffs, 1 prop)
• sysctl_os2.c (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/misc/sysctl.c

@@ -41 +41 @@
 
 #include <sys/param.h>
-#define _KERNEL
-#include <sys/sysctl.h>
 #include <386/builtin.h>
 #include <sys/fmutex.h>
@@ -49 +47 @@
 #include <string.h>
 #include <stdio.h>
+#define _KERNEL
+#include <sys/sysctl.h>
 
 #define __LIBC_LOG_GROUP __LIBC_LOG_GRP_MISC
@@ -74 +74 @@
 static int sysctl_root(SYSCTL_HANDLER_ARGS);
 
-struct sysctl_oid_list sysctl__children; /* root list */
+struct sysctl_oid_list sysctl__children = {0}; /* root list */
 
 static struct sysctl_oid *

trunk/src/emx/src/lib/misc/sysctl_mib.c

@@ -134 +134 @@
 #endif
 
+#if 0 /* in sysctl_os2.c */
 //char kernelname[MAXPATHLEN] = "/kernel";      /* XXX bloat */
 //
@@ -139 +140 @@
 //    kernelname, sizeof kernelname, "Name of kernel file booted");
 
-#ifdef SMP
-SYSCTL_INT(_hw, HW_NCPU, ncpu, CTLFLAG_RD,
-    &mp_ncpus, 0, "Number of active CPUs");
-#else
-SYSCTL_INT(_hw, HW_NCPU, ncpu, CTLFLAG_RD,
-    0, 1, "Number of active CPUs");
+//#ifdef SMP
+//SYSCTL_INT(_hw, HW_NCPU, ncpu, CTLFLAG_RD,
+//    &mp_ncpus, 0, "Number of active CPUs");
+//#else
+//SYSCTL_INT(_hw, HW_NCPU, ncpu, CTLFLAG_RD,
+//    0, 1, "Number of active CPUs");
+//#endif
 #endif
 

trunk/src/emx/src/lib/misc/sysctl_os2.c

@@ -25 +25 @@
  */
 
+/*******************************************************************************
+*   Header Files                                                               *
+*******************************************************************************/
 #include "libc-alias.h"
 
 #define INCL_BASE
 #define INCL_ERRORS
-#include <os2.h>
+#define INCL_FSMACROS
+#include <os2emx.h>
 
 #include <unistd.h>
@@ -53 +57 @@
         } u;
         ULONG ul;
+        FS_VAR_SAVE_LOAD();
 
         /* Try the highres timer first. */
@@ -75 +80 @@
             tv.tv_sec -= ul / 1000;
         }
+        FS_RESTORE();
         if (tv.tv_usec < 0)
         {
@@ -103 +109 @@
         0, 0, sysctl_kern_bootfile, "A", "Kernel file");
 
+
+/*
+ * HW
+ */
+
+SYSCTL_STRING(_hw, HW_MACHINE, machine, CTLFLAG_RD,
+        "i386", sizeof("i386"), "Machine");
+
+/**
+ * HW_MODEL
+ */
+static int sysctl_hw_model(SYSCTL_HANDLER_ARGS)
+{
+    static union
+    {
+        char        szModel[17];
+        uint32_t    uRegs[4];
+    } u;
+    if (!u.szModel[0])
+    {
+        int i;
+        asm ("cpuid\n"
+             : "=a" (i),
+               "=b" (u.uRegs[0]),
+               "=c" (u.uRegs[2]),
+               "=d" (u.uRegs[1])
+             : "a" (0)
+             );
+    }
+
+    return (sysctl_handle_string(oidp, u.szModel, sizeof(u.szModel), req));
+}
+
+SYSCTL_PROC(_hw, HW_MODEL, hw_model, CTLFLAG_RD,
+        0, 0, sysctl_hw_model, "A", "Process model");
+
+/**
+ * Number of CPUs.
+ */
+static int sysctl_hw_ncpus(SYSCTL_HANDLER_ARGS)
+{
+    static u_int cCpus;
+    if (!cCpus)
+    {
+        ULONG ul;
+        FS_VAR_SAVE_LOAD();
+        if (DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &ul, sizeof(ul)))
+            ul = 1;
+        cCpus = ul;
+        FS_RESTORE();
+    }
+
+    return (sysctl_handle_int(oidp, &cCpus, 0, req));
+}
+
+SYSCTL_PROC(_hw, HW_NCPU, ncpus, CTLFLAG_RD,
+        0, 0, sysctl_hw_ncpus, "UI", "number of cpus");
+
+
+SYSCTL_STRING(_hw, HW_MACHINE_ARCH, machine_arch, CTLFLAG_RD,
+        "i386", sizeof("i386"), "Machine arch");
+