mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: d4630496790a64fd851379d821f5006dfed8b754
This commit is contained in:
Xamarin Public Jenkins
2016-01-18 21:31:55 -05:00
parent bae8ee0d2b 3c6daee652
commit 2249cfc3c2
82 changed files with 495 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mcs/class/System/System.IO/KeventWatcher.cs
View File

@@ -162,6 +162,8 @@ namespace System.IO {
class KqueueMonitor : IDisposable
{
static bool initialized;
public int Connection
{
get { return conn; }
@@ -171,6 +173,13 @@ namespace System.IO {
{
this.fsw = fsw;
this.conn = -1;
if (!initialized){
int t;
initialized = true;
var maxenv = Environment.GetEnvironmentVariable ("MONO_DARWIN_WATCHER_MAXFDS");
if (maxenv != null && Int32.TryParse (maxenv, out t))
maxFds = t;
}
}
public void Dispose ()
@@ -625,7 +634,7 @@ namespace System.IO {
const int F_GETPATH = 50;
const int __DARWIN_MAXPATHLEN = 1024;
static readonly kevent[] emptyEventList = new System.IO.kevent[0];
const int maxFds = 200;
int maxFds = Int32.MaxValue;
FileSystemWatcher fsw;
int conn;