Add file and line number to THError.

Author: adamlerer

THGeneral.c

@@ -21,9 +21,12 @@ void THError(const char *fmt, ...)
  /* vasprintf not standard */
  /* vsnprintf: how to handle if does not exists? */
  va_start(args, fmt);
- vsnprintf(msg, 1024, fmt, args);
+ int n = vsnprintf(msg, 1024, fmt, args);
  va_end(args);
 
+ if(n < 1024) {
+ snprintf(msg + n, 1024 - n, "\nat %s:%d", file, line);
+ }
  (*torchErrorHandlerFunction)(msg, torchErrorHandlerData);
 }
 

THGeneral.h.in

@@ -44,14 +44,16 @@
 #endif
 
 TH_API double THLog1p(const double x);
-TH_API void THError(const char *fmt, ...);
+TH_API void _THError(const char *file, const int line, const char *fmt, ...);
 TH_API void THSetErrorHandler( void (*torchErrorHandlerFunction)(const char *msg, void *data), void *data );
 TH_API void THArgCheck(int condition, int argNumber, const char *msg);
 TH_API void THSetArgErrorHandler( void (*torchArgErrorHandlerFunction)(int argNumber, const char *msg, void *data), void *data );
 TH_API void* THAlloc(long size);
 TH_API void* THRealloc(void *ptr, long size);
 TH_API void THFree(void *ptr);
 
+#define THError(...) _THError(__FILE__, __LINE__, __VA_ARGS__)
+
 #define TH_CONCAT_STRING_2(x,y) TH_CONCAT_STRING_2_EXPAND(x,y)
 #define TH_CONCAT_STRING_2_EXPAND(x,y) #x #y