Merge pull request #725 from knocte/threadpool_init

[ThreadPool] Allow heavier initialization when using --server flag

diff --cc man/mono.1
Simple merge

diff --cc mono/metadata/mono-config.c
Simple merge

diff --cc mono/metadata/mono-config.h
index 8ac5de0ebbe75f4e111fbbc446c4836fcd1df2c9,d2496e2c4ce5f7280efe8d468db7e7246012c8c0..4733daa0448d0e330dd9326269eb544c9b45b9e8
--- 1/mono/metadata/mono-config.h
--- 2/mono/metadata/mono-config.h
+++ b/mono/metadata/mono-config.h
@@@ -13,18 -13,21 +13,21 @@@
  
  MONO_BEGIN_DECLS
  
 -const char* mono_get_config_dir (void);
 -void        mono_set_config_dir (const char *dir);
 +MONO_API const char* mono_get_config_dir (void);
 +MONO_API void        mono_set_config_dir (const char *dir);
  
 -const char* mono_get_machine_config (void);
 +MONO_API const char* mono_get_machine_config (void);
  
 -void mono_config_cleanup      (void);
 -void mono_config_parse        (const char *filename);
 -void mono_config_for_assembly (MonoImage *assembly);
 -void mono_config_parse_memory (const char *buffer);
 +MONO_API void mono_config_cleanup      (void);
 +MONO_API void mono_config_parse        (const char *filename);
 +MONO_API void mono_config_for_assembly (MonoImage *assembly);
 +MONO_API void mono_config_parse_memory (const char *buffer);
  
 -const char* mono_config_string_for_assembly_file (const char *filename);
 +MONO_API const char* mono_config_string_for_assembly_file (const char *filename);
  
+ void mono_config_set_server_mode (gboolean server_mode);
+ gboolean mono_config_is_server_mode (void);
+ 
  MONO_END_DECLS
  
  #endif /* __MONO_METADATA_CONFIG_H__ */

diff --cc mono/metadata/threadpool.c
Simple merge

diff --cc mono/mini/driver.c
Simple merge