Return on-heap binaries when possible #13

erlang-unicode · Oct 5, 2015 · 85eb285 · 85eb285
1 parent 02184cc
commit 85eb285
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 7 deletions.
diff --git a/c_src/i18n_collation.cpp b/c_src/i18n_collation.cpp
@@ -349,7 +349,7 @@ ERL_NIF_TERM sort_key(ErlNifEnv* env, int argc,
         do_sort_key(in, out, len, col, status);
     }
     CHECK(env, status);
-    return enif_make_binary(env, &out);
+    return enif_make_compact_binary(env, &out);
 }
 
 ERL_NIF_TERM compare(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])

diff --git a/c_src/i18n_nif.h b/c_src/i18n_nif.h
@@ -47,6 +47,8 @@
 #define LOCALE_LEN      255
 #define ATOM_LEN        16
 
+#define I18N_ERL_ONHEAP_BIN_LIMIT 64 // from erts/emulator/beam/erl_binary.h
+
 
 #if I18N_INFO
 #ifdef __GNUC__
@@ -212,6 +214,18 @@ inline UnicodeString binary_to_string(const ErlNifBinary& in) {
         TO_ULEN(in.size));
 }
 
+inline ERL_NIF_TERM enif_make_compact_binary(ErlNifEnv* env, ErlNifBinary* in)
+{
+    size_t len = in->size;
+    if (len <= I18N_ERL_ONHEAP_BIN_LIMIT) {
+        ERL_NIF_TERM out;
+        unsigned char* buf = enif_make_new_binary(env, len, &out);
+        memcpy((char*)buf, (const char *) (in->data), len);
+        return out;
+    }
+    return enif_make_binary(env, in);
+}
+
 #if I18N_DATE
 inline ERL_NIF_TERM calendar_to_double(ErlNifEnv* env, const UCalendar* cal) {
     UDate date;

diff --git a/c_src/i18n_string.cpp b/c_src/i18n_string.cpp
@@ -186,7 +186,7 @@ ERL_NIF_TERM from_utf8(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
         do_from_utf8(in, out, ulen, status);
     }
     CHECK(env, status);
-    return enif_make_binary(env, &out);
+    return enif_make_compact_binary(env, &out);
 }
 
 
@@ -242,7 +242,7 @@ ERL_NIF_TERM to_utf8(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])
         do_to_utf8(in, out, len, status);
     }
     CHECK(env, status);
-    return enif_make_binary(env, &out);
+    return enif_make_compact_binary(env, &out);
 }
 
 ERL_NIF_TERM endian(ErlNifEnv* env, int argc,
@@ -375,7 +375,7 @@ ERL_NIF_TERM norm(ErlNifEnv* env, ErlNifBinary in,
         do_norm(in, out, ulen, mode, status);
     }
     CHECK(env, status);
-    return enif_make_binary(env, &out);
+    return enif_make_compact_binary(env, &out);
 }
 
 /**
@@ -502,7 +502,7 @@ ERL_NIF_TERM to_upper(ErlNifEnv* env, int argc,
         do_case(in, out, ulen, u_strToUpper, (char*) locale, status);
     }
     CHECK(env, status);
-    return enif_make_binary(env, &out);
+    return enif_make_compact_binary(env, &out);
 }
 ERL_NIF_TERM to_lower(ErlNifEnv* env, int argc, 
     const ERL_NIF_TERM argv[])
@@ -526,7 +526,7 @@ ERL_NIF_TERM to_lower(ErlNifEnv* env, int argc,
         do_case(in, out, ulen, u_strToUpper, (char*) locale, status);
     }
     CHECK(env, status);
-    return enif_make_binary(env, &out);
+    return enif_make_compact_binary(env, &out);
 }
 
 inline void do_to_title(
@@ -608,7 +608,7 @@ ERL_NIF_TERM to_title(ErlNifEnv* env, int argc,
         do_to_title(in, out, ulen, iter, locptr, status);
     }
     CHECK(env, status);
-    return enif_make_binary(env, &out);
+    return enif_make_compact_binary(env, &out);
 
 }
 ERL_NIF_TERM len(ErlNifEnv* env, int argc, const ERL_NIF_TERM argv[])