Mercurial > hg > orthanc
annotate Resources/Patches/dcmtk-3.6.0-speed.patch @ 2026:d46746607ae0
fix
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 20 Jun 2016 13:48:36 +0200 |
parents | 01de36d949c3 |
children | bfcf5a7f92e7 |
rev | line source |
---|---|
1362 | 1 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.0/dcmnet/libsrc/dul.cc |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
2 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc 2016-04-05 14:30:18.254459281 +0200 |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
3 +++ dcmtk-3.6.0/dcmnet/libsrc/dul.cc 2016-04-05 14:32:07.246463713 +0200 |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
4 @@ -1770,7 +1770,7 @@ |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
5 // send number of socket handle in child process over anonymous pipe |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
6 DWORD bytesWritten; |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
7 char buf[20]; |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
8 - sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle)); |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
9 + sprintf(buf, "%i", OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle))); |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
10 if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL)) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
11 { |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
12 CloseHandle(hChildStdInWriteDup); |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
13 @@ -1780,7 +1780,7 @@ |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
14 // return OF_ok status code DULC_FORKEDCHILD with descriptive text |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
15 OFOStringStream stream; |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
16 stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
17 - << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends; |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
18 + << ", socketHandle " << OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle)) << OFStringStream_ends; |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
19 OFSTRINGSTREAM_GETOFSTRING(stream, msg) |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
20 return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str()); |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
21 } |
1362 | 22 @@ -1840,7 +1840,7 @@ |
23 } | |
24 #endif | |
25 #endif | |
26 - setTCPBufferLength(sock); | |
27 + //setTCPBufferLength(sock); | |
28 | |
29 #ifndef DONT_DISABLE_NAGLE_ALGORITHM | |
30 /* | |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
31 Only in dcmtk-3.6.0/dcmnet/libsrc: dul.cc~ |
1362 | 32 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
33 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:30:18.250459281 +0200 |
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
34 +++ dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:32:20.566464254 +0200 |
1362 | 35 @@ -2417,7 +2417,7 @@ |
36 return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); | |
37 } | |
38 #endif | |
39 - setTCPBufferLength(s); | |
40 + //setTCPBufferLength(s); | |
41 | |
42 #ifndef DONT_DISABLE_NAGLE_ALGORITHM | |
43 /* | |
1951
01de36d949c3
Possibility to use forthcoming DCMTK 3.6.1 in static builds (instead of 3.6.0)
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
1362
diff
changeset
|
44 Only in dcmtk-3.6.0/dcmnet/libsrc: dulfsm.cc~ |