Merge pull request awslabs#62 from quasi-mod/master

Modify return value of get_boot_time to time_t
globetrotter2796 · Jan 5, 2019 · 5b78af2 · 5b78af2
2 parents b70153a + 1a24953
commit 5b78af2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OpsWorks/sample-cookbooks/cpulimit-ruby/files/default/cpulimit-master/src/process_iterator.h b/OpsWorks/sample-cookbooks/cpulimit-ruby/files/default/cpulimit-master/src/process_iterator.h
@@ -48,7 +48,7 @@ struct process {
 	//ppid of the process
 	pid_t ppid;
 	//start time (unix timestamp)
-	int starttime;
+	time_t starttime;
 	//cputime used by the process (in milliseconds)
 	int cputime;
 	//actual cpu usage estimation (value in range 0-1)
@@ -66,7 +66,7 @@ struct process_filter {
 struct process_iterator {
 #ifdef __linux__
 	DIR *dip;
-	int boot_time;
+	time_t boot_time;
 #elif defined __FreeBSD__
 	kvm_t *kd;
 	struct kinfo_proc *procs;

diff --git a/...sample-cookbooks/cpulimit-ruby/files/default/cpulimit-master/src/process_iterator_linux.c b/...sample-cookbooks/cpulimit-ruby/files/default/cpulimit-master/src/process_iterator_linux.c
@@ -13,7 +13,7 @@
 
 #include <sys/vfs.h>
 
-static int get_boot_time()
+static time_t get_boot_time()
 {
 	int uptime = 0;
 	FILE *fp = fopen ("/proc/uptime", "r");