X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=ebb7c046b7831c7d1624d1ac07db7709d6d91307;hb=d20f2d026f441ad855a26bcf2e53bc8ef4c3faf7;hp=7d3e1e5104541b30f2258798d873c51d8e5478dd;hpb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;p=dcpomatic.git

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 7d3e1e510..ebb7c046b 100644
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -22,41 +22,6 @@
  *  @brief Some utility functions and classes.
  */
 
-#include <iomanip>
-#include <iostream>
-#include <fstream>
-#include <climits>
-#include <stdexcept>
-#ifdef DCPOMATIC_POSIX
-#include <execinfo.h>
-#include <cxxabi.h>
-#endif
-#include <libssh/libssh.h>
-#include <signal.h>
-#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#ifdef DCPOMATIC_WINDOWS
-#include <boost/locale.hpp>
-#endif
-#include <glib.h>
-#include <openjpeg.h>
-#include <pangomm/init.h>
-#include <magick/MagickCore.h>
-#include <magick/version.h>
-#include <dcp/version.h>
-#include <dcp/util.h>
-#include <dcp/signer.h>
-#include <dcp/raw_convert.h>
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libavformat/avformat.h>
-#include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
-#include <libavutil/pixfmt.h>
-}
 #include "util.h"
 #include "exceptions.h"
 #include "scaler.h"
@@ -72,8 +37,46 @@ extern "C" {
 #include "md5_digester.h"
 #include "audio_processor.h"
 #include "safe_stringstream.h"
+#include <dcp/version.h>
+#include <dcp/util.h>
+#include <dcp/signer.h>
+#include <dcp/raw_convert.h>
+extern "C" {
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
+#include <libswscale/swscale.h>
+#include <libavfilter/avfiltergraph.h>
+#include <libavutil/pixfmt.h>
+}
+#include <glib.h>
+#include <openjpeg.h>
+#include <pangomm/init.h>
+#ifdef DCPOMATIC_IMAGE_MAGICK
+#include <magick/MagickCore.h>
+#else
+#include <magick/common.h>
+#include <magick/magick_config.h>
+#endif
+#include <magick/version.h>
+#include <libssh/libssh.h>
+#include <boost/algorithm/string.hpp>
+#include <boost/bind.hpp>
+#include <boost/lambda/lambda.hpp>
+#include <boost/thread.hpp>
+#include <boost/filesystem.hpp>
 #ifdef DCPOMATIC_WINDOWS
-#include "stack.hpp"
+#include <boost/locale.hpp>
+#include <dbghelp.h>
+#endif
+#include <signal.h>
+#include <iomanip>
+#include <iostream>
+#include <fstream>
+#include <climits>
+#include <stdexcept>
+#ifdef DCPOMATIC_POSIX
+#include <execinfo.h>
+#include <cxxabi.h>
 #endif
 
 #include "i18n.h"
@@ -83,20 +86,14 @@ using std::setfill;
 using std::ostream;
 using std::endl;
 using std::vector;
-using std::hex;
-using std::setw;
-using std::ios;
 using std::min;
 using std::max;
 using std::list;
 using std::multimap;
-using std::map;
 using std::istream;
-using std::numeric_limits;
 using std::pair;
 using std::cout;
 using std::bad_alloc;
-using std::streampos;
 using std::set_terminate;
 using boost::shared_ptr;
 using boost::thread;
@@ -104,6 +101,10 @@ using boost::optional;
 using dcp::Size;
 using dcp::raw_convert;
 
+/** Path to our executable, required by the stacktrace stuff and filled
+ *  in during App::onInit().
+ */
+string program_name;
 static boost::thread::id ui_thread;
 static boost::filesystem::path backtrace_file;
 
@@ -125,9 +126,9 @@ seconds_to_hms (int s)
 	SafeStringStream hms;
 	hms << h << N_(":");
 	hms.width (2);
-	hms << std::setfill ('0') << m << N_(":");
+	hms << setfill ('0') << m << N_(":");
 	hms.width (2);
-	hms << std::setfill ('0') << s;
+	hms << setfill ('0') << s;
 
 	return hms.str ();
 }
@@ -151,14 +152,11 @@ seconds_to_approximate_hms (int s)
 
 	if (hours) {
 		if (m > 30 && !minutes) {
-			ap << (h + 1) << N_(" ") << _("hours");
+			/// TRANSLATORS: h here is an abbreviation for hours
+			ap << (h + 1) << _("h");
 		} else {
-			ap << h << N_(" ");
-			if (h == 1) {
-				ap << _("hour");
-			} else {
-				ap << _("hours");
-			}
+			/// TRANSLATORS: h here is an abbreviation for hours
+			ap << h << _("h");
 		}
 
 		if (minutes | seconds) {
@@ -169,14 +167,11 @@ seconds_to_approximate_hms (int s)
 	if (minutes) {
 		/* Minutes */
 		if (s > 30 && !seconds) {
-			ap << (m + 1) << N_(" ") << _("minutes");
+			/// TRANSLATORS: m here is an abbreviation for minutes
+			ap << (m + 1) << _("m");
 		} else {
-			ap << m << N_(" ");
-			if (m == 1) {
-				ap << _("minute");
-			} else {
-				ap << _("minutes");
-			}
+			/// TRANSLATORS: m here is an abbreviation for minutes
+			ap << m << _("m");
 		}
 
 		if (seconds) {
@@ -186,12 +181,8 @@ seconds_to_approximate_hms (int s)
 
 	if (seconds) {
 		/* Seconds */
-		ap << s << N_(" ");
-		if (s == 1) {
-			ap << _("second");
-		} else {
-			ap << _("seconds");
-		}
+		/// TRANSLATORS: s here is an abbreviation for seconds
+		ap << s << _("s");
 	}
 
 	return ap.str ();
@@ -274,20 +265,85 @@ seconds (struct timeval t)
 }
 
 #ifdef DCPOMATIC_WINDOWS
-LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *)
+
+/** Resolve symbol name and source location given the path to the executable */
+int
+addr2line (void const * const addr)
+{
+	char addr2line_cmd[512] = { 0 };
+	sprintf (addr2line_cmd, "addr2line -f -p -e %.256s %p > %s", program_name.c_str(), addr, backtrace_file.string().c_str()); 
+	return system(addr2line_cmd);
+}
+
+/** This is called when C signals occur on Windows (e.g. SIGSEGV)
+ *  (NOT C++ exceptions!).  We write a backtrace to backtrace_file by dark means.
+ *  Adapted from code here: http://spin.atomicobject.com/2013/01/13/exceptions-stack-traces-c/
+ */
+LONG WINAPI
+exception_handler(struct _EXCEPTION_POINTERS * info)
 {
-	dbg::stack s;
 	FILE* f = fopen_boost (backtrace_file, "w");
-	fprintf (f, "Exception thrown:");
-	for (dbg::stack::const_iterator i = s.begin(); i != s.end(); ++i) {
-		fprintf (f, "%p %s %d %s\n", i->instruction, i->function.c_str(), i->line, i->module.c_str());
+	fprintf (f, "C-style exception %d\n", info->ExceptionRecord->ExceptionCode);
+	fclose(f);
+	
+	if (info->ExceptionRecord->ExceptionCode != EXCEPTION_STACK_OVERFLOW) {
+		CONTEXT* context = info->ContextRecord;
+		SymInitialize (GetCurrentProcess (), 0, true);
+		
+		STACKFRAME frame = { 0 };
+		
+		/* setup initial stack frame */
+#if _WIN64
+		frame.AddrPC.Offset    = context->Rip;
+		frame.AddrStack.Offset = context->Rsp;
+		frame.AddrFrame.Offset = context->Rbp;
+#else  
+		frame.AddrPC.Offset    = context->Eip;
+		frame.AddrStack.Offset = context->Esp;
+		frame.AddrFrame.Offset = context->Ebp;
+#endif
+		frame.AddrPC.Mode      = AddrModeFlat;
+		frame.AddrStack.Mode   = AddrModeFlat;
+		frame.AddrFrame.Mode   = AddrModeFlat;
+		
+		while (
+			StackWalk (
+				IMAGE_FILE_MACHINE_I386,
+				GetCurrentProcess (),
+				GetCurrentThread (),
+				&frame,
+				context,
+				0,
+				SymFunctionTableAccess,
+				SymGetModuleBase,
+				0
+				)
+			) {
+			addr2line((void *) frame.AddrPC.Offset);
+		}
+	} else {
+#ifdef _WIN64          
+		addr2line ((void *) info->ContextRecord->Rip);
+#else          
+		addr2line ((void *) info->ContextRecord->Eip);
+#endif         
 	}
-	fclose (f);
+	
 	return EXCEPTION_CONTINUE_SEARCH;
 }
 #endif
 
-/* From http://stackoverflow.com/questions/2443135/how-do-i-find-where-an-exception-was-thrown-in-c */
+void
+set_backtrace_file (boost::filesystem::path p)
+{
+	backtrace_file = p;
+}
+
+/** This is called when there is an unhandled exception.  Any
+ *  backtrace in this function is useless on Windows as the stack has
+ *  already been unwound from the throw; we have the gdb wrap hack to
+ *  cope with that.
+ */
 void
 terminate ()
 {
@@ -322,8 +378,9 @@ void
 dcpomatic_setup ()
 {
 #ifdef DCPOMATIC_WINDOWS
-	backtrace_file /= g_get_user_config_dir ();
-	backtrace_file /= "backtrace.txt";
+	boost::filesystem::path p = g_get_user_config_dir ();
+	p /= "backtrace.txt";
+	set_backtrace_file (p);
 	SetUnhandledExceptionFilter(exception_handler);
 
 	/* Dark voodoo which, I think, gets boost::filesystem::path to
@@ -472,7 +529,10 @@ md5_digest (vector<boost::filesystem::path> files, shared_ptr<Job> job)
 
 		while (remaining > 0) {
 			int const t = min (remaining, buffer_size);
-			fread (buffer, 1, t, f);
+			int const r = fread (buffer, 1, t, f);
+			if (r != t) {
+				throw ReadFileError (files[i], errno);
+			}
 			digester.add (buffer, t);
 			remaining -= t;
 
@@ -562,7 +622,7 @@ Socket::accept (int port)
 	_acceptor->async_accept (_socket, boost::lambda::var(ec) = boost::lambda::_1);
 	do {
 		_io_service.run_one ();
-	} while (ec == boost::asio::error::would_block );
+	} while (ec == boost::asio::error::would_block);
 
 	delete _acceptor;
 	_acceptor = 0;
@@ -649,7 +709,7 @@ stride_round_up (int c, int const * stride, int t)
 int
 round_to (float n, int r)
 {
-	assert (r == 1 || r == 2 || r == 4);
+	DCPOMATIC_ASSERT (r == 1 || r == 2 || r == 4);
 	return int (n + float(r) / 2) &~ (r - 1);
 }
 
@@ -754,18 +814,17 @@ get_optional_int (multimap<string, string> const & kv, string k)
 void
 ensure_ui_thread ()
 {
-	assert (boost::this_thread::get_id() == ui_thread);
+	DCPOMATIC_ASSERT (boost::this_thread::get_id() == ui_thread);
 }
 
 string
 audio_channel_name (int c)
 {
-	assert (MAX_DCP_AUDIO_CHANNELS == 12);
+	DCPOMATIC_ASSERT (MAX_DCP_AUDIO_CHANNELS == 12);
 
-	/* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
-	   enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and
-	   VI is the visually-impaired audio track (audio describe).
-	*/
+	/// TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency
+	/// enhancement channel (sub-woofer).  HI is the hearing-impaired audio track and
+	/// VI is the visually-impaired audio track (audio describe).
 	string const channels[] = {
 		_("Left"),
 		_("Right"),
@@ -789,7 +848,19 @@ valid_image_file (boost::filesystem::path f)
 {
 	string ext = f.extension().string();
 	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-	return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx");
+	return (
+		ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" ||
+		ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" ||
+		ext == ".j2c" || ext == ".j2k"
+		);
+}
+
+bool
+valid_j2k_file (boost::filesystem::path f)
+{
+	string ext = f.extension().string();
+	transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+	return (ext == ".j2k" || ext == ".j2c");
 }
 
 string
@@ -807,52 +878,6 @@ tidy_for_filename (string f)
 	return t;
 }
 
-map<string, string>
-split_get_request (string url)
-{
-	enum {
-		AWAITING_QUESTION_MARK,
-		KEY,
-		VALUE
-	} state = AWAITING_QUESTION_MARK;
-	
-	map<string, string> r;
-	string k;
-	string v;
-	for (size_t i = 0; i < url.length(); ++i) {
-		switch (state) {
-		case AWAITING_QUESTION_MARK:
-			if (url[i] == '?') {
-				state = KEY;
-			}
-			break;
-		case KEY:
-			if (url[i] == '=') {
-				v.clear ();
-				state = VALUE;
-			} else {
-				k += url[i];
-			}
-			break;
-		case VALUE:
-			if (url[i] == '&') {
-				r.insert (make_pair (k, v));
-				k.clear ();
-				state = KEY;
-			} else {
-				v += url[i];
-			}
-			break;
-		}
-	}
-
-	if (state == VALUE) {
-		r.insert (make_pair (k, v));
-	}
-
-	return r;
-}
-
 dcp::Size
 fit_ratio_within (float ratio, dcp::Size full_frame, int round)
 {