consolidate loaders

Author: kevinushey

R/hooks.R

@@ -1,46 +1,31 @@
 
-dllInfo <- NULL
-mallocDllInfo <- NULL
+.tbbDllInfo            <- NULL
+.tbbMallocDllInfo      <- NULL
+.tbbMallocProxyDllInfo <- NULL
 
-.onLoad <- function(libname, pkgname) {
+loadTbbLibrary <- function(name) {
 
-   # load tbb and tbbmalloc on supported platforms   
-   tbb <- tbbLibraryPath("tbb")
-   if (!is.null(tbb)) {
-      if (!file.exists(tbb)) {
-         warning(paste("TBB library", tbb, "not found."))
-      } else {
-         dllInfo <<- dyn.load(tbb, local = FALSE, now = TRUE)
-      }
-   }
+   path <- tbbLibraryPath(name)
+   if (is.null(path))
+      return(NULL)
 
-   tbbMalloc <- tbbLibraryPath("tbbmalloc")
-   if (!is.null(tbbMalloc)) {
-      if (!file.exists(tbbMalloc)) {
-         warning(paste("TBB malloc library", tbbMalloc, "not found."))
-      } else {
-         mallocDllInfo <<- dyn.load(tbbMalloc, local = FALSE, now = TRUE)
-      }
+   if (!file.exists(path)) {
+      warning("TBB library ", shQuote(name), " not found.")
+      return(NULL)
    }
 
-   # work around roxygen2 issue
-   documenting <- FALSE
-   checks <- list(
-      call("::", as.symbol("devtools"), as.symbol("document")),
-      call("::", as.symbol("roxygen2"), as.symbol("roxygenize"))
-   )
-   
-   for (call in sys.calls()) {
-      for (check in checks) {
-         if (identical(call[[1L]], check)) {
-            documenting <- TRUE
-            break
-         }
-      }
-   }
+   dyn.load(path, local = FALSE, now = TRUE)
 
-   if (!documenting)
-      library.dynam("RcppParallel", pkgname, libname)
+}
+
+.onLoad <- function(libname, pkgname) {
+   
+   # load tbb, tbbmalloc, tbbmalloc_proxy
+   .tbbDllInfo            <<- loadTbbLibrary("tbb")
+   .tbbMallocDllInfo      <<- loadTbbLibrary("tbbmalloc")
+   .tbbMallocProxyDllInfo <<- loadTbbLibrary("tbbmalloc_proxy")
+   
+   library.dynam("RcppParallel", pkgname, libname)
 
 }
 
@@ -50,11 +35,9 @@ mallocDllInfo <- NULL
    library.dynam.unload("RcppParallel", libpath)
 
    # unload tbb if we loaded it
-   if (!is.null(dllInfo))
-      dyn.unload(dllInfo[["path"]])
-   
-   # unload tbbmalloc if we loaded it
-   if (!is.null(mallocDllInfo))
-      dyn.unload(mallocDllInfo[["path"]])
+   dlls <- list(.tbbDllInfo, .tbbMallocDllInfo, .tbbMallocProxyDllInfo)
+   for (dll in dlls)
+      if (!is.null(dll))
+         dyn.unload(dll[["path"]])
 
 }

R/tbb.R

@@ -30,10 +30,7 @@ tbbLibraryPath <- function(name = NULL) {
    )
 
    # skip systems that we know not to be compatible
-   isCompatible <-
-      !is_sparc() &&
-      !is.null(tbbLibNames[[sysname]])
-   
+   isCompatible <- !is_sparc() && !is.null(tbbLibNames[[sysname]])
    if (!isCompatible)
       return(NULL)