Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create a shorter temp file name for model loading. #397

Merged
merged 4 commits into from
Jun 27, 2018
Merged

Create a shorter temp file name for model loading. #397

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ec24f3
Create a shorter temp file name for model loading.
yaeldMS Jun 22, 2018
35e7a6c
Address PR comments.
yaeldMS Jun 25, 2018
35864ad
Address PR comments.
yaeldMS Jun 26, 2018
cf27789
Trigger build.
yaeldMS Jun 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 28 additions & 11 deletions src/Microsoft.ML.Data/Model/Repository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
using System.Collections.Generic;
using System.IO;
using System.IO.Compression;
using Microsoft.ML.Runtime.Data;
using Microsoft.ML.Runtime.Internal.Utilities;

namespace Microsoft.ML.Runtime.Model
Expand Down Expand Up @@ -73,7 +72,7 @@ public void Dispose()
}
}

// These are the open entries that may contain streams into our _dirTemp.
// These are the open entries that may contain streams into our DirTemp.
private List<Entry> _open;

private bool _disposed;
Expand Down Expand Up @@ -108,19 +107,37 @@ internal Repository(bool needDir, IExceptionContext ectx)
PathMap = new Dictionary<string, string>();
_open = new List<Entry>();
if (needDir)
{
DirTemp = GetTempPath();
Directory.CreateDirectory(DirTemp);
}
DirTemp = GetShortTempDir();
else
GC.SuppressFinalize(this);
}

// REVIEW: This should use host environment functionality.
private static string GetTempPath()
private static string GetShortTempDir()
{
var rnd = RandomUtils.Create();
string path;
do
{
path = Path.Combine(Path.GetTempPath(), "TLC_" + rnd.Next().ToString("X"));
path = Path.GetFullPath(path);
Directory.CreateDirectory(path);
}
while (!EnsureDirectory(path));
return path;
}

private static bool EnsureDirectory(string path)
{
Guid guid = Guid.NewGuid();
return Path.GetFullPath(Path.Combine(Path.GetTempPath(), "TLC_" + guid.ToString()));
path = Path.GetFullPath(Path.Combine(path, ".lock"));
try
{
using (var stream = new FileStream(path, FileMode.CreateNew))
return true;
}
catch
{
return false;
}
}

~Repository()
Expand Down Expand Up @@ -232,7 +249,7 @@ protected void GetPath(out string pathEnt, out string pathTemp, string dir, stri
_ectx.CheckParam(!name.Contains(".."), nameof(name));

// The gymnastics below are meant to deal with bad invocations including absolute paths, etc.
// That's why we go through it even if _dirTemp is null.
// That's why we go through it even if DirTemp is null.
string root = Path.GetFullPath(DirTemp ?? @"x:\dummy");
string entityPath = Path.Combine(root, dir ?? "", name);
entityPath = Path.GetFullPath(entityPath);
Expand Down