get_copyright_info@Base 1.99.0
get_cur_groupname@Base 1.10.0
get_cur_username@Base 1.10.0
+ get_cpu_info@Base 2.3.0
get_datafile_dir@Base 1.12.0~rc1
get_datafile_path@Base 1.12.0~rc1
get_dirname@Base 1.12.0~rc1
#include "wsutil/tempfile.h"
#include "log.h"
#include "wsutil/file_util.h"
+#include "wsutil/cpu_info.h"
#include "wsutil/os_version_info.h"
#include "wsutil/str_util.h"
#include "wsutil/inet_addr.h"
if (ld->pdh) {
if (capture_opts->use_pcapng) {
char *appname;
+ GString *cpu_info_str;
GString *os_info_str;
+ cpu_info_str = g_string_new("");
os_info_str = g_string_new("");
+ get_cpu_info(cpu_info_str);
get_os_version_info(os_info_str);
appname = g_strdup_printf("Dumpcap (Wireshark) %s", get_ws_vcs_version_info());
successful = pcapng_write_session_header_block(ld->pdh,
- (const char *)capture_opts->capture_comment, /* Comment*/
- NULL, /* HW*/
- os_info_str->str, /* OS*/
+ (const char *)capture_opts->capture_comment, /* Comment */
+ cpu_info_str->str, /* HW */
+ os_info_str->str, /* OS */
appname,
-1, /* section_length */
&ld->bytes_written,
global_ld.bytes_written = 0;
if (capture_opts->use_pcapng) {
char *appname;
+ GString *cpu_info_str;
GString *os_info_str;
+ cpu_info_str = g_string_new("");
os_info_str = g_string_new("");
+ get_cpu_info(cpu_info_str);
get_os_version_info(os_info_str);
appname = g_strdup_printf("Dumpcap (Wireshark) %s", get_ws_vcs_version_info());
successful = pcapng_write_session_header_block(global_ld.pdh,
- NULL, /* Comment */
- NULL, /* HW */
+ (const char *)capture_opts->capture_comment, /* Comment */
+ cpu_info_str->str, /* HW */
os_info_str->str, /* OS */
appname,
- -1, /* section_length */
+ -1, /* section_length */
&(global_ld.bytes_written),
&global_ld.err);
g_free(appname);
#include "ws_version_info.h"
-#include <wsutil/ws_cpuid.h>
+#include <wsutil/cpu_info.h>
#include <wsutil/copyright_info.h>
#include <wsutil/os_version_info.h>
#include <wsutil/ws_printf.h> /* ws_debug_printf */
return str;
}
-/*
- * Get the CPU info, and append it to the GString
- */
-static void
-get_cpu_info(GString *str)
-{
- guint32 CPUInfo[4];
- char CPUBrandString[0x40];
- unsigned nExIds;
-
- /* http://msdn.microsoft.com/en-us/library/hskdteyh(v=vs.100).aspx */
-
- /* Calling __cpuid with 0x80000000 as the InfoType argument*/
- /* gets the number of valid extended IDs.*/
- if (!ws_cpuid(CPUInfo, 0x80000000))
- return;
- nExIds = CPUInfo[0];
-
- if( nExIds<0x80000005)
- return;
- memset(CPUBrandString, 0, sizeof(CPUBrandString));
-
- /* Interpret CPU brand string.*/
- ws_cpuid(CPUInfo, 0x80000002);
- memcpy(CPUBrandString, CPUInfo, sizeof(CPUInfo));
- ws_cpuid(CPUInfo, 0x80000003);
- memcpy(CPUBrandString + 16, CPUInfo, sizeof(CPUInfo));
- ws_cpuid(CPUInfo, 0x80000004);
- memcpy(CPUBrandString + 32, CPUInfo, sizeof(CPUInfo));
-
- g_string_append_printf(str, "\n%s", CPUBrandString);
-
- if (ws_cpuid_sse42())
- g_string_append(str, " (with SSE4.2)");
-}
-
static void
get_mem_info(GString *str _U_)
{
g_string_append_printf(str, ", with zlib %s", zlibVersion());
#endif
- g_string_append(str, ".");
+ g_string_append(str, ".\n");
/* CPU Info */
get_cpu_info(str);
md5.c
mpeg-audio.c
nstime.c
+ cpu_info.c
os_version_info.c
plugins.c
privileges.c
clopts_common.h \
cmdarg_err.h \
copyright_info.h \
+ cpu_info.h \
crash_info.h \
crc6.h \
crc7.h \
clopts_common.c \
cmdarg_err.c \
copyright_info.c \
+ cpu_info.c \
crash_info.c \
crc6.c \
crc7.c \
--- /dev/null
+/* cpu_info.c
+ * Routines to report CPU information
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+#include <string.h>
+#include <glib.h>
+
+#include <wsutil/ws_cpuid.h>
+#include <wsutil/cpu_info.h>
+
+/*
+ * Get the CPU info, and append it to the GString
+ */
+void
+get_cpu_info(GString *str)
+{
+ guint32 CPUInfo[4];
+ char CPUBrandString[0x40];
+ unsigned nExIds;
+
+ /* http://msdn.microsoft.com/en-us/library/hskdteyh(v=vs.100).aspx */
+
+ /* Calling __cpuid with 0x80000000 as the InfoType argument */
+ /* gets the number of valid extended IDs. */
+ if (!ws_cpuid(CPUInfo, 0x80000000))
+ return;
+
+ nExIds = CPUInfo[0];
+
+ if (nExIds<0x80000005)
+ return;
+
+ memset(CPUBrandString, 0, sizeof(CPUBrandString));
+
+ /* Interpret CPU brand string */
+ ws_cpuid(CPUInfo, 0x80000002);
+ memcpy(CPUBrandString, CPUInfo, sizeof(CPUInfo));
+ ws_cpuid(CPUInfo, 0x80000003);
+ memcpy(CPUBrandString + 16, CPUInfo, sizeof(CPUInfo));
+ ws_cpuid(CPUInfo, 0x80000004);
+ memcpy(CPUBrandString + 32, CPUInfo, sizeof(CPUInfo));
+
+ g_string_append_printf(str, "%s", CPUBrandString);
+
+ if (ws_cpuid_sse42())
+ g_string_append(str, " (with SSE4.2)");
+}
+
+/*
+ * Editor modelines - http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */
--- /dev/null
+/* cpu_info.h
+ * Declarations of routines to report CPU information
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifndef __WSUTIL_CPU_INFO_H__
+#define __WSUTIL_CPU_INFO_H__
+
+#include "ws_symbol_export.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#include "ws_symbol_export.h"
+
+WS_DLL_PUBLIC void get_cpu_info(GString *str);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __WSUTIL_CPU_INFO_H__ */
git.samba.org / metze / wireshark / wip.git / commitdiff