osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Move the routine to get memory information to wsutil. 

Change-Id: I94717cec5a464166585b258a83f8ccdaccf8d5ff
Reviewed-on: https://code.wireshark.org/review/2525
Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
Guy Harris 2014-06-21 13:31:13 -07:00
parent 3c96970544
commit 73c7addfa6
5 changed files with 89 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
version_info.c
View File

@ -36,10 +36,11 @@
#include <wsutil/os_version_info.h>
#include <wsutil/compiler_info.h>
#include <wsutil/cpu_info.h>
#include <wsutil/mem_info.h>
#include "version.h"
#ifdef HAVE_WINDOWS_H
#ifdef _WIN32
#include <windows.h>
#endif
@ -168,19 +169,6 @@ get_compiled_version_info(GString *str, void (*prepend_info)(GString *),
end_string(str);
}
static void get_mem_info(GString *str _U_)
{
#if defined(_WIN32)
MEMORYSTATUSEX statex;
statex.dwLength = sizeof (statex);
if(GlobalMemoryStatusEx (&statex))
g_string_append_printf(str, ", with ""%" G_GINT64_MODIFIER "d" "MB of physical memory.\n", statex.ullTotalPhys/(1024*1024));
#endif
}
/*
* Get various library run-time versions, and the OS version, and append
* them to the specified GString.

1
wsutil/CMakeLists.txt
View File

@ -64,6 +64,7 @@ set(WSUTIL_FILES
g711.c
md4.c
md5.c
mem_info.c
mpeg-audio.c
nstime.c
os_version_info.c

2
wsutil/Makefile.common
View File

@ -52,6 +52,7 @@ LIBWSUTIL_SRC = \
g711.c \
md4.c \
md5.c \
mem_info.c \
mpeg-audio.c \
nstime.c \
os_version_info.c \
@ -98,6 +99,7 @@ LIBWSUTIL_INCLUDES = \
g711.h \
md4.h \
md5.h \
mem_info.h \
mpeg-audio.h \
nstime.h \
os_version_info.h \

45
wsutil/mem_info.c Normal file
View File

@ -0,0 +1,45 @@
/* mem_info.c
* Routines to report version information about how much memory the
* machine on which we're running has
*
* 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"
#ifdef _WIN32
#include <windows.h>
#endif
#include <glib.h>
#include <wsutil/mem_info.h>
void
get_mem_info(GString *str _U_)
{
#ifdef _WIN32
MEMORYSTATUSEX statex;
statex.dwLength = sizeof (statex);
if (GlobalMemoryStatusEx(&statex))
g_string_append_printf(str, ", with ""%" G_GINT64_MODIFIER "d" "MB of physical memory.\n", statex.ullTotalPhys/(1024*1024));
#endif
}

39
wsutil/mem_info.h Normal file
View File

@ -0,0 +1,39 @@
/* mem_info.h
* Declarations of outines to report information about how much memory
* the machine on which we're running has
*
* 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_MEM_INFO_H__
#define __WSUTIL_MEM_INFO_H__
#include "ws_symbol_export.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
WS_DLL_PUBLIC void get_mem_info(GString *str);
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif /* __WSUTIL_MEM_INFO_H__ */