github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 14:16:07 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

uppsrc: docs & removed #ifdef MTs

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13925 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2020-01-21 10:05:16 +00:00
parent 8005b4dfde
commit 58e0fdebaf
22 changed files with 49 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

4
uppsrc/Core/App.cpp
View file

@ -431,11 +431,7 @@ void AppInit__(int argc, const char **argv)
void AppExit__()
{
#ifdef _MULTITHREADED
#ifndef COWORK2
Thread::ShutdownThreads();
#endif
#endif
sMainRunning = false;
#ifdef PLATFORM_POSIX
MemoryIgnoreLeaksBegin(); // Qt leaks on app exit...

11
uppsrc/Core/Atomic.h
View file

@ -1,15 +1,4 @@
#ifdef _MULTITHREADED
typedef std::atomic<int> Atomic;
inline int AtomicInc(volatile Atomic& t) { return ++t; }
inline int AtomicDec(volatile Atomic& t) { return --t; }
#else
typedef int Atomic;
inline int AtomicInc(volatile Atomic& t) { ++t; return t; }
inline int AtomicDec(volatile Atomic& t) { --t; return t; }
#endif

4
uppsrc/Core/CoWork.cpp
View file

@ -2,8 +2,6 @@
namespace Upp {
#ifdef _MULTITHREADED
#define LLOG(x) // RLOG(x)
#define LDUMP(x) // DDUMP(x)
@ -382,6 +380,4 @@ CoWork::~CoWork() noexcept(false)
LLOG("~CoWork " << FormatIntHex(this));
}
#endif
}

20
uppsrc/Core/CoWork.h
View file

@ -1,5 +1,3 @@
#ifdef _MULTITHREADED
class CoWork : NoCopy {
struct MJob : Moveable<MJob>, Link<MJob, 2> {
Function<void ()> fn;
@ -223,21 +221,3 @@ Async(Function&& f, Args&&... args)
h.Do(f, args...);
return pick(h);
}
#else
class CoWork : NoCopy {
public:
void Do(Event<> cb) { cb(); }
CoWork& operator&(Event<> cb) { cb(); return *this; }
void Finish() {}
bool IsFinished() { return true; }
static void FinLock() {}
static bool IsWorker() { return false; }
static void StartPool(int n) {}
static void ShutdownPool() {}
};
#endif

10
uppsrc/Core/Core.h
View file

@ -7,12 +7,10 @@
#define flagMT // MT is now always on
#endif
#if defined(flagMT)
#define _MULTITHREADED
#define MULTITHREADED
#ifdef flagDLL
#define flagUSEMALLOC
#endif
#define _MULTITHREADED
#define MULTITHREADED
#ifdef flagDLL
#define flagUSEMALLOC
#endif
#ifdef flagDLL

2
uppsrc/Core/SSL/InitExit.cpp
View file

@ -96,7 +96,7 @@ EXITBLOCK
ERR_free_strings();
}
#if defined(_MULTITHREADED) && OPENSSL_VERSION_NUMBER < 0x10100000L
#if OPENSSL_VERSION_NUMBER < 0x10100000L
static thread_local bool sThreadInit;
static thread_local void (*sPrevExit)();

8
uppsrc/Core/TimeDate.cpp
View file

@ -74,9 +74,7 @@ static char s_date_format_main[64] = "%2:02d/%3:02d/%1:4d";
void SetDateFormat(const char *fmt)
{
strncpy(s_date_format_thread, fmt, 63);
#ifdef _MULTITHREADED
if(Thread::IsMain())
#endif
strncpy(s_date_format_main, fmt, 63);
}
@ -93,10 +91,8 @@ static char s_date_scan_main[64] = "mdy";
void SetDateScan(const char *scan)
{
strncpy(s_date_scan_thread, scan, 63);
#ifdef _MULTITHREADED
if(Thread::IsMain())
#endif
strncpy(s_date_scan_main, scan, 63);
strncpy(s_date_scan_main, scan, 63);
}
const char *StrToDate(Date& d, const char *s, Date def)
@ -192,9 +188,7 @@ static char s_date_seps_main[64] = "A/\a .-";
void SetDateFilter(const char *seps)
{
strncpy(s_date_seps_thread, seps, 63);
#ifdef _MULTITHREADED
if(Thread::IsMain())
#endif
strncpy(s_date_seps_main, seps, 63);
}

2
uppsrc/Core/t.cpp
View file

@ -250,9 +250,7 @@ void SetCurrentLanguage(int lang)
int ii = sLangIndex().FindAdd(lang);
sCurrentLangMapPtr = &sLangMap().At(ii);
sCurrentSLangMapPtr = &sSLangMap().At(ii);
#ifdef _MULTITHREADED
if(Thread::IsMain())
#endif
{
main_current_lang = lang;
sMainCurrentSLangMapPtr = sCurrentSLangMapPtr;

12
uppsrc/CtrlCore/CtrlCore.h
View file

@ -52,7 +52,6 @@ namespace Upp {
INITIALIZE(CtrlCore)
#ifdef _MULTITHREADED
void EnterGuiMutex();
bool TryEnterGuiMutex();
void LeaveGuiMutex();
@ -62,15 +61,6 @@ void EnterGuiMutex(int n);
bool ThreadHasGuiLock();
int GetGuiLockLevel();
#else
inline void EnterGuiMutex() {}
inline void LeaveGuiMutex() {}
inline bool TryEnterGuiMutex() { return true; }
inline int LeaveGuiMutexAll() { return 0; }
inline void EnterGuiMutex(int) {}
inline bool ThreadHasGuiLock() { return true; }
#endif
struct GuiLock {
GuiLock() { EnterGuiMutex(); }
@ -1285,10 +1275,8 @@ public:
static void Call(Function<void ()> cb);
#ifdef _MULTITHREADED
static bool IsShutdownThreads() { return Thread::IsShutdownThreads(); }
static void ShutdownThreads();
#endif
static int64 GetEventId() { return eventid; }

11
uppsrc/CtrlCore/CtrlMt.cpp
View file

@ -4,8 +4,6 @@
namespace Upp {
#ifdef _MULTITHREADED
static StaticMutex sGLock;
static thread_local int sGLockLevel = 0;
@ -107,13 +105,4 @@ void Ctrl::ShutdownThreads()
Thread::EndShutdownThreads();
}
#else
void Ctrl::Call(Function<void ()> cb)
{
cb();
}
#endif
}

2
uppsrc/CtrlCore/GtkApp.cpp
View file

@ -77,9 +77,7 @@ void InitGtkApp(int argc, char **argv, const char **envptr)
void ExitGtkApp()
{
#ifdef _MULTITHREADED
LeaveGuiMutex();
#endif
}
}

41
uppsrc/CtrlCore/srcdoc.tpp/GuiMT_en-us.tpp Normal file
View file

@ -0,0 +1,41 @@
topic "GUI programming and multithreading";
[i448;a25;kKO9;2 $$1,0#37138531426314131252341829483380:class]
[l288;2 $$2,2#27521748481378242620020725143825:desc]
[0 $$3,0#96390100711032703541132217272105:end]
[H6;0 $$4,0#05600065144404261032431302351956:begin]
[i448;a25;kKO9;2 $$5,0#37138531426314131252341829483370:item]
[l288;a4;*@5;1 $$6,6#70004532496200323422659154056402:requirement]
[l288;i1121;b17;O9;~~~.1408;2 $$7,0#10431211400427159095818037425705:param]
[i448;b42;O9;2 $$8,8#61672508125594000341940100500538:tparam]
[b42;2 $$9,9#13035079074754324216151401829390:normal]
[a83;*R6 $$10,0#31310162474203024125188417583966:caption]
[2 $$0,0#00000000000000000000000000000000:Default]
[{_}%EN-US
[s10; GUI programming and multithreading&]
[s0; Multithreading in GUI programming model has to follow target
platform limitations, where most target platforms have a notion
of `"main thread`" and limit GUI actions allowed in non`-main
threads.&]
[s0; &]
[s0; Everything that is manipulating the status of top`-level windows
(TopWindow or popups) and everything related to event loop must
run on the main thread. The only non`-const operation allowed
to non`-main thread on top`-level windows is Refresh.&]
[s0; &]
[s0; Non`-main threads are in general allowed to alter the status
of widgets, as long as they serialize access with single global
GUI mutex, either with EnterGuiMutex/LeaveGuiMutex or with GuiLock
helper guard class (it calls EnterGuiMutex in constructor, LeaveGuiMutex
in destructor). GuiLock is reentrant and is optimized for great
reentrant performance. It is NOT required to use GuiLock in the
even processing methods (like MouseLeft or Key) as U`+`+ locks
it in this case itself.&]
[s0; &]
[s0; Other means of communication of non`-main threads with main
thread is PostCallback, which posts an Event to timer queue for
immediate processing, but does not wait for it to finish and
Ctrl`::Call, which passes event to main thread to be processed
and returns when the event is executed by the main thread. Both
of these methods have quite high latency, GuiLock and direct
access should be preferred if possible.&]
[s0; ]]

2
uppsrc/CtrlLib/Ch.cpp
View file

@ -142,7 +142,7 @@ Image MakeElement(Size sz, double radius, const Image& face, double border_width
Image MakeButton(int radius, const Image& face, double border_width, Color border_color, dword corner)
{
double q = radius + border_width + DPI(16);
return MakeElement(Size(q, q), radius, face, border_width, border_color, [&](Painter& w, const Rectf& r) {
return MakeElement(Size((int)q, (int)q), radius, face, border_width, border_color, [&](Painter& w, const Rectf& r) {
RoundedRect(w, r, radius, radius, corner);
});
}

4
uppsrc/CtrlLib/FileSel.cpp
View file

@ -863,8 +863,6 @@ void FileSel::SearchLoad()
StartLI();
}
#ifdef _MULTITHREADED
StaticMutex FileSel::li_mutex;
void (*FileSel::li_current)(const String& path, Image& result);
String FileSel::li_path;
@ -961,8 +959,6 @@ void FileSel::StartLI()
}
}
#endif
String TrimDot(String f) {
int i = f.Find('.');
if(i >= 0 && i == f.GetLength() - 1)

2
uppsrc/CtrlLib/FileSel.h
View file

@ -224,7 +224,6 @@ protected:
Ctrl *file_ctrl = NULL;
int file_ctrl_cx;
#ifdef _MULTITHREADED
static StaticMutex li_mutex;
static void (*li_current)(const String& path, Image& result);
static String li_path;
@ -238,7 +237,6 @@ protected:
void StartLI();
void DoLI();
void ScheduleLI() { li_tm.KillSet(0, THISBACK(DoLI)); }
#endif
void LoadNet();
void SelectNet();

4
uppsrc/IconDes/List.cpp
View file

@ -282,7 +282,6 @@ struct ImgPreview : Display {
}
};
#ifdef _MULTITHREADED
static void sLoadImage(const String& path, Image& result)
{
if(findarg(ToLower(GetFileExt(path)), ".png", ".gif", ".jpeg", ".jpg") < 0)
@ -298,7 +297,6 @@ static void sLoadImage(const String& path, Image& result)
return;
result = r->GetImage();
}
#endif
FileSel& IconDes::ImgFile()
{
@ -307,9 +305,7 @@ FileSel& IconDes::ImgFile()
sel.Type("Image files", "*.png *.bmp *.jpg *.jpeg *.gif *.ico");
sel.AllFilesType();
sel.Multi();
#ifdef _MULTITHREADED
sel.WhenIconLazy = sLoadImage;
#endif
sel.Preview(Single<ImgPreview>());
}
return sel;

4
uppsrc/plugin/lz4/Compress.cpp
View file

@ -30,14 +30,12 @@ void LZ4CompressStream::Alloc()
ptr = ~buffer;
}
#ifdef _MULTITHREADED
void LZ4CompressStream::Co(bool b)
{
FlushOut();
concurrent = b;
Alloc();
}
#endif
void LZ4CompressStream::FlushOut()
{
@ -51,13 +49,11 @@ void LZ4CompressStream::FlushOut()
int ii = 0;
for(byte *s = ~buffer; s < ptr; s += BLOCK_BYTES) {
int origsize = min((int)BLOCK_BYTES, int(ptr - s));
#ifdef _MULTITHREADED
if(concurrent)
co & [=] {
outsz[ii] = LZ4_compress_default((char *)s, (char *)t, origsize, osz);
};
else
#endif
outsz[ii] = LZ4_compress_default((char *)s, (char *)t, origsize, osz);
ii++;
t += osz;

9
uppsrc/plugin/lz4/Decompress.cpp
View file

@ -84,9 +84,7 @@ void LZ4DecompressStream::Fetch()
return;
if(eof)
return;
#ifdef _MULTITHREADED
CoWork co;
#endif
bool error = false;
bool last = false;
ii = 0;
@ -120,7 +118,6 @@ void LZ4DecompressStream::Fetch()
SetError();
return;
}
#ifdef _MULTITHREADED
if(concurrent)
co & [=, &error] {
Workblock& t = wb[i];
@ -129,9 +126,7 @@ void LZ4DecompressStream::Fetch()
if(t.dlen < 0)
error = true;
};
else
#endif
{
else {
t.dlen = LZ4_decompress_safe(~t.c, ~t.d, t.clen, maxblock);
if(t.dlen < 0)
error = true;
@ -140,10 +135,8 @@ void LZ4DecompressStream::Fetch()
if(lz4hdr & LZ4F_BLOCKCHECKSUM)
in->Get32le(); // just skip it
}
#ifdef _MULTITHREADED
if(concurrent)
co.Finish();
#endif
if(error)
SetError();
else {

6
uppsrc/plugin/lz4/lz4.h
View file

@ -50,9 +50,7 @@ protected:
void FlushOut();
public:
#ifdef _MULTITHREADED
void Co(bool b = true);
#endif
void Open(Stream& out_);
LZ4CompressStream();
@ -102,9 +100,7 @@ private:
public:
bool Open(Stream& in);
#ifdef _MULTITHREADED
void Co(bool b = true) { concurrent = b; }
#endif
LZ4DecompressStream();
LZ4DecompressStream(Stream& in) : LZ4DecompressStream() { Open(in); }
@ -120,7 +116,6 @@ String LZ4Compress(const String& s, Gate<int64, int64> progress = Null);
String LZ4Decompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
String LZ4Decompress(const String& s, Gate<int64, int64> progress = Null);
#ifdef _MULTITHREADED
int64 CoLZ4Compress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
int64 CoLZ4Decompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
String CoLZ4Compress(Stream& in, Gate<int64, int64> progress = Null);
@ -129,7 +124,6 @@ String CoLZ4Compress(const void *data, int64 len, Gate<int64, int64> progress =
String CoLZ4Compress(const String& s, Gate<int64, int64> progress = Null);
String CoLZ4Decompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
String CoLZ4Decompress(const String& s, Gate<int64, int64> progress = Null);
#endif
bool IsLZ4(Stream& s);

8
uppsrc/plugin/lz4/util.cpp
View file

@ -7,10 +7,8 @@ void sCompressStreamCopy_(Stream& out, Stream& in, Gate<int64, int64> progress,
static int64 sLZ4Compress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
{
LZ4CompressStream outs(out);
#ifdef _MULTITHREADED
if(co)
outs.Co();
#endif
sCompressStreamCopy_(outs, in, progress, in, size);
outs.Close();
if(!out.IsError() && !outs.IsError())
@ -21,10 +19,8 @@ static int64 sLZ4Compress(Stream& out, Stream& in, int64 size, Gate<int64, int64
static int64 sLZ4Decompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
{
LZ4DecompressStream ins(in);
#ifdef _MULTITHREADED
if(co)
ins.Co();
#endif
sCompressStreamCopy_(out, ins, progress, in, size);
ins.Close();
if(!out.IsError() && !ins.IsError())
@ -76,8 +72,6 @@ String LZ4Decompress(const String& s, Gate<int64, int64> progress)
return LZ4Decompress(~s, s.GetLength(), progress);
}
#ifdef _MULTITHREADED
int64 CoLZ4Compress(Stream& out, Stream& in, Gate<int64, int64> progress)
{
return sLZ4Compress(out, in, in.GetLeft(), progress, true);
@ -124,6 +118,4 @@ String CoLZ4Decompress(const String& s, Gate<int64, int64> progress)
return CoLZ4Decompress(~s, s.GetLength(), progress);
}
#endif
};

8
uppsrc/plugin/zstd/Util.cpp
View file

@ -7,10 +7,8 @@ void sCompressStreamCopy_(Stream& out, Stream& in, Gate<int64, int64> progress,
static int64 sZstdCompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
{
ZstdCompressStream outs(out);
#ifdef _MULTITHREADED
if(co)
outs.Co();
#endif
sCompressStreamCopy_(outs, in, progress, in, size);
outs.Close();
if(!out.IsError() && !outs.IsError())
@ -21,10 +19,8 @@ static int64 sZstdCompress(Stream& out, Stream& in, int64 size, Gate<int64, int6
static int64 sZstdDecompress(Stream& out, Stream& in, int64 size, Gate<int64, int64> progress, bool co)
{
ZstdDecompressStream ins(in);
#ifdef _MULTITHREADED
if(co)
ins.Co();
#endif
sCompressStreamCopy_(out, ins, progress, in, size);
ins.Close();
if(!out.IsError() && !ins.IsError())
@ -66,8 +62,6 @@ String ZstdDecompress(const String& s, Gate<int64, int64> progress)
return ZstdDecompress(~s, s.GetLength(), progress);
}
#ifdef _MULTITHREADED
int64 CoZstdCompress(Stream& out, Stream& in, Gate<int64, int64> progress)
{
return sZstdCompress(out, in, in.GetLeft(), progress, true);
@ -102,6 +96,4 @@ String CoZstdDecompress(const String& s, Gate<int64, int64> progress)
return CoZstdDecompress(~s, s.GetLength(), progress);
}
#endif
};

7
uppsrc/plugin/zstd/zstd.h
View file

@ -34,9 +34,7 @@ protected:
void FlushOut();
public:
#ifdef _MULTITHREADED
void Co(bool b = true);
#endif
void Open(Stream& out, int level = 1);
ZstdCompressStream();
@ -92,10 +90,7 @@ private:
public:
bool Open(Stream& in);
#ifdef _MULTITHREADED
void Co(bool b = true) { concurrent = b; }
#endif
ZstdDecompressStream();
ZstdDecompressStream(Stream& in) : ZstdDecompressStream() { Open(in); }
@ -109,14 +104,12 @@ String ZstdCompress(const String& s, Gate<int64, int64> progress = Null);
String ZstdDecompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
String ZstdDecompress(const String& s, Gate<int64, int64> progress = Null);
#ifdef _MULTITHREADED
int64 CoZstdCompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
int64 CoZstdDecompress(Stream& out, Stream& in, Gate<int64, int64> progress = Null);
String CoZstdCompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
String CoZstdCompress(const String& s, Gate<int64, int64> progress = Null);
String CoZstdDecompress(const void *data, int64 len, Gate<int64, int64> progress = Null);
String CoZstdDecompress(const String& s, Gate<int64, int64> progress = Null);
#endif
bool IsZstd(Stream& s);