Move usage of dlfcn.h into the platform/posix subdirectory.

mrry · tensorflower-gardener · commit aedfbb7ae753 · 2016-09-26T11:33:41.000-07:00
Switch the CUPTI wrapper to use Env::Default() functions for resolving
symbols in libraries.
Change: 134303329
diff --git a/tensorflow/contrib/makefile/proto_text_cc_files.txt b/tensorflow/contrib/makefile/proto_text_cc_files.txt
@@ -8,7 +8,7 @@ tensorflow/core/platform/posix/posix_file_system.cc
 tensorflow/core/platform/posix/port.cc
 tensorflow/core/platform/posix/error.cc
 tensorflow/core/platform/posix/env.cc
-tensorflow/core/platform/load_library.cc
+tensorflow/core/platform/posix/load_library.cc
 tensorflow/core/platform/file_system.cc
 tensorflow/core/platform/env.cc
 tensorflow/core/platform/denormal.cc
diff --git a/tensorflow/core/platform/default/gpu/cupti_wrapper.cc b/tensorflow/core/platform/default/gpu/cupti_wrapper.cc
@@ -17,9 +17,9 @@ limitations under the License.
 
 #if GOOGLE_CUDA
 
-#include <dlfcn.h>
 #include <string>
 
+#include "tensorflow/core/platform/env.h"
 #include "tensorflow/core/platform/stream_executor.h"
 
 namespace perftools {
@@ -38,9 +38,10 @@ namespace dynload {
       return status.ValueOrDie();                                           \
     }                                                                       \
     static FuncPointerT DynLoad() {                                         \
-      static void* f = dlsym(GetDsoHandle(), kName);                        \
-      CHECK(f != nullptr) << "could not find " << kName                     \
-                          << "in libcupti DSO; dlerror: " << dlerror();     \
+      static void* f;                                                       \
+      TF_CHECK_OK(::tensorflow::Env::Default()->GetSymbolFromLibrary(       \
+          GetDsoHandle(), kName, &f))                                       \
+          << "could not find " << kName << "in libcupti DSO";               \
       return reinterpret_cast<FuncPointerT>(f);                             \
     }                                                                       \
     template <typename... Args>                                             \
diff --git a/tensorflow/core/platform/posix/load_library.cc b/tensorflow/core/platform/posix/load_library.cc
@@ -13,6 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
+#include "tensorflow/core/platform/load_library.h"
+
 #include <dlfcn.h>
 
 #include "tensorflow/core/lib/core/errors.h"
