From 529f78be2ce6c9fef346a15db841a68f8d848790 Mon Sep 17 00:00:00 2001
From: Charlie Fenton <charlief@example.com>
Date: Wed, 8 Jun 2011 02:28:21 +0000
Subject: [PATCH] Mac: Add new procinfo.cpp to XCode Project

svn path=/branches/boinc_core_release_6_12/; revision=23675
---
 checkin_notes                             | 18 +++++++++++++++
 lib/procinfo_mac.cpp                      | 27 +++++++++--------------
 mac_build/boinc.xcodeproj/project.pbxproj | 14 ++++++++++++
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 30b72ee5f6..2ead54f68d 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -9862,3 +9862,21 @@ Rom    7 Jun 2011
     /
         configure.ac
         version.h
+
+Charlie 22 Feb 2011
+    - Mac: Add new procinfo.cpp to XCode Project.
+
+     mac_build/
+        boinc.xcodeproj/
+            project.pbxproj
+
+Charlie 21 Apr 2011
+    - Mac: Update XCode Project to link procinfo.cpp and procinfo_mac.cpp into 
+        boinscr (ss_app) because boinc_api.cpp now calls kill_descendants() and 
+        suspend_or_resume_descendants().
+    
+    lib
+        procinfo_mac.cpp
+     mac_build/
+        boinc.xcodeproj/
+            project.pbxproj
diff --git a/lib/procinfo_mac.cpp b/lib/procinfo_mac.cpp
index 2db015f808..2877e70a3a 100644
--- a/lib/procinfo_mac.cpp
+++ b/lib/procinfo_mac.cpp
@@ -114,8 +114,16 @@ int procinfo_setup(vector<PROCINFO>& pi) {
 
     while (1) {
         memset(&p, 0, sizeof(p));
-        c = fscanf(fd, "%d%d%d%d%ld%d%d:%lf ", &p.id, &p.parentid, &real_mem, 
-                    &virtual_mem, &p.page_fault_count, &priority, &hours, &p.user_time);
+        c = fscanf(fd, "%d%d%d%d%ld%d%d:%lf ",
+            &p.id,
+            &p.parentid,
+            &real_mem, 
+            &virtual_mem,
+            &p.page_fault_count,
+            &priority,
+            &hours,
+            &p.user_time
+        );
         if (c < 7) break;
         if (fgets(p.command, sizeof(p.command) , fd) == NULL) break;
         lf = strchr(p.command, '\n');
@@ -186,18 +194,3 @@ void add_proc_totals(PROCINFO& pi, vector<PROCINFO>& piv, int pid, char* graphic
 void procinfo_app(PROCINFO& pi, vector<PROCINFO>& piv, char* graphics_exec_file) {
 	add_proc_totals(pi, piv, pi.id, graphics_exec_file, 0, 0);
 }
-
-void procinfo_other(PROCINFO& pi, vector<PROCINFO>& piv) {
-    unsigned int i;
-
-    memset(&pi, 0, sizeof(pi));
-    for (i=0; i<piv.size(); i++) {
-        PROCINFO& p = piv[i];
-        if (p.is_boinc_app) continue;
-        if (p.is_low_priority) continue;
-
-        pi.user_time += p.user_time;
-        pi.swap_size += p.swap_size;
-        pi.working_set_size += p.working_set_size;
-    }
-}
diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj
index 4aaf4e3176..b40e49a0c4 100755
--- a/mac_build/boinc.xcodeproj/project.pbxproj
+++ b/mac_build/boinc.xcodeproj/project.pbxproj
@@ -59,6 +59,12 @@
 		DD205A1A0BAF596E0008D473 /* ProjectListCtrl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD205A180BAF596E0008D473 /* ProjectListCtrl.cpp */; };
 		DD21B49D0D750FC600AFFEE5 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDFE854A0B60CFD0009B43D9 /* AppKit.framework */; };
 		DD247AF90AEA308A0034104A /* SkinManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD247AF70AEA308A0034104A /* SkinManager.cpp */; };
+		DD29B89F139F0CED0014477D /* procinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD29B89E139F0CED0014477D /* procinfo.cpp */; };
+		DD29B8A0139F0CED0014477D /* procinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD29B89E139F0CED0014477D /* procinfo.cpp */; };
+		DD29B8A1139F0CED0014477D /* procinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD29B89E139F0CED0014477D /* procinfo.cpp */; };
+		DD29B8A2139F0CED0014477D /* procinfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD29B89E139F0CED0014477D /* procinfo.cpp */; };
+		DD29B8A7139F14D10014477D /* procinfo_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB6934F0ABFE9C600689FD8 /* procinfo_mac.cpp */; };
+		DD29B8AC139F15080014477D /* procinfo_mac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB6934F0ABFE9C600689FD8 /* procinfo_mac.cpp */; };
 		DD32CC830C27CEFB0016F571 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; };
 		DD32CC8F0C27CF860016F571 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; };
 		DD33C6F308B5BAF500768630 /* gui_http.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD33C6F108B5BAF500768630 /* gui_http.cpp */; };
@@ -663,6 +669,7 @@
 		DD247AF80AEA308A0034104A /* SkinManager.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = SkinManager.h; path = ../clientgui/SkinManager.h; sourceTree = SOURCE_ROOT; };
 		DD252F3009E3E014006454D7 /* boinc_glut.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = boinc_glut.h; path = ../api/boinc_glut.h; sourceTree = SOURCE_ROOT; };
 		DD29728E10BB657A00DF3C2E /* MacAccessiblity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MacAccessiblity.h; path = ../clientgui/mac/MacAccessiblity.h; sourceTree = SOURCE_ROOT; };
+		DD29B89E139F0CED0014477D /* procinfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = procinfo.cpp; sourceTree = "<group>"; };
 		DD2D25CB07FAB41700151141 /* DlgSelectComputer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DlgSelectComputer.cpp; path = ../clientgui/DlgSelectComputer.cpp; sourceTree = SOURCE_ROOT; };
 		DD2D25CC07FAB41700151141 /* DlgSelectComputer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DlgSelectComputer.h; path = ../clientgui/DlgSelectComputer.h; sourceTree = SOURCE_ROOT; };
 		DD2F32EF07F2A83E00645DDC /* MacSysMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MacSysMenu.h; path = ../clientgui/mac/MacSysMenu.h; sourceTree = SOURCE_ROOT; };
@@ -1590,6 +1597,7 @@
 				DD344BE407C5B1670043025C /* prefs.cpp */,
 				DD344BE507C5B1670043025C /* prefs.h */,
 				DDB6934F0ABFE9C600689FD8 /* procinfo_mac.cpp */,
+				DD29B89E139F0CED0014477D /* procinfo.cpp */,
 				DD344BEF07C5B1770043025C /* proxy_info.cpp */,
 				DD344BEE07C5B1770043025C /* proxy_info.h */,
 				AAA31C97042157A800A80164 /* shmem.cpp */,
@@ -2593,6 +2601,7 @@
 				DD4FA25D121828E400154856 /* BOINCHtmlLBox.cpp in Sources */,
 				DD4FA2621218290600154856 /* BOINCVListBox.cpp in Sources */,
 				DD5FD0C7139CDD30001092E5 /* sqlite3.c in Sources */,
+				DD29B89F139F0CED0014477D /* procinfo.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2634,6 +2643,8 @@
 				DDAD31D80EC26B14002DA09D /* mac_address.cpp in Sources */,
 				DDC06AB410A3E93F00C8D9A5 /* url.cpp in Sources */,
 				DDE1372F10DC5E8D00161D6B /* notice.cpp in Sources */,
+				DD29B8A1139F0CED0014477D /* procinfo.cpp in Sources */,
+				DD29B8AC139F15080014477D /* procinfo_mac.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2727,6 +2738,8 @@
 				DDFE4E9110AB7C3A00919319 /* url.cpp in Sources */,
 				DDD9C5AB10CCF6A300A1E4CD /* coproc.cpp in Sources */,
 				DDF5F85A10DD05DB006A50CD /* notice.cpp in Sources */,
+				DD29B8A2139F0CED0014477D /* procinfo.cpp in Sources */,
+				DD29B8A7139F14D10014477D /* procinfo_mac.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2903,6 +2916,7 @@
 				DDE1372A10DC5E5300161D6B /* cs_notice.cpp in Sources */,
 				DDE1373210DC5EA400161D6B /* notice.cpp in Sources */,
 				DD40BEEF1270EECE009D9AA6 /* current_version.cpp in Sources */,
+				DD29B8A0139F0CED0014477D /* procinfo.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};