[Dependency Scanning] Add entry-point to DependencyScanningTool and the corresponding C API for a batch scan operation

Author: artemcm

include/swift-c/DependencyScan/DSString.h

@@ -48,5 +48,3 @@ DEPSCAN_PUBLIC void ds_string_set_dispose(ds_string_set_t *set);
 DEPSCAN_END_DECLS
 
 #endif // SWIFT_C_DSSTRING_H
-
-

include/swift-c/DependencyScan/DependencyScan.h

@@ -92,6 +92,24 @@ typedef struct {
   ds_string_set_t *import_set;
 } ds_prescan_result_t;
 
+//=== Batch Scan Input Specification --------------------------------------===//
+
+typedef struct {
+  ds_string_t module_name;
+  ds_string_t arguments;
+  bool is_swift;
+} ds_batch_scan_entry_t;
+
+typedef struct {
+  int count;
+  ds_batch_scan_entry_t *modules;
+} ds_batch_scan_input_t;
+
+typedef struct {
+  int count;
+  ds_dependency_result_t **results;
+} ds_batch_scan_result_t;
+
 //=== Dependency Result Functions -----------------------------------------===//
 
 DEPSCAN_PUBLIC ds_dependency_info_kind_t
@@ -175,6 +193,13 @@ ds_dependency_result_dispose(ds_dependency_result_t *result);
 
 DEPSCAN_PUBLIC void ds_prescan_result_dispose(ds_prescan_result_t *result);
 
+DEPSCAN_PUBLIC void ds_batch_scan_entry_dispose(ds_batch_scan_entry_t *entry);
+
+DEPSCAN_PUBLIC void ds_batch_scan_input_dispose(ds_batch_scan_input_t *input);
+
+DEPSCAN_PUBLIC void
+ds_batch_scan_result_dispose(ds_batch_scan_result_t *result);
+
 //=== Scanner Functions ---------------------------------------------------===//
 
 /// Container of the configuration state and shared cache for dependency
@@ -189,6 +214,11 @@ DEPSCAN_PUBLIC ds_dependency_result_t *
 ds_scan_dependencies(ds_scanner_t *scanner, const char *working_directory,
                      int argc, const char *const *argv);
 
+DEPSCAN_PUBLIC ds_batch_scan_result_t *
+ds_batch_scan_dependencies(ds_scanner_t *scanner, const char *working_directory,
+                           ds_batch_scan_input_t *batch_input,
+                           int argc, const char *const *argv);
+
 DEPSCAN_PUBLIC ds_prescan_result_t *
 ds_prescan_dependencies(ds_scanner_t *scanner, const char *working_directory,
                         int argc, const char *const *argv);

include/swift/DependencyScan/DSString.h renamed to include/swift/DependencyScan/DSStringImpl.h

@@ -3,7 +3,7 @@ add_swift_host_library(SwiftScan STATIC
   DependencyScanImpl.cpp
   DependencyScanningTool.cpp
   ScanDependencies.cpp
-  DSString.cpp
+  DSStringImpl.cpp
   c-include-check.c)
 
 add_dependencies(SwiftScan

lib/DependencyScan/CMakeLists.txt

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "swift/DependencyScan/DSString.h"
+#include "swift/DependencyScan/DSStringImpl.h"
 
 /// Describes the kind of underlying data in ds_string_t.
 enum ds_string_management {

lib/DependencyScan/DSString.cpp renamed to lib/DependencyScan/DSStringImpl.cpp

@@ -45,6 +45,41 @@ ds_dependency_result_t *ds_scan_dependencies(ds_scanner_t *scanner,
   return DependencyGraph;
 }
 
+ds_batch_scan_result_t *
+ds_batch_scan_dependencies(ds_scanner_t *scanner, const char *working_directory,
+                           ds_batch_scan_input_t *batch_input,
+                           int argc, const char *const *argv) {
+  DependencyScanningTool *ScanningTool = unwrap_scanner(scanner);
+  std::vector<const char *> Compilation;
+  for (int i = 0; i < argc; ++i)
+    Compilation.push_back(argv[i]);
+
+  std::vector<BatchScanInput> BatchInput;
+  for (int i = 0; i < batch_input->count; ++i) {
+    ds_batch_scan_entry_t &Entry = batch_input->modules[i];
+    BatchInput.push_back({ds_get_C_string(Entry.module_name),
+                          ds_get_C_string(Entry.arguments),
+                          /*outputPath*/ "", Entry.is_swift});
+  }
+
+
+  // Execute the scan and bridge the result
+  auto BatchScanResult =
+              ScanningTool->getDependencies(Compilation, BatchInput, {});
+  ds_batch_scan_result_t *Result = new ds_batch_scan_result_t;
+  Result->results = new ds_dependency_result_t*[BatchScanResult.size()];
+
+  for (size_t i = 0; i < BatchScanResult.size(); ++i) {
+    auto &ResultOrErr = BatchScanResult[i];
+    if (ResultOrErr.getError())
+      Result->results[i] = nullptr;
+
+    Result->results[i] = ResultOrErr.get();
+  }
+
+  return Result;
+}
+
 ds_prescan_result_t *ds_prescan_dependencies(ds_scanner_t *scanner,
                                              const char *working_directory,
                                              int argc,
@@ -233,3 +268,22 @@ void ds_prescan_result_dispose(ds_prescan_result_t *result) {
   ds_string_set_dispose(result->import_set);
   delete result;
 }
+
+void ds_batch_scan_entry_dispose(ds_batch_scan_entry_t *entry) {
+  ds_string_dispose(entry->module_name);
+  ds_string_dispose(entry->arguments);
+  delete entry;
+}
+
+void ds_batch_scan_input_dispose(ds_batch_scan_input_t *input) {
+  for (int i = 0; i < input->count; ++i) {
+    ds_batch_scan_entry_dispose(&input->modules[i]);
+  }
+}
+
+void
+ds_batch_scan_result_dispose(ds_batch_scan_result_t *result) {
+  for (int i = 0; i < result->count; ++i) {
+    ds_dependency_result_dispose(result->results[i]);
+  }
+}

lib/DependencyScan/DependencyScanImpl.cpp

@@ -24,7 +24,7 @@
 #include "swift/Basic/LLVM.h"
 #include "swift/Basic/STLExtras.h"
 #include "swift/ClangImporter/ClangImporter.h"
-#include "swift/DependencyScan/DSString.h"
+#include "swift/DependencyScan/DSStringImpl.h"
 #include "swift/Frontend/Frontend.h"
 #include "swift/Frontend/FrontendOptions.h"
 #include "swift/Frontend/ModuleInterfaceLoader.h"