Mercurial > hg > orthanc

comparison Resources/Patches/dcmtk-3.6.0-speed.patch @ 2274:bfcf5a7f92e7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix issue #35
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 17 Mar 2017 16:09:13 +0100
parents 01de36d949c3
children
comparison
equal deleted inserted replaced
2271:fc260803b5df 2274:bfcf5a7f92e7
1 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.0/dcmnet/libsrc/dul.cc 1 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc dcmtk-3.6.0/dcmnet/libsrc/dul.cc
2 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dul.cc 2016-04-05 14:30:18.254459281 +0200 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 2016-04-05 14:32:07.246463713 +0200 3 +++ dcmtk-3.6.0/dcmnet/libsrc/dul.cc 2017-03-17 15:50:44.075359547 +0100
4 @@ -1770,7 +1770,7 @@ 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 @@
5 // send number of socket handle in child process over anonymous pipe 17 // send number of socket handle in child process over anonymous pipe
6 DWORD bytesWritten; 18 DWORD bytesWritten;
7 char buf[20]; 19 char buf[20];
8 - sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle)); 20 - sprintf(buf, "%i", OFreinterpret_cast(int, childSocketHandle));
9 + sprintf(buf, "%i", OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle))); 21 + sprintf(buf, "%i", OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle)));
10 if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL)) 22 if (!WriteFile(hChildStdInWriteDup, buf, strlen(buf) + 1, &bytesWritten, NULL))
11 { 23 {
12 CloseHandle(hChildStdInWriteDup); 24 CloseHandle(hChildStdInWriteDup);
13 @@ -1780,7 +1780,7 @@ 25 @@ -1780,7 +1783,7 @@
14 // return OF_ok status code DULC_FORKEDCHILD with descriptive text 26 // return OF_ok status code DULC_FORKEDCHILD with descriptive text
15 OFOStringStream stream; 27 OFOStringStream stream;
16 stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId) 28 stream << "New child process started with pid " << OFstatic_cast(int, pi.dwProcessId)
17 - << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends; 29 - << ", socketHandle " << OFreinterpret_cast(int, childSocketHandle) << OFStringStream_ends;
18 + << ", socketHandle " << OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle)) << OFStringStream_ends; 30 + << ", socketHandle " << OFstatic_cast(int, OFreinterpret_cast(size_t, childSocketHandle)) << OFStringStream_ends;
19 OFSTRINGSTREAM_GETOFSTRING(stream, msg) 31 OFSTRINGSTREAM_GETOFSTRING(stream, msg)
20 return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str()); 32 return makeDcmnetCondition(DULC_FORKEDCHILD, OF_ok, msg.c_str());
21 } 33 }
22 @@ -1840,7 +1840,7 @@ 34 @@ -1840,7 +1843,7 @@
23 } 35 }
24 #endif 36 #endif
25 #endif 37 #endif
26 - setTCPBufferLength(sock); 38 - setTCPBufferLength(sock);
27 + //setTCPBufferLength(sock); 39 + //setTCPBufferLength(sock);
28 40
29 #ifndef DONT_DISABLE_NAGLE_ALGORITHM 41 #ifndef DONT_DISABLE_NAGLE_ALGORITHM
30 /* 42 /*
31 Only in dcmtk-3.6.0/dcmnet/libsrc: dul.cc~
32 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc 43 diff -urEb dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc
33 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:30:18.250459281 +0200 44 --- dcmtk-3.6.0.orig/dcmnet/libsrc/dulfsm.cc 2017-03-17 15:49:23.043061969 +0100
34 +++ dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc 2016-04-05 14:32:20.566464254 +0200 45 +++ dcmtk-3.6.0/dcmnet/libsrc/dulfsm.cc 2017-03-17 15:49:48.467144792 +0100
35 @@ -2417,7 +2417,7 @@ 46 @@ -2417,7 +2417,7 @@
36 return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str()); 47 return makeDcmnetCondition(DULC_TCPINITERROR, OF_error, msg.c_str());
37 } 48 }
38 #endif 49 #endif
39 - setTCPBufferLength(s); 50 - setTCPBufferLength(s);
40 + //setTCPBufferLength(s); 51 + //setTCPBufferLength(s);
41 52
42 #ifndef DONT_DISABLE_NAGLE_ALGORITHM 53 #ifndef DONT_DISABLE_NAGLE_ALGORITHM
43 /* 54 /*
44 Only in dcmtk-3.6.0/dcmnet/libsrc: dulfsm.cc~