[syslinux:master] hdt: Spliting cpu dump into separate file
syslinux-bot for Erwan Velu
erwanaliasr1 at gmail.com
Mon Apr 25 15:28:03 PDT 2011
Commit-ID: b8daff103969a20de3665c15a3e7ae4a29e22027
Gitweb: http://syslinux.zytor.com/commit/b8daff103969a20de3665c15a3e7ae4a29e22027
Author: Erwan Velu <erwanaliasr1 at gmail.com>
AuthorDate: Mon, 21 Mar 2011 22:00:42 +0100
Committer: Erwan Velu <erwanaliasr1 at gmail.com>
CommitDate: Mon, 21 Mar 2011 22:00:42 +0100
hdt: Spliting cpu dump into separate file
Spliting each dump into a different file will make things easier to
read.
---
com32/hdt/{hdt-ata.c => hdt-dump-cpu.c} | 34 ++++++++++++++------
com32/hdt/hdt-dump.c | 40 ++---------------------
com32/hdt/{hdt-cli-syslinux.c => hdt-dump.h} | 44 +++++++++----------------
3 files changed, 44 insertions(+), 74 deletions(-)
diff --git a/com32/hdt/hdt-ata.c b/com32/hdt/hdt-dump-cpu.c
similarity index 63%
copy from com32/hdt/hdt-ata.c
copy to com32/hdt/hdt-dump-cpu.c
index 9ba17ba..c0bb952 100644
--- a/com32/hdt/hdt-ata.c
+++ b/com32/hdt/hdt-dump-cpu.c
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 2009 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
@@ -26,13 +26,27 @@
* -----------------------------------------------------------------------
*/
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <console.h>
-#include <disk/geom.h>
-#include <disk/util.h>
-
-#include "com32io.h"
#include "hdt-common.h"
-#include "hdt-ata.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 dfdc0e2..027a82e 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-cli-syslinux.c b/com32/hdt/hdt-dump.h
similarity index 57%
copy from com32/hdt/hdt-cli-syslinux.c
copy to com32/hdt/hdt-dump.h
index 302ca24..1ec6aa2 100644
--- a/com32/hdt/hdt-cli-syslinux.c
+++ b/com32/hdt/hdt-dump.h
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 2009 Erwan Velu - All Rights Reserved
+ * 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
@@ -29,34 +29,22 @@
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#include <errno.h>
-#include <syslinux/pxe.h>
-#include <syslinux/config.h>
-
-#include "hdt-cli.h"
+#include <ctype.h>
+#include <bufprintf.h>
+#include <zzjson/zzjson.h>
#include "hdt-common.h"
-void main_show_syslinux(int argc __unused, char **argv __unused,
- struct s_hardware *hardware)
-{
- reset_more_printf();
- more_printf("SYSLINUX\n");
- more_printf(" Bootloader : %s\n", hardware->syslinux_fs);
- more_printf(" Version : %s\n", hardware->sv->version_string);
- more_printf(" Version : %u\n", hardware->sv->version);
- more_printf(" Max API : %u\n", hardware->sv->max_api);
- more_printf(" Copyright : %s\n", hardware->sv->copyright_string);
-}
+#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;
-struct cli_module_descr syslinux_show_modules = {
- .modules = NULL,
- .default_callback = main_show_syslinux,
-};
+void print_and_flush(ZZJSON_CONFIG *config, ZZJSON **item);
+int dumpprintf(FILE *p, const char *format, ...);
-struct cli_mode_descr syslinux_mode = {
- .mode = SYSLINUX_MODE,
- .name = CLI_SYSLINUX,
- .default_modules = NULL,
- .show_modules = &syslinux_show_modules,
- .set_modules = NULL,
-};
+void dump_cpu(struct s_hardware *hardware, ZZJSON_CONFIG *config, ZZJSON **item);
More information about the Syslinux-commits
mailing list