aboutsummaryrefslogtreecommitdiffstats
path: root/com32/hdt
diff options
context:
space:
mode:
authorErwan Velu <erwanaliasr1@gmail.com>2011-03-21 22:00:42 +0100
committerErwan Velu <erwanaliasr1@gmail.com>2011-03-21 22:00:42 +0100
commitb8daff103969a20de3665c15a3e7ae4a29e22027 (patch)
tree37efc4b4ba526a500d17daba8a2e12ae7880ec1e /com32/hdt
parentbe7b049a47a55287594e09fd06355bdd46699606 (diff)
downloadsyslinux-b8daff103969a20de3665c15a3e7ae4a29e22027.tar.gz
syslinux-b8daff103969a20de3665c15a3e7ae4a29e22027.tar.xz
syslinux-b8daff103969a20de3665c15a3e7ae4a29e22027.zip
hdt: Spliting cpu dump into separate file
Spliting each dump into a different file will make things easier to read.
Diffstat (limited to 'com32/hdt')
-rw-r--r--com32/hdt/hdt-dump-cpu.c52
-rw-r--r--com32/hdt/hdt-dump.c40
-rw-r--r--com32/hdt/hdt-dump.h50
3 files changed, 106 insertions, 36 deletions
diff --git a/com32/hdt/hdt-dump-cpu.c b/com32/hdt/hdt-dump-cpu.c
new file mode 100644
index 00000000..c0bb952e
--- /dev/null
+++ b/com32/hdt/hdt-dump-cpu.c
@@ -0,0 +1,52 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 2011 Erwan Velu - All Rights Reserved
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall
+ * be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * -----------------------------------------------------------------------
+ */
+
+#include "hdt-common.h"
+#include "hdt-dump.h"
+
+void dump_cpu(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item) {
+
+ *item = zzjson_create_object(config, NULL); /* empty object */
+ add_hs(cpu.vendor);
+ add_hs(cpu.model);
+ add_hi(cpu.vendor_id);
+ add_hi(cpu.family);
+ add_hi(cpu.model_id);
+ add_hi(cpu.stepping);
+ add_hi(cpu.num_cores);
+ add_hi(cpu.l1_data_cache_size);
+ add_hi(cpu.l1_instruction_cache_size);
+ add_hi(cpu.l2_cache_size);
+ size_t i;
+ for (i = 0; i < cpu_flags_count; i++) {
+ char temp[128]={0};
+ snprintf(temp,sizeof(temp),"cpu.flags.%s",cpu_flags_names[i]);
+ add_b(temp,get_cpu_flag_value_from_name(&hardware->cpu,cpu_flags_names[i]));
+ }
+ print_and_flush(config,item);
+}
diff --git a/com32/hdt/hdt-dump.c b/com32/hdt/hdt-dump.c
index dfdc0e24..027a82e1 100644
--- a/com32/hdt/hdt-dump.c
+++ b/com32/hdt/hdt-dump.c
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 20011 Erwan Velu - All Rights Reserved
+ * Copyright 2011 Erwan Velu - All Rights Reserved
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
@@ -30,21 +30,12 @@
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
-#include <bufprintf.h>
-#include <zzjson/zzjson.h>
#include "hdt-common.h"
+#include "hdt-dump.h"
-#define add_i(name,value) *item = zzjson_object_append(config, *item, name, zzjson_create_number_i(config, value))
-#define add_s(name,value) *item = zzjson_object_append(config, *item, name, zzjson_create_string(config, value))
-#define add_bool_true(name) *item = zzjson_object_append(config, *item, name, zzjson_create_true(config))
-#define add_bool_false(name) *item = zzjson_object_append(config, *item, name, zzjson_create_false(config))
-#define add_hi(value) add_i(#value,hardware->value)
-#define add_hs(value) add_s(#value,hardware->value)
-#define add_b(name,value) if (value==true) {add_bool_true((char *)name);} else {add_bool_false((char *)name);}
+struct print_buf p_buf;
-static struct print_buf p_buf;
-
-static void compute_filename(struct s_hardware *hardware, char *filename, int size) {
+void compute_filename(struct s_hardware *hardware, char *filename, int size) {
snprintf(filename,size,"%s/","hdt");
@@ -73,28 +64,6 @@ void print_and_flush(ZZJSON_CONFIG *config, ZZJSON **item) {
zzjson_free(config, *item);
}
-void dump_cpu(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item) {
-
- *item = zzjson_create_object(config, NULL); /* empty object */
- add_hs(cpu.vendor);
- add_hs(cpu.model);
- add_hi(cpu.vendor_id);
- add_hi(cpu.family);
- add_hi(cpu.model_id);
- add_hi(cpu.stepping);
- add_hi(cpu.num_cores);
- add_hi(cpu.l1_data_cache_size);
- add_hi(cpu.l1_instruction_cache_size);
- add_hi(cpu.l2_cache_size);
- size_t i;
- for (i = 0; i < cpu_flags_count; i++) {
- char temp[128]={0};
- snprintf(temp,sizeof(temp),"cpu.flags.%s",cpu_flags_names[i]);
- add_b(temp,get_cpu_flag_value_from_name(&hardware->cpu,cpu_flags_names[i]));
- }
- print_and_flush(config,item);
-}
-
int dumpprintf(FILE *p, const char *format, ...) {
va_list ap;
int rv;
@@ -124,7 +93,6 @@ void dump(struct s_hardware *hardware)
detect_hardware(hardware);
dump_cpu(hardware, &config, &json);
-
/* By now, we only support TFTP reporting */
upload=&upload_tftp;
upload->name="tftp";
diff --git a/com32/hdt/hdt-dump.h b/com32/hdt/hdt-dump.h
new file mode 100644
index 00000000..1ec6aa2e
--- /dev/null
+++ b/com32/hdt/hdt-dump.h
@@ -0,0 +1,50 @@
+/* ----------------------------------------------------------------------- *
+ *
+ * Copyright 20011 Erwan Velu - All Rights Reserved
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall
+ * be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * -----------------------------------------------------------------------
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+#include <ctype.h>
+#include <bufprintf.h>
+#include <zzjson/zzjson.h>
+#include "hdt-common.h"
+
+#define add_i(name,value) *item = zzjson_object_append(config, *item, name, zzjson_create_number_i(config, value))
+#define add_s(name,value) *item = zzjson_object_append(config, *item, name, zzjson_create_string(config, value))
+#define add_bool_true(name) *item = zzjson_object_append(config, *item, name, zzjson_create_true(config))
+#define add_bool_false(name) *item = zzjson_object_append(config, *item, name, zzjson_create_false(config))
+#define add_hi(value) add_i(#value,hardware->value)
+#define add_hs(value) add_s(#value,hardware->value)
+#define add_b(name,value) if (value==true) {add_bool_true((char *)name);} else {add_bool_false((char *)name);}
+
+extern struct print_buf p_buf;
+
+void print_and_flush(ZZJSON_CONFIG *config, ZZJSON **item);
+int dumpprintf(FILE *p, const char *format, ...);
+
+void dump_cpu(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item);