@@ -76,7 +76,7 @@ class Table left_bar_size = free_space / 2 right_bar_size = free_space - left_bar_size end - result = "#{BLUE_BG}#{BOLD}#{YELLOW}" + result = "#{BLUE_BG}#{BOLD}#{YELLOW}\n" result << "#{"-" * left_bar_size} #{title} #{"-" * right_bar_size}\n" if !@rows.empty? result << WHITE @@ -124,7 +124,7 @@ class MemoryStats end def to_a - return [pid, ppid, threads, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name] + return [pid, ppid, vm_size_in_mb, private_dirty_rss_in_mb, rss_in_mb, name] end end @@ -264,7 +264,7 @@ private end def print_process_list(title, processes, options = {}) - table = Table.new(%w{PID PPID Threads VMSize Private Resident Name}) + table = Table.new(%w{PID PPID VMSize Private Resident Name}) table.add_rows(processes) if options.has_key?(:show_ppid) && !options[:show_ppid] table.remove_column('PPID') bin/passenger-memory-stats @@ -109,15 +109,6 @@ private: public: /** - * The platform's minimum stack size, in bytes. - */ - #if defined(PTHREAD_STACK_MIN) - static const unsigned int MIN_STACK_SIZE = PTHREAD_STACK_MIN; - #else - static const unsigned int MIN_STACK_SIZE = 1024 * 128; - #endif - - /** * Create a new thread. * * @param func A function object which will be called as the thread's @@ -139,8 +130,18 @@ public: initialize_data(name); set_thread_main_function(boost::bind(thread_main, func, data)); - if (stack_size != 0 && stack_size < MIN_STACK_SIZE) { - stack_size = MIN_STACK_SIZE; + + unsigned long min_stack_size; + #ifdef PTHREAD_STACK_MIN + // PTHREAD_STACK_MIN may not be a constant macro so we need + // to evaluate it dynamically. + min_stack_size = PTHREAD_STACK_MIN; + #else + // Assume minimum stack size is 128 KB. + min_stack_size = 128 * 1024; + #endif + if (stack_size != 0 && stack_size < min_stack_size) { + stack_size = min_stack_size; } start_thread(stack_size); } ext/oxt/thread.hpp ca4230d0315ae1f216fbd5bb0c38699a3230a67e a6dc7165566e828dca7757f812c7ee68cb1c6ed6 Hongli Lai (Phusion) hongli@phusion.nl http://github.com/FooBarWidget/passenger/commit/20005e1459841c69c8ea7f1b2432eee2856238a7 20005e1459841c69c8ea7f1b2432eee2856238a7 2009-09-12T06:57:51-07:00 2009-09-12T06:57:51-07:00 Merge branch 'master' into refactoring Conflicts: NEWS ext/oxt/thread.hpp bdc6d187739400c66d7b343dd75693c906edff51 Hongli Lai (Phusion) hongli@phusion.nl