Mercurial > hg > orthanc
annotate Resources/Patches/dcmtk-3.6.0-speed.patch @ 2438:4d4dff4693b8 Orthanc-1.3.1
set version
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 29 Nov 2017 17:37:02 +0100 |
| parents | bfcf5a7f92e7 |
| children |
| rev | line source |
|---|---|
| 1362 | 1 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.0/dcmnet/libsrc/dul.cc |
| 2274 | 2 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc 2017-03-17 15:49:23.043061969 +0100 |
| 3 +++ dcmtk-3.6.0/dcmnet/libsrc/dul.cc 2017-03-17 15:50:44.075359547 +0100 | |
| 4 @@ -630,7 +630,10 @@ | |
| 5 if (cond.bad()) | |
| 6 return cond; | |
| 7 | |
| 8 - cond = PRV_NextPDUType(association, block, timeout, &pduType); | |
| 9 + /* This is the first time we read from this new connection, so in case it | |
| 10 + * doesn't speak DICOM, we shouldn't wait forever (= DUL_NOBLOCK). | |
| 11 + */ | |
| 12 + cond = PRV_NextPDUType(association, DUL_NOBLOCK, PRV_DEFAULTTIMEOUT, &pduType); | |
| 13 | |
| 14 if (cond == DUL_NETWORKCLOSED) | |
| 15 event = TRANS_CONN_CLOSED; | |
| 16 @@ -1770,7 +1773,7 @@ | |
|
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
|
17 // 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
|
18 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
|
19 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
|
20 - 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
|
21 + 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
|
22 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
|
23 { |
|
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
|
24 CloseHandle(hChildStdInWriteDup); |
| 2274 | 25 @@ -1780,7 +1783,7 @@ |
|
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
|
26 // 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
|
27 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
|
28 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
|
29 - << ", 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
|
30 + << ", 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
|
31 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
|
32 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
|
33 } |
| 2274 | 34 @@ -1840,7 +1843,7 @@ |
| 1362 | 35 } |
| 36 #endif | |
| 37 #endif | |
| 38 - setTCPBufferLength(sock); | |
| 39 + //setTCPBufferLength(sock); | |
| 40 | |
| 41 #ifndef DONT_DISABLE_NAGLE_ALGORITHM | |
| 42 /* | |
| 43 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc | |
| 2274 | 44 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc 2017-03-17 15:49:23.043061969 +0100 |
| 45 +++ dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc 2017-03-17 15:49:48.467144792 +0100 | |
| 1362 | 46 @@ -2417,7 +2417,7 @@ |
| 47 return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); | |
| 48 } | |
| 49 #endif | |
| 50 - setTCPBufferLength(s); | |
| 51 + //setTCPBufferLength(s); | |
| 52 | |
| 53 #ifndef DONT_DISABLE_NAGLE_ALGORITHM | |
| 54 /* |