Merge pull request #976 from swiftlang/t/tcache

[llbuild3] Flesh out handling of requests in cached task transitions

Author: dmbryson

llbuild.xcodeproj/xcshareddata/xcschemes/llbuild3.xcscheme

@@ -58,8 +58,7 @@
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
-      allowLocationSimulation = "YES"
-      internalIOSLaunchStyle = "3">
+      allowLocationSimulation = "YES">
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

products/llbuild3/SwiftAdaptors.hpp

@@ -81,7 +81,7 @@ struct ExtRule;
 struct ExtRuleProvider {
   void* ctx;
 
-  // FIXME: some method for cleaning up context
+  void (*releaseFn)(void* ctx);
 
   void (*rulePrefixesFn)(void*, std::vector<LabelPB>*);
   void (*artifactPrefixesFn)(void*, std::vector<LabelPB>*);
@@ -131,7 +131,7 @@ struct ExtTask {
 
   bool isInit = false;
 
-  // FIXME: some method for cleaning up context
+  void (*releaseFn)(void* ctx);
 
   void (*producesFn)(void*, std::vector<LabelPB>*);
   bool (*computeFn)(void*, ExtTaskInterface, const TaskContextPB*, const TaskInputsPB*, SubtaskResultMap*, TaskNextStatePB*);
@@ -143,7 +143,7 @@ struct ExtRule {
   LabelPB name;
   SignaturePB signature;
 
-  // FIXME: some method for cleaning up context
+  void (*releaseFn)(void* ctx);
 
   void (*producesFn)(void*, std::vector<LabelPB>*);
 
@@ -164,7 +164,7 @@ class BuildRef {
 struct ExtActionCache {
   void* ctx;
 
-  // FIXME: cleanup context
+  void (*releaseFn)(void* ctx);
 
   void (*getFn)(void* ctx, CacheKeyPB key, std::function<void (CacheValuePB, ErrorPB)>);
   void (*updateFn)(void*, CacheKeyPB key, CacheValuePB value);

src/llbuild3/ActionCache.swift

@@ -20,6 +20,10 @@ extension TActionCache {
     var extcache = llbuild3.ExtActionCache()
     extcache.ctx = Unmanaged.passRetained(self as AnyObject).toOpaque()
 
+    extcache.releaseFn = { ctx in
+      let _ = Unmanaged<AnyObject>.fromOpaque(ctx!).takeRetainedValue()
+    }
+
     extcache.getFn = { ctx, kpb, handler in
       let key: TCacheKey
       do {