SP_Link - add new API fns is_nif_loaded is_nif_initialized

These can be used to check the status of the NIF at runtime.

Author: samaaron

app/external/sp_link/src/sp_link.cpp

@@ -85,13 +85,26 @@ int sp_link_init(double bpm)
 
 void sp_link_deinit()
 {
+    lock_guard<std::mutex> lock (g_init_mutex);
     if (!g_initialized){
         return;
     }
     delete g_link;
     g_initialized = false;
 }
 
+int sp_link_is_nif_initialized(bool* is_nif_initialized)
+{
+    *is_nif_initialized = g_initialized ? 1 : 0;
+    return 0;
+}
+
+int sp_link_is_nif_loaded(bool* is_nif_loaded)
+{
+    *is_nif_loaded = true;
+    return 0;
+}
+
 
 int sp_link_enable(bool enable)
 {

app/external/sp_link/src/sp_link.erl

@@ -1,5 +1,5 @@
 -module(sp_link).
--export([init_nif/1, deinit_nif/0, enable/1, is_enabled/0, set_tempo/2, get_tempo/0, get_num_peers/0,
+-export([is_nif_loaded/0, is_nif_initialized/0, init_nif/1, deinit_nif/0, enable/1, is_enabled/0, set_tempo/2, get_tempo/0, get_num_peers/0,
     start_stop_sync_enable/1, is_start_stop_sync_enabled/0, set_is_playing/2, is_playing/0, get_time_for_is_playing/0,
     get_beat_at_time/2, get_phase_at_time/2, get_time_at_beat/2, request_beat_at_time/3, force_beat_at_time/3,
     request_beat_at_start_playing_time/2, set_is_playing_and_request_beat_at_time/4, set_callback_pid/1,
@@ -14,6 +14,10 @@ init() ->
         ok = erlang:load_nif("/home/luis/projects/sp_link/build/libsp_link", 0)
     end.
 
+is_nif_loaded() ->
+    exit(nif_library_not_loaded).
+is_nif_initialized() ->
+    exit(nif_library_not_loaded).
 init_nif(_) ->
     exit(nif_library_not_loaded).
 deinit_nif() ->

app/external/sp_link/src/sp_link.h

@@ -32,6 +32,7 @@ extern "C" {
 #endif
 
     // TODO: These are exported for C tests. Once we are happy that it's working they should not be exported
+
     /**
      * Initialize the sp_link library. Must be called before anything else.
      *
@@ -44,7 +45,20 @@ extern "C" {
      */
     DllExport void sp_link_deinit();
 
+    DllExport int sp_link_is_nif_loaded(bool* is_nif_loaded);
+
+    /**
+     * Returns true if init has been called
+     */
+    DllExport int sp_link_is_nif_initialized(bool* is_nif_initialized);
 
+    /**
+     * Enable/disable the sp_link library. This should be called after init to
+     * enable/disable network connectivity with other link peers on the local
+     * network.
+     *
+     * @return 0 if ok, < 0 if error
+     */
     DllExport int sp_link_enable(bool enable);
 
     DllExport int sp_link_is_enabled(bool* enabled);

app/external/sp_link/src/sp_link_nifs.cpp

@@ -29,6 +29,27 @@
 
 extern int g_monitor_level;
 
+ERL_NIF_TERM sp_link_is_nif_loaded_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    bool loaded;
+    int rc = sp_link_is_nif_loaded(&loaded);
+    if (rc < 0){
+        return enif_make_atom(env, "error");
+    }
+    return enif_make_atom(env, loaded ? "true" : "false");
+}
+
+ERL_NIF_TERM sp_link_is_nif_initialized_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
+{
+    bool initialized;
+    int rc = sp_link_is_nif_initialized(&initialized);
+    if (rc < 0){
+        return enif_make_atom(env, "error");
+    }
+    return enif_make_atom(env, initialized ? "true" : "false");
+}
+
+
 
 ERL_NIF_TERM sp_link_init_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
 {
@@ -375,7 +396,7 @@ ERL_NIF_TERM sp_link_set_link_callback_pid_nif(ErlNifEnv* env, int argc, const E
     if (!enif_is_pid(env, argv[0])){
         return enif_make_badarg(env);
     }
-    
+
     ErlNifPid link_erlang_callback_pid;
     int rc = enif_get_local_pid(env, argv[0], &link_erlang_callback_pid);
     if (rc){
@@ -411,6 +432,8 @@ ERL_NIF_TERM sp_link_get_current_time_microseconds_nif(ErlNifEnv* env, int argc,
 
 
 static ErlNifFunc nif_funcs[] = {
+    {"is_nif_loaded", 0, sp_link_is_nif_loaded_nif},
+    {"is_nif_initialized", 0, sp_link_is_nif_initialized_nif},
     {"init_nif", 1, sp_link_init_nif},
     {"deinit_nif", 0, sp_link_deinit_nif},
     {"enable", 1, sp_link_enable_nif},

app/external/sp_link/src/sp_link_nifs.h

@@ -43,6 +43,10 @@ extern "C" {
     /**
      * Deinitialize the sp_link library.
      */
+    DllExport ERL_NIF_TERM sp_link_is_nif_loaded_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
+    DllExport ERL_NIF_TERM sp_link_is_nif_initialized_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
+
     DllExport ERL_NIF_TERM sp_link_deinit_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);
 
     DllExport ERL_NIF_TERM sp_link_enable_nif(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[]);