| -rw-r--r-- | src/process.cc | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/src/process.cc b/src/process.cc index 8a5b5d2..96c874f 100644 --- a/src/process.cc +++ b/src/process.cc @@ -228,58 +228,68 @@ void process::unprepare_herd() { } void process::gather_proc_info() { vector<pid_t> allpids; DIR *pd = opendir("/proc"); if(!pd) throw runtime_error("failed to open /proc"); struct dirent *pde; pid_t selfpid = getpid(); while(pde=readdir(pd)) { errno=0; pid_t pid = atoi(pde->d_name); if((!pid) || pid==selfpid) continue; allpids.push_back(pid); } closedir(pd); char s[256]; procpids.clear(); for(vector<pid_t>::const_iterator i=allpids.begin();i!=allpids.end();++i) { int r = snprintf(s,sizeof(s),"/proc/%d/stat",*i); if(r>=sizeof(s) || r<1) continue; string cmd; ifstream ss(s,ios::in); - if(!ss) - continue; - getline(ss,cmd); - string::size_type op = cmd.find('('); - if(op==string::npos) - continue; - cmd.erase(0,op+1); - string::size_type cp = cmd.find(')'); - if(cp==string::npos) - continue; - cmd.erase(cp); + if(ss) { + getline(ss,cmd); + string::size_type op = cmd.find('('); + if(op==string::npos) + continue; + cmd.erase(0,op+1); + string::size_type cp = cmd.find(')'); + if(cp==string::npos) + continue; + cmd.erase(cp); + }else{ + r = snprintf(s,sizeof(s),"/proc/%d/status",*i); + if(r>=sizeof(s) || r<1) + continue; + ifstream ss(s,ios::in); + if(!ss) + continue; + ss >> cmd; + if(cmd.empty()) + continue; + } r = snprintf(s,sizeof(s),"/proc/%d/cmdline",*i); if(r>=sizeof(s) || r<1) continue; ifstream cs(s,ios::binary); if(!cs) continue; string command; while(cs) { string cl; getline(cs,cl,(char)0); string::size_type lsl = cl.rfind('/'); if(lsl!=string::npos) cl.erase(0,lsl+1); if(cl.substr(0,cmd.length())==cmd) { command = cl; break; } } procpids.insert(pair<string,pid_t>(cmd,*i)); if((!command.empty()) && cmd!=command) procpids.insert(pair<string,pid_t>(command,*i)); } } |