songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

64-bit overflow fix: 

Use std::ifstream to parse /proc/self/stat, so that I can parse
64 bit integers properly (fscanf cannot...).
This commit is contained in:
Sylvain Pion 2007-06-08 13:27:52 +00:00
parent 5d0697ee02
commit ae8da4fc4a
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Timer/include/CGAL/Memory_sizer.h
View File

@ -44,11 +44,8 @@ CGAL_END_NAMESPACE
# include <windows.h> # include <windows.h>
# include "psapi.h" # include "psapi.h"
#elif defined __linux__ #elif defined __linux__
# include <fstream>
# include <cstddef> # include <cstddef>
# include <cstdio>
# include <sys/types.h>
# include <sys/stat.h>
# include <fcntl.h>
# include <unistd.h> # include <unistd.h>
#endif #endif
@ -99,6 +96,8 @@ private:
// This does not include pages which // This does not include pages which
// have not been demand-loaded in, or // have not been demand-loaded in, or
// which are swapped out. // which are swapped out.
//
// Note : the following may be buggy in case of space in the executable name...
int pid; int pid;
char name[1024]; char name[1024];
@ -106,20 +105,16 @@ private:
int ppid, pgrp, session, tty, tpgid; int ppid, pgrp, session, tty, tpgid;
unsigned flags, minflt, cminflt, majflt, cmajflt; unsigned flags, minflt, cminflt, majflt, cmajflt;
int utime, stime, cutime, cstime, counter, priority, timeout; int utime, stime, cutime, cstime, counter, priority, timeout;
unsigned itrealvalue, starttime, vsize = 0, rss = 0; unsigned itrealvalue, starttime;
size_type vsize = 0, rss = 0;
FILE *f = fopen("/proc/self/stat", "r"); std::ifstream f("/proc/self/stat");
CGAL_assertion(f); CGAL_assertion(f);
fscanf(f, "%d %s %c %d %d %d %d %d %u "
"%u %u %u %u %d %d %d "
"%d %d %d %u %u %d "
"%u %u",
&pid, name, &state, &ppid, &pgrp, &session, &tty, &tpgid, &flags,
&minflt, &cminflt, &majflt, &cmajflt, &utime, &stime, &cutime,
&cstime, &counter, &priority, &timeout, &itrealvalue, &starttime,
&vsize, &rss);
fclose(f); f >> pid >> name >> state >> ppid >> pgrp >> session >> tty >> tpgid >> flags;
f >> minflt >> cminflt >> majflt >> cmajflt >> utime >> stime >> cutime;
f >> cstime >> counter >> priority >> timeout >> itrealvalue >> starttime;
f >> vsize >> rss;
return virtual_size ? vsize : rss * getpagesize(); return virtual_size ? vsize : rss * getpagesize();
#endif #endif