From 525b4a26637369fc42ee368aa03e3ae69eb08ffb Mon Sep 17 00:00:00 2001
From: Christer Jensen <chr.code@gmail.com>
Date: Thu, 31 Aug 2017 06:17:20 +0200
Subject: [PATCH] Improve performance by dividing up tasks

The stream of inkscape commands have been divided across multiple
instances of inkscape, one per core. This speeds up rendering by
using more cpu cores, even for single svg rendering. To do this a
simple java program was written which starts N instances of
whatever arguments was passed to it and then reads one line at the
time from standard input, the lines are then divided into N
seperate streams which are then piped to the the difference instances
of whatever program was passed as argument to SplitJob.
---
 src/SplitJob.class  | Bin 0 -> 2401 bytes
 src/SplitJob.java   |  54 ++++++++++++++++++++++++++++++++++++++++++++
 src/render_icons.sh |   5 ++--
 3 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 src/SplitJob.class
 create mode 100644 src/SplitJob.java

diff --git a/src/SplitJob.class b/src/SplitJob.class
new file mode 100644
index 0000000000000000000000000000000000000000..10c467d6727cc7fa6cde72fba3d713f1b54d0144
GIT binary patch
literal 2401
zcma)8%Xbr182?R^$xX&7g|=xMEKnZB6fBhjRnzinDH1F#HVDRwGEJssAWh<ALV2k8
zz!$#XqONe!g)8bY<yc|sIWAqe;vDoJaIbQxzne^(RM2A<-@Ws_zu))Wd-K!n@2>;c
zimx<;5Yf<$9!a(f>=4+gLB*~BcB5DB`Xt#Cz<ub~um*bt9?_snD;@hJiAu6x!=o6`
z;KczAgBX(Jpd^n;-f#dh9P;CFfx{Y(;0X<JJgJd6BJh+SM`a#QYj_67G^~IjFe;Fc
zMoA58VamW`0^<s*th9orffL3lqr=K{^ybILOxsKjn?};KyA}9)thD9qP~Zu-9aiA&
z%Op(&H3L@K9L!IQn)V@MG)0bg!jPUC!XqVLDI-1J5p!%SJ>D%1t7DFlIC;Rx7WD;=
z3s?dth>pNX=B&WqlSsL-v{)u@C(ON;^jsawrYvWFW^|KGQpW~tq^*t=CUm5cQLwC-
zeKF!eJCiVTIhJ$>uQzX{Sd(<nA&}LPgQFvlQ#vMbT1OadI?mv%g2u9Kse%R5b9he2
zIXti91)OE#I?m%o9WUW!fmd`~z^gi5!$uviOY#OX0&nWLh_@81AL+O4jD57FHP@1J
zGTE$|Y?-v2<1OZC%V|jv)<{chQd6+B9DQi?gqd&z-q!IB-W7OH$NTs|$A|bxL0ws|
z|8&C4I#z}as40h`znrGyV|*g;sgBQZR>$YEzJ{XZ9o<$CnioXV*}TKrO=F@o2@;-5
z61p!W`I6n5?+O#SOUoBEWjLR9tO>TVzEaa|6=$rX;u78pv~kl}Fbjs;Du&8s)2@#5
zV5Q{zxxO+sJI_IlDp*}c#}&FwTsLecEt{~ihVoXArqia~mojoWlRiXra9{s$^pJwJ
z6_NkN5i_agktsSY_E^Er@c%HYENZc9dQ@|cVKc|YwYzGR``MeMJcUGc5j^gh<H<ER
zW9g)V_R3^jab@fh%Y}!oo5OwoCH6a+`7Zg{rQS1+M9dp*8|mfvku#Kc7N&;>aXvfF
zTcw17>gUI;lF!m7ZOdU@B0SO?jmpbI9ZThN$GIj_nVghN8kVy+V=o?^GdahcVE;{<
zf?%lu40@1vkUPtaS#eiH(~dcAQdgWZQh9S|OkQ8n%F<m8nw1XQVsC^vD}B?h=PnRe
z&U)z}ce}n9yP<clyaObL#cCz0#Ytq?dGLytTaiiin(}PBdV(f{hCE{O;2hu$XpHlt
z3_`_$rh_IoT_#c~kWkl^MeZBWb{MPqScUk&DOfJAN$xz{^CBj_pI<AuDqPhKGf=J+
z728RDMWzn{Y(hs#RrwVH8a?^0qH17c0iNy6*WewTg&L=^FX9b(ry&aPAMtdlLACiZ
zYTJWq$Xh@lc0pC9=6)xC8d?GOM0_FNkMK=l_bl}I45~xE0+uYLsHT9W1uTmQnsydY
z8xo$7xL!b=`&~eNQ1u>b&UUF&bKkW`)R20;%jfA5K@s#_Mqfw`iq42X<fm-`LAf?`
z1%iP~STl{r+9vfHLUGRqPiHLd4F;}ad8~kYkEmDCd_ge9AEwY2VHu6JD@&R({Z$3D
zP+e|U7uCH~zd}@&;0A6I!YWA2Y&4Tr^Nn9Z+-gYc(1d!npn-rlVhh)Y*@hnK?ZHY!
zu?ho}ntajoeA>@bb`k6GH5>H}TQ$ul&9F&7)B7*v-{8NLo7jxs(5WccqNv!02N-c5
zv^lJUPhhj4NMMV=R`&Ey)Zaptatk#A+y21z+t4Uel)tcRj{jr4WqqJmpsN*rJh(6z
u?NpJ!;4Id}XR$Uujde3<ox%EVq5X4E{Dj~kDp#>Uo2y1}cGJPL-oW2<c~jy5

literal 0
HcmV?d00001

diff --git a/src/SplitJob.java b/src/SplitJob.java
new file mode 100644
index 0000000..8498be6
--- /dev/null
+++ b/src/SplitJob.java
@@ -0,0 +1,54 @@
+
+import java.io.*;
+
+import static java.lang.ProcessBuilder.Redirect;
+
+public class SplitJob {
+
+	private static final BufferedReader in = new BufferedReader(new InputStreamReader(System.in));
+
+
+	public static void main(String[] args) {
+
+		final Runtime runtime = Runtime.getRuntime();
+		int numThreads = runtime.availableProcessors();
+		Process[] procs = new Process[numThreads];
+
+		try {
+		
+			ProcessBuilder builder = new ProcessBuilder(args);
+			builder.redirectError(Redirect.INHERIT);
+		
+			for (int i = 0; i < numThreads; i++) {
+				procs[i] = builder.start();
+			}
+		
+			for (int i = 0; ; i = (i + 1) % numThreads) {
+	
+				String s = in.readLine();
+
+				if (s == null)
+					break;
+
+				byte[] data = (s + '\n').getBytes();
+				procs[i].getOutputStream().write(data, 0, data.length);
+				procs[i].getOutputStream().flush();
+			}
+		
+			for (Process proc : procs) {
+			
+				proc.getOutputStream().close();
+				int exitCode = proc.waitFor();
+				
+				if (exitCode != 0) {
+					System.err.printf("[Error] %s stopped with exit code: %d\n", args[0], exitCode);
+					System.exit(2);
+				}
+			}
+			
+		} catch (Exception e) {
+			System.err.printf("[Error] %s: %s\n", e.getClass().getName(), e.getMessage());
+			System.exit(1);
+		}
+	}
+}
diff --git a/src/render_icons.sh b/src/render_icons.sh
index 3864c08..29a6fe2 100755
--- a/src/render_icons.sh
+++ b/src/render_icons.sh
@@ -68,13 +68,12 @@ do
     # since we finished rendering it out last.
     if [[ $CONTEXT.svg -nt .${CONTEXT}_timestamp ]]
     then
-        genInkscapeCmds $CONTEXT | $INKSCAPE --shell > /dev/null && touch .${CONTEXT}_timestamp &
+        echo "Rendering icons from $CONTEXT.svg"
+        genInkscapeCmds $CONTEXT | java SplitJob $INKSCAPE --shell && touch .${CONTEXT}_timestamp
     else
         echo "No changes to $CONTEXT.svg, skipping..."
     fi
 done
 
-wait
-
 # Remove all empty directories from the theme folder.
 find $THEMEDIR -type d -empty -delete