From 0c7866eda3266bd7cba8bc6af03d969b777e188d Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Mon, 8 Jun 2020 21:47:36 +0200 Subject: [PATCH 1/2] initial OMP processing tests --- Jamulus.pro | 10 ++++++++++ src/server.cpp | 3 +++ 2 files changed, 13 insertions(+) diff --git a/Jamulus.pro b/Jamulus.pro index 27568b72..42f4dad8 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -6,6 +6,16 @@ contains(CONFIG, "noupcasename") { TARGET = jamulus } +# support multi-threading with OMP if requested +contains(CONFIG, "multithreading") { + unix { + message(The OpenMP multithreading is enabled.) + DEFINES += USE_OMP + QMAKE_CXXFLAGS += -fopenmp + QMAKE_LFLAGS += -fopenmp + } +} + CONFIG += qt \ thread \ release diff --git a/src/server.cpp b/src/server.cpp index acab3b19..d072bd5d 100755 --- a/src/server.cpp +++ b/src/server.cpp @@ -953,6 +953,9 @@ static CTimingMeas JitterMeas ( 1000, "test2.dat" ); JitterMeas.Measure(); // TE vecChannelLevels ); } +#ifdef USE_OMP +# pragma omp parallel for +#endif for ( int i = 0; i < iNumClients; i++ ) { int iClientFrameSizeSamples = 0; // initialize to avoid a compiler warning From a3dfa4fdf86c5aaebdbbe78be5c1434d4dc8ff5f Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Fri, 19 Jun 2020 16:22:59 +0200 Subject: [PATCH 2/2] update --- ChangeLog | 2 +- Jamulus.pro | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 38b29771..baed46ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,7 @@ 3.5.7git -- add new "slim channel" skin, intended for large ensembles (#339) +- add new "compact" skin, intended for large ensembles (#339) - support sorting faders by channel instrument, coded by Alberstein8 (#356) diff --git a/Jamulus.pro b/Jamulus.pro index c16ddf04..852647f4 100755 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -10,6 +10,7 @@ contains(CONFIG, "noupcasename") { contains(CONFIG, "multithreading") { unix { message(The OpenMP multithreading is enabled.) + message(NOTE THAT THE OpenMP IMPLEMENTATION IS STILL EXPERIMENTAL AND MAY NOT BE STABLE.) DEFINES += USE_OMP QMAKE_CXXFLAGS += -fopenmp QMAKE_LFLAGS += -fopenmp