Commit 4dfd532fcd672fde1e91d967d9348ed358dc0036
2025-01-03T01:11:36
wip fix sysctl
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179
diff --git a/.ikc3_history b/.ikc3_history
index 4e0874a..465529a 100644
--- a/.ikc3_history
+++ b/.ikc3_history
@@ -1,6 +1,3 @@
-(F64) 0.0000002 + (F64) 0.0000002
-(F64) 0.0000001 + (F64) 0.0000001
-(F64) 0.000001 + (F64) 0.000003
(F64) 0.3 + (F64) 0.3
type(0.1)
0.1 + 0.1
@@ -97,4 +94,6 @@ s = Serialize.tag_to_str(12)
Deserialize.str_to_tag(s)
s = Serialize.tag_to_str(12)
Deserialize.str_to_tag(s)
-
+sysctl([:hw, :ncpu])
+sysctl([:hw])
+sysctl([:hw, :ncpu, :a])
diff --git a/libkc3/kc3.c b/libkc3/kc3.c
index 8594901..211e3e8 100644
--- a/libkc3/kc3.c
+++ b/libkc3/kc3.c
@@ -18,6 +18,10 @@
#include <stdlib.h>
#include <string.h>
+#ifdef __OpenBSD__
+# include <sys/sysctl.h>
+#endif
+
#ifndef WIN32
# include <sys/wait.h>
#endif
@@ -756,32 +760,126 @@ s_tag * kc3_struct_put (s_tag *s, const s_sym * const *key,
s_tag * kc3_sysctl (s_tag *dest, const s_list * const *list)
{
+ s32 e;
+ const s_list *l;
s32 mib[64];
s32 mib_len = 0;
- s32 i;
- const s_list *l;
+ s_tag tmp = {0};
+ size_t tmp_data_size;
l = *list;
- while (l) {
- if (l->tag.type != TAG_SYM) {
- err_puts("kc3_sysctl: argument is not a Sym list");
- assert(! "kc3_sysctl: argument is not a Sym list");
- }
- if (l->tag.data.sym == sym_1("hw"))
- mib[mib_len] = CTL_HW;
- else if (l->tag.data.sym == sym_1("kern"))
- mib[mib_len] = CTL_KERN;
- else {
- err_write_1("kc3_sysctl: invalid argument: ");
- err_inspect_sym(l->tag.data.sym);
- err_write_1("\n");
- assert("kc3_sysctl: invalid argument")
- return NULL;
+ if (! l ||
+ l->tag.type != TAG_SYM) {
+ err_puts("kc3_sysctl: argument is not a Sym list");
+ assert(! "kc3_sysctl: argument is not a Sym list");
+ }
+ if (l->tag.data.sym == sym_1("ddb")) {
+ mib[mib_len] = CTL_DDB;
+ mib_len++;
+ l = list_next(l);
+
+ }
+ else if (l->tag.data.sym == sym_1("debug")) {
+ mib[mib_len] = CTL_DEBUG;
+ mib_len++;
+ l = list_next(l);
+
+ }
+ else if (l->tag.data.sym == sym_1("fs")) {
+ mib[mib_len] = CTL_FS;
+ mib_len++;
+ l = list_next(l);
+
+ }
+ else if (l->tag.data.sym == sym_1("hw")) {
+ mib[mib_len] = CTL_HW;
+ mib_len++;
+ if ((l = list_next(l))) {
+ if (l->tag.data.sym == sym_1("ncpu")) {
+ mib[mib_len] = HW_NCPU;
+ mib_len++;
+ l = list_next(l);
+ if (! l)
+ tmp.type = TAG_S32;
+ }
+ else if (l->tag.data.sym == sym_1("ncpufound")) {
+ mib[mib_len] = HW_NCPUFOUND;
+ mib_len++;
+ l = list_next(l);
+ if (! l)
+ tmp.type = TAG_S32;
+ }
+ else if (l->tag.data.sym == sym_1("ncpuonline")) {
+ mib[mib_len] = HW_NCPUONLINE;
+ mib_len++;
+ l = list_next(l);
+ if (! l)
+ tmp.type = TAG_S32;
+ }
+ else if (l->tag.data.sym == sym_1("pagesize")) {
+ mib[mib_len] = HW_PAGESIZE;
+ mib_len++;
+ l = list_next(l);
+ if (! l)
+ tmp.type = TAG_S32;
+ }
+ else if (l->tag.data.sym == sym_1("physmem64")) {
+ mib[mib_len] = HW_PHYSMEM64;
+ mib_len++;
+ l = list_next(l);
+ if (! l)
+ tmp.type = TAG_S64;
+ }
}
+ }
+ else if (l->tag.data.sym == sym_1("kern")) {
+ mib[mib_len] = CTL_KERN;
+ mib_len++;
+ l = list_next(l);
+ }
+ else if (l->tag.data.sym == sym_1("machdep")) {
+ mib[mib_len] = CTL_MACHDEP;
+ mib_len++;
+ l = list_next(l);
+ }
+ else if (l->tag.data.sym == sym_1("net")) {
+ mib[mib_len] = CTL_NET;
+ mib_len++;
+ l = list_next(l);
+ }
+ else if (l->tag.data.sym == sym_1("vfs")) {
+ mib[mib_len] = CTL_VFS;
+ mib_len++;
+ l = list_next(l);
+ }
+ else if (l->tag.data.sym == sym_1("vm")) {
+ mib[mib_len] = CTL_VM;
mib_len++;
l = list_next(l);
}
- if (sysctl(mib, mib_len,
+ if (! tmp.type) {
+ err_write_1("kc3_sysctl: invalid argument: ");
+ if (l)
+ err_inspect_sym(&l->tag.data.sym);
+ else
+ err_inspect_list(*list);
+ err_write_1("\n");
+ assert("kc3_sysctl: invalid argument");
+ return NULL;
+ }
+ tmp_data_size = sizeof(tmp.data);
+ if (sysctl(mib, mib_len, &tmp.data, &tmp_data_size, NULL, 0) < 0) {
+ e = errno;
+ err_write_1("kc3_sysctl: sysctl: ");
+ err_write_1(strerror(e));
+ err_write_1("\n");
+ assert("kc3_sysctl: sysctl");
+ return NULL;
+ }
+ assert(tmp_data_size <= sizeof(tmp.data));
+ *dest = tmp;
+ return dest;
}
+
s_str * kc3_system (const s_list * const *list, s_str *dest)
{
#ifdef WIN32