archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-04 05:51:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fill log with \n

Browse source
This commit is contained in:
Nekotekina 2017-08-29 17:09:06 +03:00
parent 64a6fbe39f
commit a771fcb397
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Utilities/File.cpp
View file

@ -765,10 +765,10 @@ fs::file::file(const std::string& path, bs_t<open_mode> mode)
disp = test(mode & fs::trunc) ? TRUNCATE_EXISTING : OPEN_EXISTING; disp = test(mode & fs::trunc) ? TRUNCATE_EXISTING : OPEN_EXISTING;
} }
DWORD share = 0; DWORD share = FILE_SHARE_READ;
if (!test(mode & fs::unshare)) if (!test(mode & fs::unshare))
{ {
share |= FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE; share |= FILE_SHARE_WRITE | FILE_SHARE_DELETE;
} }
const HANDLE handle = CreateFileW(to_wchar(path).get(), access, share, NULL, disp, FILE_ATTRIBUTE_NORMAL, NULL); const HANDLE handle = CreateFileW(to_wchar(path).get(), access, share, NULL, disp, FILE_ATTRIBUTE_NORMAL, NULL);

8
Utilities/Log.cpp
View file

@ -56,6 +56,7 @@ namespace logs
class file_writer class file_writer
{ {
fs::file m_file; fs::file m_file;
std::string m_name;
#ifdef _WIN32 #ifdef _WIN32
::HANDLE m_fmap; ::HANDLE m_fmap;
@ -286,12 +287,13 @@ void logs::message::broadcast(const char* fmt, const fmt_type_info* sup, const u
[[noreturn]] extern void catch_all_exceptions(); [[noreturn]] extern void catch_all_exceptions();
logs::file_writer::file_writer(const std::string& name) logs::file_writer::file_writer(const std::string& name)
: m_name(fs::get_config_dir() + name)
{ {
try try
{ {
if (!m_file.open(fs::get_config_dir() + name, fs::read + fs::write + fs::create + fs::trunc + fs::unshare)) if (!m_file.open(m_name, fs::read + fs::write + fs::create + fs::trunc + fs::unshare))
{ {
fmt::throw_exception("Can't create log file %s (error %s)", name, fs::g_tls_error); fmt::throw_exception("Can't create file %s (error %s)", name, fs::g_tls_error);
} }
#ifdef _WIN32 #ifdef _WIN32
@ -301,6 +303,8 @@ logs::file_writer::file_writer(const std::string& name)
m_file.trunc(s_log_size); m_file.trunc(s_log_size);
m_fptr = (uchar*)::mmap(0, s_log_size, PROT_READ | PROT_WRITE, MAP_SHARED, m_file.get_handle(), 0); m_fptr = (uchar*)::mmap(0, s_log_size, PROT_READ | PROT_WRITE, MAP_SHARED, m_file.get_handle(), 0);
#endif #endif
std::memset(m_fptr, '\n', s_log_size);
} }
catch (...) catch (...)
{ {