Bug 1259355 - Test push again. r?kechen draft
authorJames Cheng <jacheng@mozilla.com>
Fri, 08 Apr 2016 10:23:50 +0800
changeset 348756 ffce6c9fe7eca324c80c57579eec0d3e064eab46
parent 348040 68c0b7d6f16ce5bb023e08050102b5f2fe4aacd8
child 348757 80b6c0ef7251d576b81d7225ac8646b76607877d
child 348760 fc644df2b090badde6fb78e56d8839b06a653aa4
child 348762 05cba63ceeba9c986527f99c9faf29d41fc08b9e
push id14909
push userbmo:jacheng@mozilla.com
push dateFri, 08 Apr 2016 02:25:25 +0000
reviewerskechen
bugs1259355
milestone48.0a1
Bug 1259355 - Test push again. r?kechen MozReview-Commit-ID: 7gM7kh9jDKs
xpcom/glue/ezlogger.h
xpcom/glue/moz.build
new file mode 100644
--- /dev/null
+++ b/xpcom/glue/ezlogger.h
@@ -0,0 +1,477 @@
+#ifndef __EZLOGGER_H__
+#define __EZLOGGER_H__
+#include <stdio.h>
+#include <utility>
+#include <string>
+#include <stdint.h>
+#include <inttypes.h> // b2g has no <cinttypes>
+#include <vector>
+#include <sstream>
+#include <iomanip>
+#include <map>
+#include <unordered_map>
+#include <functional>
+#include <cstring> // strlen
+#include <iterator>
+// Helper function to implement byte array to hex string API.
+namespace {
+
+  template<class Type, class LengthType>
+  auto
+  ToVector(const Type* aData, LengthType aLength) -> std::vector<Type>
+  {
+    std::vector<Type> vec;
+    std::copy(aData, aData + aLength, std::back_inserter(vec));
+    return vec;
+  }
+
+  std::string bin2hex(const std::vector<unsigned char> &bin) {
+    std::ostringstream oss;
+    for (auto b : bin) {
+      oss << std::setfill('0') << std::setw(2) << std::hex << static_cast<unsigned int>(b);
+    }
+    return oss.str();
+  }
+
+  std::string bin2hex(const std::vector<char> &bin) {
+    std::ostringstream oss;
+    for (auto b : bin) {
+      // signed char cast to unsgined int will fill with FFFFFF, so need to cast to unsigned char first.
+      oss << std::setfill('0') << std::setw(2) << std::hex <<static_cast<unsigned int>(*reinterpret_cast<unsigned char*>(&b));
+    }
+    return oss.str();
+  }
+
+  std::string bin2hex(const unsigned char *bin, size_t len) {
+    std::ostringstream oss;
+    for (size_t i = 0; i < len; i++) {
+      oss << std::setfill('0') << std::setw(2) << std::hex << static_cast<unsigned int>(bin[i]);
+    }
+    return oss.str();
+  }
+
+  std::string bin2hex(const char *bin, size_t len) {
+    auto forcelyunsigned = reinterpret_cast<const unsigned char*>(bin);
+    std::ostringstream oss;
+    for (size_t i = 0; i < len; i++) {
+      oss << std::setfill('0') << std::setw(2) << std::hex << static_cast<unsigned int>(forcelyunsigned[i]);
+    }
+    return oss.str();
+  }
+}
+
+#if defined(MOZ_XUL)
+#include "mozilla/Move.h" // For using Forward<T> in b2g.
+#endif
+
+#if ! defined(MOZ_XUL) || ! defined(MOZILLA_INTERNAL_API) // GECKO only
+#define printf_stderr printf
+#if defined(MOZ_WIDGET_GONK)
+#undef printf_stderr
+#include <android/log.h>
+#define B2GLOG(...) __android_log_print(ANDROID_LOG_DEBUG, EZ_TAG, __VA_ARGS__)
+#define printf_stderr B2GLOG
+#endif
+
+#endif
+
+#ifdef _MSC_VER
+#define EZ_NONE ""
+#define EZ_RED ""
+#define EZ_LIGHT_RED ""
+#define EZ_GREEN ""
+#define EZ_LIGHT_GREEN ""
+#define EZ_BLUE ""
+#define EZ_LIGHT_BLUE ""
+#define EZ_DARY_GRAY ""
+#define EZ_CYAN ""
+#define EZ_LIGHT_CYAN ""
+#define EZ_PURPLE ""
+#define EZ_LIGHT_PURPLE ""
+#define EZ_BROWN ""
+#define EZ_YELLOW ""
+#define EZ_LIGHT_GRAY ""
+#define EZ_WHITE ""
+
+#else
+#define EZ_NONE "\033[m"
+#define EZ_RED "\033[0;32;31m"
+#define EZ_LIGHT_RED "\033[1;31m"
+#define EZ_GREEN "\033[0;32;32m"
+#define EZ_LIGHT_GREEN "\033[1;32m"
+#define EZ_BLUE "\033[0;32;34m"
+#define EZ_LIGHT_BLUE "\033[1;34m"
+#define EZ_DARY_GRAY "\033[1;30m"
+#define EZ_CYAN "\033[0;36m"
+#define EZ_LIGHT_CYAN "\033[1;36m"
+#define EZ_PURPLE "\033[0;35m"
+#define EZ_LIGHT_PURPLE "\033[1;35m"
+#define EZ_BROWN "\033[0;33m"
+#define EZ_YELLOW "\033[1;33m"
+#define EZ_LIGHT_GRAY "\033[0;37m"
+#define EZ_WHITE "\033[1;37m"
+#endif
+
+static const char* EZ_TAG = "EZLOG";
+
+#define EXPAND(x) x
+#define EXPAND2(x, y) x, y
+#define CONCATENATE(x, y) x##y
+#define NARG(...) NARG_(__VA_ARGS__, RSEQ_N())
+#define NARG_(...) EXPAND(ARG_N(__VA_ARGS__))
+#define ARG_N(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, \
+              _11, _12, _13, _14, _15, _16, N, ...) N
+#define RSEQ_N() 16, 15, 14, 13, 12, 11, \
+                 10, 9, 8, 7, 6, 5, 4, 3, 2, 1
+
+#define EXTEND(...) EXPAND(EXTEND_(NARG(__VA_ARGS__), __VA_ARGS__))
+#define EXTEND_(N, ...) EXPAND(CONCATENATE(EXTEND_, N)(__VA_ARGS__))
+#define EXTEND_1(x, ...) EXPAND(std::make_pair((x), #x))
+#define EXTEND_2(x, ...) EXPAND2(EXTEND_1(x), EXTEND_1(__VA_ARGS__))
+#define EXTEND_3(x, ...) EXPAND2(EXTEND_1(x), EXTEND_2(__VA_ARGS__))
+#define EXTEND_4(x, ...) EXPAND2(EXTEND_1(x), EXTEND_3(__VA_ARGS__))
+#define EXTEND_5(x, ...) EXPAND2(EXTEND_1(x), EXTEND_4(__VA_ARGS__))
+#define EXTEND_6(x, ...) EXPAND2(EXTEND_1(x), EXTEND_5(__VA_ARGS__))
+#define EXTEND_7(x, ...) EXPAND2(EXTEND_1(x), EXTEND_6(__VA_ARGS__))
+#define EXTEND_8(x, ...) EXPAND2(EXTEND_1(x), EXTEND_7(__VA_ARGS__))
+#define EXTEND_9(x, ...) EXPAND2(EXTEND_1(x), EXTEND_8(__VA_ARGS__))
+#define EXTEND_10(x, ...) EXPAND2(EXTEND_1(x), EXTEND_9(__VA_ARGS__))
+#define EXTEND_11(x, ...) EXPAND2(EXTEND_1(x), EXTEND_10(__VA_ARGS__))
+#define EXTEND_12(x, ...) EXPAND2(EXTEND_1(x), EXTEND_11(__VA_ARGS__))
+#define EXTEND_13(x, ...) EXPAND2(EXTEND_1(x), EXTEND_12(__VA_ARGS__))
+#define EXTEND_14(x, ...) EXPAND2(EXTEND_1(x), EXTEND_13(__VA_ARGS__))
+#define EXTEND_15(x, ...) EXPAND2(EXTEND_1(x), EXTEND_14(__VA_ARGS__))
+#define EXTEND_16(x, ...) EXPAND2(EXTEND_1(x), EXTEND_15(__VA_ARGS__))
+
+#if defined(MOZ_XUL) && defined(MOZILLA_INTERNAL_API) // GECKO only
+
+#define EZ_LIGHT_RED_WITH_TAG "\033[0;32;31m [EZLOG] "
+#define EZ_LIGHT_BLUE_WITH_TAG "\033[1;34m [EZLOG] "
+
+#include "nsLiteralString.h"
+#include "nsStringFwd.h"
+#include "nsString.h"
+#include "nsError.h" // For nsresult
+#include "nsDebug.h" //For printf_stderr
+#include "nsPrintfCString.h" //For nsPrintfCString
+#ifdef NS_WARNING_COLOR
+#undef NS_WARNING
+#define NS_WARNING(str)                                       \
+    NS_DebugBreak(NS_DEBUG_WARNING, nsPrintfCString("%s%s%s", EZ_LIGHT_RED_WITH_TAG, str, "\033[m").get(), nullptr, __FILE__, __LINE__)
+#endif
+
+#ifdef MOZ_LOG_886
+#undef MOZ_LOG
+#define REAL_LOG(F, X...) printf_stderr(EZ_LIGHT_BLUE_WITH_TAG F "\n\033[m", ##X)
+#define MOZ_LOG(_module,_level, arg) REAL_LOG arg
+#endif
+
+/*
+nsString foo = NS_LITERAL_STRING
+nsCString bar = NS_LITERAL_CSTRING
+
+*/
+namespace {
+  nsAutoCString ToPrintable(const nsAString& aAString)
+  {
+    return NS_ConvertUTF16toUTF8(aAString);
+  }
+  nsPromiseFlatCString ToPrintable(const nsACString& aACString)
+  {
+    return nsPromiseFlatCString(aACString);
+  }
+  // For nsTArrya<T>
+  template<class T>
+  void printInternal(const nsTArray<T>& aArray, const char* const aObjName)
+  {
+    int index = 0;
+    for (auto itr = aArray.begin(); itr != aArray.end(); itr++)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << index << "] = " << *itr << "\n";
+      printf_stderr("%s", ss.str().c_str());
+      index++;
+    }
+  }
+
+  template<>
+  void printInternal(const nsTArray<nsAString>& aArray, const char* const aObjName)
+  {
+    int index = 0;
+    for (auto itr = aArray.begin(); itr != aArray.end(); itr++)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << index << "] = " << NS_ConvertUTF16toUTF8(*itr).get() << "\n";
+      printf_stderr("%s", ss.str().c_str());
+      index++;
+    }
+  }
+
+  template<>
+  void printInternal(const nsTArray<nsString>& aArray, const char* const aObjName)
+  {
+    int index = 0;
+    for (auto itr = aArray.begin(); itr != aArray.end(); itr++)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << index << "] = " << NS_ConvertUTF16toUTF8(*itr).get() << "\n";
+      printf_stderr("%s", ss.str().c_str());
+      index++;
+    }
+  }
+
+  template<>
+  void printInternal(const nsTArray<nsACString>& aArray, const char* const aObjName)
+  {
+    int index = 0;
+    for (auto itr = aArray.begin(); itr != aArray.end(); itr++)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << index << "] = " << nsPromiseFlatCString(*itr).get() << "\n";
+      printf_stderr("%s", ss.str().c_str());
+      index++;
+    }
+  }
+
+  template<>
+  void printInternal(const nsTArray<nsCString>& aArray, const char* const aObjName)
+  {
+    int index = 0;
+    for (auto itr = aArray.begin(); itr != aArray.end(); itr++)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << index << "] = " << (*itr).get() << "\n";
+      printf_stderr("%s", ss.str().c_str());
+      index++;
+    }
+  }
+
+  template<>
+  void printInternal(const nsTArray<uint8_t>& aArray, const char* const aObjName)
+  {
+    std::vector<uint8_t> vec;
+    // deep copy it, since I don't know if nsTArray stores data consecutively or not.
+    for (auto itr = aArray.begin(); itr != aArray.end(); itr++)
+    {
+      vec.push_back(*itr);
+    }
+    auto hexString = bin2hex(vec);
+    printf_stderr("%s = %s, unsigned nsTArray length = %d", aObjName, hexString.c_str(), vec.size());
+  }
+
+  template<>
+  void printInternal(const nsTArray<char>& aArray, const char* const aObjName)
+  {
+    std::vector<char> vec;
+    // deep copy it, since I don't know if nsTArray stores data consecutively or not.
+    for (auto itr = aArray.begin(); itr != aArray.end(); itr++)
+    {
+      vec.push_back(*itr);
+    }
+    auto hexString = bin2hex(vec);
+    printf_stderr("%s = %s, signed nsTArray length = %d", aObjName, hexString.c_str(), vec.size());
+  }
+
+  // For nsAutoString
+  void printInternal(const nsAutoString& aAutoStr, const char* const aObjName)
+  {
+    printf_stderr("%s = %s", aObjName, NS_ConvertUTF16toUTF8(aAutoStr).get());
+  }
+
+  // For nsAutoCString
+  void printInternal(const nsAutoCString& aAutoCStr, const char* const aObjName)
+  {
+    printf_stderr("%s = %s", aObjName, aAutoCStr.get());
+  }
+
+  // For nsACString
+  void printInternal(const nsACString& aACStr, const char* const aObjName)
+  {
+    printf_stderr("nsACString %s = %s", aObjName, nsPromiseFlatCString(aACStr).get());
+  }
+  // For nsAString
+  void printInternal(const nsAString& aAStr, const char* const aObjName)
+  {
+    // printf_stderr("nsAString %s = %s", aObjName,
+    //   NS_ConvertUTF16toUTF8(nsPromiseFlatString(aAStr).get()).get());
+    printf_stderr("nsAString %s = %s", aObjName,
+       NS_ConvertUTF16toUTF8(aAStr).get());
+  }
+
+  void printInternal(nsresult aRes, const char* const aObjName)
+  {
+    printf_stderr("%s = %x", aObjName, static_cast<uint32_t>(aRes));
+  }
+} // namespace
+#endif //defined(MOZ_XUL) && defined(MOZILLA_INTERNAL_API)
+namespace {
+  template<class T>
+  void printInternal(const std::vector<T>& aVec, const char* const aObjName)
+  {
+    int index = 0;
+    for (auto itr = aVec.begin(); itr != aVec.end(); itr++)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << index << "] = " << *itr << "\n";
+      printf_stderr("%s", ss.str().c_str());
+      index++;
+    }
+  }
+
+  template<>
+  void printInternal(const std::vector<uint8_t>& aVec, const char* const aObjName)
+  {
+    auto hexString = bin2hex(aVec);
+    printf_stderr("%s = %s, unsgined vector length = %lu", aObjName, hexString.c_str(), aVec.size());
+  }
+
+  template<>
+  void printInternal(const std::vector<char>& aVec, const char* const aObjName)
+  {
+    auto hexString = bin2hex(aVec);
+    printf_stderr("%s = %s, signed vector length = %lu", aObjName, hexString.c_str(), aVec.size());
+  }
+
+  template<class Key, class Value>
+  void printInternal(const std::map<Key, Value> aMap, const char* const aObjName)
+  {
+    for (auto& pair : aMap)
+    {
+      std:: ostringstream ss;
+      ss << aObjName << "[" << pair.first << ", " << pair.second << "]\n";
+      printf_stderr("%s",ss.str().c_str());
+    }
+  }
+#ifdef MOZ_WIDGET_GONK
+  template<class Key, class Value>
+  void printInternal(const std::tr1::unordered_map<Key, Value> aMap, const char* const aObjName)
+  {
+    for (auto& pair : aMap)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << pair.first << ", " << pair.second << "]\n";
+      printf_stderr("%s",ss.str().c_str());
+    }
+  }
+#else
+  template<class Key, class Value>
+  void printInternal(const std::unordered_map<Key, Value> aMap, const char* const aObjName)
+  {
+    for (auto& pair : aMap)
+    {
+      std::ostringstream ss;
+      ss << aObjName << "[" << pair.first << ", " << pair.second << "]\n";
+      printf_stderr("%s",ss.str().c_str());
+    }
+  }
+#endif
+  // For std string
+  void printInternal(std::string aStdStr, const char* const aObjName)
+  {
+    printf_stderr("%s = %s", aObjName, aStdStr.c_str());
+  }
+  // For pointer
+  void printInternal(void* aPtr, const char* const aObjName)
+  {
+    printf_stderr("%s = %p", aObjName, aPtr);
+  }
+  // For c style string
+  void printInternal(const char* aStr, const char* const aObjName)
+  {
+    printf_stderr("%s = %s", aObjName, aStr);
+    printf_stderr("hex form %s = %s", aObjName, bin2hex(aStr, strlen(aStr)).c_str());
+  }
+  void printInternal(const unsigned char* aStr, const char* const aObjName)
+  {
+    printf_stderr("%s = %s", aObjName, aStr);
+    printf_stderr("hex form %s = %s", aObjName, bin2hex(aStr, strlen(reinterpret_cast<const char*>(aStr))).c_str());
+  }
+  // For float
+  void printInternal(float aVal, const char* const aObjName)
+  {
+    printf_stderr("%s = %f", aObjName, aVal);
+  }
+  // For double
+  void printInternal(double aVal, const char* const aObjName)
+  {
+    printf_stderr("%s = %lf", aObjName, aVal);
+  }
+  // For bool
+  void printInternal(bool aVal, const char* const aObjName)
+  {
+    printf_stderr("%s = %d", aObjName, aVal);
+  }
+  // For int32_t
+  void printInternal(int32_t aVal, const char* const aObjName)
+  {
+    printf_stderr("%s = %d", aObjName, aVal);
+  }
+  // For uint32_t
+  void printInternal(uint32_t aVal, const char* const aObjName)
+  {
+    printf_stderr("%s = %u", aObjName, aVal);
+  }
+  // For uint64_t
+  void printInternal(uint64_t aVal, const char* const aObjName)
+  {
+    printf_stderr("%s =%" PRIu64, aObjName, aVal);
+  }
+  // For int64_t
+  void printInternal(int64_t aVal, const char* const aObjName)
+  {
+    printf_stderr("%s = %" PRId64, aObjName, aVal);
+  }
+
+  void ezPrint() {
+    printf_stderr(EZ_NONE"\n");
+  }
+
+  template<class Type>
+  void ezPrint(
+    const std::pair<Type, const char *> &arg) {
+    printInternal(arg.first, arg.second);
+    ezPrint();
+  }
+
+  template<class Type, class... Types>
+  void ezPrint(
+    const std::pair<Type, const char *> &arg,
+    const std::pair<Types, const char *> &... args) {
+    // first is the real object, second is the object variable name.
+    printInternal(arg.first, arg.second);
+    printf_stderr(", ");
+    ezPrint(args...);
+  }
+
+  template<class... Types>
+  void PInternal(const char* aColor, const char* aFileName, const int aLineNum, Types&&...  aArgs)
+  {
+    printf_stderr("[%s] %s%s(%d) ", EZ_TAG, aColor, aFileName, aLineNum);
+#if defined(MOZ_XUL) // GECKO only
+    ezPrint(mozilla::Forward<Types>(aArgs)...);
+#else
+    ezPrint(std::forward<Types>(aArgs)...);
+#endif
+  }
+} //namespace
+
+// #ifdef _MSC_VER
+// #define FUNC_NAME __FUNCSIG__
+// #else
+// #define FUNC_NAME __PRETTY_FUNCTION__
+// #endif
+#define FUNC_NAME __func__
+
+#define P(...) PInternal("", FUNC_NAME, __LINE__, EXTEND(__VA_ARGS__))
+#define PR(...) PInternal(EZ_LIGHT_RED, FUNC_NAME, __LINE__, EXTEND(__VA_ARGS__))
+#define PG(...) PInternal(EZ_LIGHT_GREEN, FUNC_NAME, __LINE__, EXTEND(__VA_ARGS__))
+#define PB(...) PInternal(EZ_LIGHT_BLUE, FUNC_NAME, __LINE__, EXTEND(__VA_ARGS__))
+#define PX(EZ_COLOR, ...) PInternal(EZ_COLOR, FUNC_NAME, __LINE__, EXTEND(__VA_ARGS__))
+
+#define P0(...) PInternal("", FUNC_NAME, __LINE__)
+#define PR0(...) PInternal(EZ_LIGHT_RED, FUNC_NAME, __LINE__)
+#define PG0(...) PInternal(EZ_LIGHT_GREEN, FUNC_NAME, __LINE__)
+#define PB0(...) PInternal(EZ_LIGHT_BLUE, FUNC_NAME, __LINE__)
+#define PX0(EZ_COLOR, ...) PInternal(EZ_COLOR, FUNC_NAME, __LINE__)
+
+#endif
\ No newline at end of file
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -10,16 +10,17 @@ with Files('nsString*'):
 DIRS += ['standalone']
 
 # On win we build two glue libs - glue linked to crt dlls here and in staticruntime we build
 # a statically linked glue lib.
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['staticruntime']
 
 EXPORTS += [
+    'ezlogger.h',
     'MainThreadUtils.h',
     'nsArrayEnumerator.h',
     'nsArrayUtils.h',
     'nsBaseHashtable.h',
     'nsCategoryCache.h',
     'nsClassHashtable.h',
     'nsCOMArray.h',
     'nsComponentManagerUtils.h',