summaryrefslogtreecommitdiff
path: root/epan/app_mem_usage.c
diff options
context:
space:
mode:
authorJakub Zawadzki <darkjames-ws@darkjames.pl>2013-07-30 19:47:51 +0000
committerJakub Zawadzki <darkjames-ws@darkjames.pl>2013-07-30 19:47:51 +0000
commite5997ef390c5875f99107c18c0a2e2d24d2c556d (patch)
tree445ba39c308f9646889e2a654822e8bd3353b889 /epan/app_mem_usage.c
parente6e28655e7fc363c456e5bcb28ca1b517cfec6f3 (diff)
downloadwireshark-e5997ef390c5875f99107c18c0a2e2d24d2c556d.tar.gz
Remove dirty (and not compiling) code from app_mem_usage.c, need rewrite if really needed.
svn path=/trunk/; revision=51035
Diffstat (limited to 'epan/app_mem_usage.c')
-rw-r--r--epan/app_mem_usage.c79
1 files changed, 1 insertions, 78 deletions
diff --git a/epan/app_mem_usage.c b/epan/app_mem_usage.c
index e1bdf1bba3..d689835c45 100644
--- a/epan/app_mem_usage.c
+++ b/epan/app_mem_usage.c
@@ -22,22 +22,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-/* code copied from ekg2, GPL-2 */
#include "config.h"
#include <glib.h>
-#include <stdio.h>
-#include <string.h>
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef HAVE_SYS_UTSNAME_H
-#include <sys/utsname.h>
-#endif
-
#ifdef _WIN32
#include <windows.h>
#include <psapi.h>
@@ -69,71 +57,6 @@ get_total_mem_used_by_app(void)
return (int)workingSize;
}
#else
- char *temp;
- FILE *file = NULL;
- int rozmiar = 0, unmres;
- struct utsname sys;
-
- unmres = uname(&sys);
-
- temp = g_strdup_printf("/proc/%d/status", getpid());
-
- if ( (unmres != -1 && !strcmp(sys.sysname, "FreeBSD")) || (file = fopen(temp,"rb")) ) {
- g_free(temp);
- {
-#ifdef __linux__
- char buf[1024];
- char *p = NULL;
- size_t rd = 0;
-
- rd = fread(buf, 1, 1024, file);
- fclose(file);
- if (rd == 0)
- {
- return -1;
- }
- p = strstr(buf, "VmSize");
- if (p) {
- sscanf(p, "VmSize: %d kB", &rozmiar);
- } else {
- return -1;
- }
-#elif __sun
- size_t rd = 0;
- pstatus_t proc_stat;
- rd = fread(&proc_stat, sizeof(proc_stat), 1, file);
- fclose(file);
- if (rd == 0)
- {
- return -1;
- }
- rozmiar = proc_stat.pr_brksize + proc_stat.pr_stksize;
-#elif __FreeBSD__ /* link with -lkvm */
- char errbuf[_POSIX2_LINE_MAX];
- int nentries = -1;
- struct kinfo_proc *kp;
- static kvm_t *kd;
-
- if (!(kd = kvm_openfiles(NULL /* "/dev/null" */, "/dev/null", NULL, /* O_RDONLY */0, errbuf))) {
- return -1;
- }
- kp = kvm_getprocs(kd, KERN_PROC_PID, getpid(), &nentries);
- if (!kp || nentries != 1) {
- return -1;
- }
-#ifdef HAVE_STRUCT_KINFO_PROC_KI_SIZE
- rozmiar = (u_long) kp->ki_size/1024; /* freebsd5 */
-#else
- rozmiar = kp->kp_eproc.e_vm.vm_map.size/1024; /* freebsd4 */
-#endif /* HAVE_STRUCT_KINFO_PROC_KI_SIZE */
-#else
- /* no /proc mounted */
- return -1;
-#endif
- }
- } else {
- return -1;
- }
- return rozmiar;
+ return 0;
#endif /* (_WIN32) */
}