Skip to content

Commit 91efb72

Browse files
drwrosedrwrose
committed
move threading/pipelining stuff into new directory, reorganize in general
1 parent 4034887 commit 91efb72

File tree

150 files changed

+672
-381
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+672
-381
lines changed

‎panda/metalibs/panda/Sources.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#define USE_PACKAGES net
1010

1111
#define COMPONENT_LIBS \
12-
recorder pgraph \
12+
recorder pgraph pipeline \
1313
pvrpn grutil chan pstatclient \
1414
char chat collide cull device \
1515
dgraph display event gobj graph gsgbase \

‎panda/metalibs/pandaexpress/Sources.pp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define BUILDING_DLL BUILDING_PANDAEXPRESS
99
#define USE_PACKAGES net
1010

11-
#define COMPONENT_LIBS downloader ipc express pandabase
11+
#define COMPONENT_LIBS downloader express pandabase
1212
#define OTHER_LIBS dconfig:c prc:c interrogatedb:c dtoolutil:c dtoolbase:c dtoolconfig:m dtool:m
1313

1414
#begin metalib_target

‎panda/src/express/Sources.pp‎

Lines changed: 23 additions & 160 deletions
Original file line numberDiff line numberDiff line change
@@ -9,63 +9,31 @@
99
#define COMBINED_SOURCES $[TARGET]_composite1.cxx $[TARGET]_composite2.cxx
1010

1111
#define SOURCES \
12-
atomicAdjustDummyImpl.h atomicAdjustDummyImpl.I atomicAdjust.h \
13-
atomicAdjust.I atomicAdjustImpl.h \
14-
atomicAdjustNsprImpl.h atomicAdjustNsprImpl.I \
15-
atomicAdjustPosixImpl.h atomicAdjustPosixImpl.I \
16-
atomicAdjustWin32Impl.h atomicAdjustWin32Impl.I \
1712
bigEndian.h buffer.I buffer.h \
1813
checksumHashGenerator.I checksumHashGenerator.h circBuffer.I \
19-
circBuffer.h clockObject.I clockObject.h \
20-
conditionVar.h conditionVar.I \
21-
conditionVarDebug.h conditionVarDebug.I \
22-
conditionVarDirect.h conditionVarDirect.I \
23-
conditionVarDummyImpl.h conditionVarDummyImpl.I \
24-
conditionVarImpl.h \
25-
conditionVarNsprImpl.h conditionVarNsprImpl.I \
26-
conditionVarPosixImpl.h conditionVarPosixImpl.I \
27-
conditionVarWin32Impl.h conditionVarWin32Impl.I \
14+
circBuffer.h \
2815
config_express.h \
29-
cycleData.h cycleData.I \
30-
cycleDataReader.h cycleDataReader.I \
31-
cycleDataStageReader.h cycleDataStageReader.I \
32-
cycleDataStageWriter.h cycleDataStageWriter.I \
33-
cycleDataWriter.h cycleDataWriter.I \
34-
cyclerHolder.h cyclerHolder.I \
3516
datagram.I datagram.h datagramGenerator.I \
3617
datagramGenerator.h \
3718
datagramIterator.I datagramIterator.h datagramSink.I datagramSink.h \
3819
dcast.T dcast.h \
3920
encryptStreamBuf.h encryptStreamBuf.I encryptStream.h encryptStream.I \
4021
error_utils.h \
41-
externalThread.h \
4222
hashGeneratorBase.I hashGeneratorBase.h \
4323
hashVal.I hashVal.h \
4424
indirectLess.I indirectLess.h \
4525
littleEndian.h \
46-
mainThread.h \
4726
memoryInfo.I memoryInfo.h \
4827
memoryUsage.I memoryUsage.h \
4928
memoryUsagePointerCounts.I memoryUsagePointerCounts.h \
5029
memoryUsagePointers.I memoryUsagePointers.h \
5130
multifile.I multifile.h \
52-
mutexDebug.h mutexDebug.I \
53-
mutexDirect.h mutexDirect.I \
54-
mutexHolder.h mutexHolder.I \
5531
namable.I \
5632
namable.h nativeNumericData.I nativeNumericData.h \
5733
numeric_types.h \
5834
ordered_vector.h ordered_vector.I ordered_vector.T \
5935
password_hash.h \
6036
patchfile.I patchfile.h \
61-
pipeline.h pipeline.I \
62-
pipelineCycler.h pipelineCycler.I \
63-
pipelineCyclerLinks.h pipelineCyclerLinks.I \
64-
pipelineCyclerBase.h \
65-
pipelineCyclerDummyImpl.h pipelineCyclerDummyImpl.I \
66-
pipelineCyclerTrivialImpl.h pipelineCyclerTrivialImpl.I \
67-
pipelineCyclerTrueImpl.h pipelineCyclerTrueImpl.I \
68-
pmutex.h pmutex.I \
6937
pointerTo.I pointerTo.h \
7038
pointerToArray.I pointerToArray.h \
7139
pointerToBase.I pointerToBase.h \
@@ -74,19 +42,11 @@
7442
pta_uchar.h \
7543
ramfile.I ramfile.h \
7644
referenceCount.I referenceCount.h \
77-
reMutex.I reMutex.h \
78-
reMutexDirect.h reMutexDirect.I \
79-
reMutexHolder.I reMutexHolder.h \
8045
reversedNumericData.I reversedNumericData.h \
8146
streamReader.I streamReader.h streamWriter.I streamWriter.h \
8247
stringDecoder.h stringDecoder.I \
8348
subStream.I subStream.h subStreamBuf.h \
8449
textEncoder.h textEncoder.I \
85-
threadDummyImpl.h threadDummyImpl.I thread.h thread.I threadImpl.h \
86-
threadNsprImpl.h threadNsprImpl.I \
87-
threadPosixImpl.h threadPosixImpl.I \
88-
threadWin32Impl.h threadWin32Impl.I \
89-
threadPriority.h \
9050
tokenBoard.I \
9151
tokenBoard.h trueClock.I trueClock.h \
9252
typedReferenceCount.I typedReferenceCount.h typedef.h \
@@ -106,44 +66,16 @@
10666
zStream.I zStream.h zStreamBuf.h
10767

10868
#define INCLUDED_SOURCES \
109-
atomicAdjust.cxx atomicAdjustDummyImpl.cxx \
110-
atomicAdjustNsprImpl.cxx \
111-
atomicAdjustPosixImpl.cxx \
112-
atomicAdjustWin32Impl.cxx \
113-
buffer.cxx checksumHashGenerator.cxx clockObject.cxx \
114-
conditionVar.cxx \
115-
conditionVarDebug.cxx \
116-
conditionVarDirect.cxx \
117-
conditionVarDummyImpl.cxx \
118-
conditionVarNsprImpl.cxx \
119-
conditionVarPosixImpl.cxx \
120-
conditionVarWin32Impl.cxx \
69+
buffer.cxx checksumHashGenerator.cxx \
12170
config_express.cxx \
122-
cycleData.cxx \
123-
cycleDataReader.cxx \
124-
cycleDataStageReader.cxx \
125-
cycleDataStageWriter.cxx \
126-
cycleDataWriter.cxx \
127-
cyclerHolder.cxx \
12871
datagram.cxx datagramGenerator.cxx \
12972
datagramIterator.cxx \
13073
datagramSink.cxx dcast.cxx \
13174
encryptStreamBuf.cxx encryptStream.cxx \
13275
error_utils.cxx \
133-
externalThread.cxx \
13476
hashGeneratorBase.cxx hashVal.cxx \
135-
mainThread.cxx \
13677
memoryInfo.cxx memoryUsage.cxx memoryUsagePointerCounts.cxx \
13778
memoryUsagePointers.cxx multifile.cxx \
138-
mutexDebug.cxx \
139-
mutexDirect.cxx \
140-
mutexHolder.cxx \
141-
pipeline.cxx \
142-
pipelineCycler.cxx \
143-
pipelineCyclerDummyImpl.cxx \
144-
pipelineCyclerTrivialImpl.cxx \
145-
pipelineCyclerTrueImpl.cxx \
146-
pmutex.cxx \
14779
namable.cxx \
14880
nativeNumericData.cxx \
14981
ordered_vector.cxx \
@@ -157,18 +89,11 @@
15789
pta_uchar.cxx \
15890
ramfile.cxx \
15991
referenceCount.cxx \
160-
reMutex.cxx \
161-
reMutexDirect.cxx \
162-
reMutexHolder.cxx \
16392
reversedNumericData.cxx \
16493
streamReader.cxx streamWriter.cxx \
16594
stringDecoder.cxx \
16695
subStream.cxx subStreamBuf.cxx \
16796
textEncoder.cxx \
168-
thread.cxx threadDummyImpl.cxx \
169-
threadNsprImpl.cxx \
170-
threadPosixImpl.cxx \
171-
threadWin32Impl.cxx \
17297
trueClock.cxx \
17398
typedReferenceCount.cxx \
17499
unicodeLatinMap.cxx \
@@ -185,86 +110,47 @@
185110
zStream.cxx zStreamBuf.cxx
186111

187112
#define INSTALL_HEADERS \
188-
atomicAdjustDummyImpl.h atomicAdjustDummyImpl.I atomicAdjust.h \
189-
atomicAdjust.I atomicAdjustImpl.h \
190-
atomicAdjustNsprImpl.h atomicAdjustNsprImpl.I \
191-
atomicAdjustPosixImpl.h atomicAdjustPosixImpl.I \
192-
atomicAdjustWin32Impl.h atomicAdjustWin32Impl.I \
193-
bigEndian.h buffer.I buffer.h checksumHashGenerator.I \
194-
checksumHashGenerator.h circBuffer.I circBuffer.h clockObject.I \
195-
clockObject.h \
196-
conditionVar.h conditionVar.I \
197-
conditionVarDebug.h conditionVarDebug.I \
198-
conditionVarDirect.h conditionVarDirect.I \
199-
conditionVarDummyImpl.h conditionVarDummyImpl.I \
200-
conditionVarImpl.h \
201-
conditionVarNsprImpl.h conditionVarNsprImpl.I \
202-
conditionVarPosixImpl.h conditionVarPosixImpl.I \
203-
conditionVarWin32Impl.h conditionVarWin32Impl.I \
113+
bigEndian.h buffer.I buffer.h \
114+
checksumHashGenerator.I checksumHashGenerator.h circBuffer.I \
115+
circBuffer.h \
204116
config_express.h \
205-
cycleData.h cycleData.I \
206-
cycleDataReader.h cycleDataReader.I \
207-
cycleDataStageReader.h cycleDataStageReader.I \
208-
cycleDataStageWriter.h cycleDataStageWriter.I \
209-
cycleDataWriter.h cycleDataWriter.I \
210-
cyclerHolder.h cyclerHolder.I \
211-
datagram.I datagram.h \
212-
datagramGenerator.I datagramGenerator.h \
213-
datagramIterator.I datagramIterator.h \
214-
datagramSink.I datagramSink.h dcast.T dcast.h \
117+
datagram.I datagram.h datagramGenerator.I \
118+
datagramGenerator.h \
119+
datagramIterator.I datagramIterator.h datagramSink.I datagramSink.h \
120+
dcast.T dcast.h \
215121
encryptStreamBuf.h encryptStreamBuf.I encryptStream.h encryptStream.I \
216-
error_utils.h \
217-
externalThread.h \
218-
hashGeneratorBase.I \
219-
hashGeneratorBase.h hashVal.I hashVal.h \
122+
error_utils.h \
123+
hashGeneratorBase.I hashGeneratorBase.h \
124+
hashVal.I hashVal.h \
220125
indirectLess.I indirectLess.h \
221126
littleEndian.h \
222-
mainThread.h \
223-
memoryInfo.I memoryInfo.h memoryUsage.I \
224-
memoryUsage.h memoryUsagePointerCounts.I \
225-
memoryUsagePointerCounts.h memoryUsagePointers.I \
226-
memoryUsagePointers.h multifile.I multifile.h \
227-
mutexDebug.h mutexDebug.I \
228-
mutexDirect.h mutexDirect.I \
229-
mutexHolder.h mutexHolder.I \
230-
namable.I namable.h \
231-
nativeNumericData.I nativeNumericData.h numeric_types.h \
127+
memoryInfo.I memoryInfo.h \
128+
memoryUsage.I memoryUsage.h \
129+
memoryUsagePointerCounts.I memoryUsagePointerCounts.h \
130+
memoryUsagePointers.I memoryUsagePointers.h \
131+
multifile.I multifile.h \
132+
namable.I \
133+
namable.h nativeNumericData.I nativeNumericData.h \
134+
numeric_types.h \
232135
ordered_vector.h ordered_vector.I ordered_vector.T \
233136
password_hash.h \
234137
patchfile.I patchfile.h \
235-
pipeline.h pipeline.I \
236-
pipelineCycler.h pipelineCycler.I \
237-
pipelineCyclerLinks.h pipelineCyclerLinks.I \
238-
pipelineCyclerBase.h \
239-
pipelineCyclerDummyImpl.h pipelineCyclerDummyImpl.I \
240-
pipelineCyclerTrivialImpl.h pipelineCyclerTrivialImpl.I \
241-
pipelineCyclerTrueImpl.h pipelineCyclerTrueImpl.I \
242-
pmutex.h pmutex.I \
243138
pointerTo.I pointerTo.h \
244139
pointerToArray.I pointerToArray.h \
245140
pointerToBase.I pointerToBase.h \
246141
pointerToVoid.I pointerToVoid.h \
247-
profileTimer.I \
248-
profileTimer.h pta_uchar.h \
142+
profileTimer.I profileTimer.h \
143+
pta_uchar.h \
249144
ramfile.I ramfile.h \
250145
referenceCount.I referenceCount.h \
251-
reMutex.I reMutex.h \
252-
reMutexDirect.h reMutexDirect.I \
253-
reMutexHolder.I reMutexHolder.h \
254146
reversedNumericData.I reversedNumericData.h \
255147
streamReader.I streamReader.h streamWriter.I streamWriter.h \
256148
stringDecoder.h stringDecoder.I \
257149
subStream.I subStream.h subStreamBuf.h \
258150
textEncoder.h textEncoder.I \
259-
threadDummyImpl.h threadDummyImpl.I thread.h thread.I threadImpl.h \
260-
threadNsprImpl.h threadNsprImpl.I \
261-
threadPosixImpl.h threadPosixImpl.I \
262-
threadWin32Impl.h threadWin32Impl.I \
263-
threadPriority.h \
264151
tokenBoard.I \
265152
tokenBoard.h trueClock.I trueClock.h \
266-
typedReferenceCount.I \
267-
typedReferenceCount.h typedef.h \
153+
typedReferenceCount.I typedReferenceCount.h typedef.h \
268154
unicodeLatinMap.h \
269155
vector_uchar.h \
270156
virtualFileComposite.h virtualFileComposite.I virtualFile.h \
@@ -321,26 +207,3 @@
321207

322208
#end test_bin_target
323209
#endif
324-
325-
326-
#begin test_bin_target
327-
#define TARGET test_threaddata
328-
#define LOCAL_LIBS $[LOCAL_LIBS] express
329-
#define OTHER_LIBS dtoolutil:c dtool:m pystub
330-
331-
#define SOURCES \
332-
test_threaddata.cxx
333-
334-
#end test_bin_target
335-
336-
337-
#begin test_bin_target
338-
#define TARGET test_diners
339-
#define LOCAL_LIBS $[LOCAL_LIBS] express
340-
#define OTHER_LIBS dtoolutil:c dtool:m dtoolconfig:m pystub
341-
342-
#define SOURCES \
343-
test_diners.cxx
344-
345-
#end test_bin_target
346-

‎panda/src/express/config_express.cxx‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
// Filename: config_express.cxx
2-
// Created by: cary (04Jan00)
2+
// Created by: drose (28Mar06)
33
//
44
////////////////////////////////////////////////////////////////////
55
//
@@ -16,15 +16,10 @@
1616
//
1717
////////////////////////////////////////////////////////////////////
1818

19-
2019
#include "config_express.h"
21-
#include "clockObject.h"
2220
#include "datagram.h"
23-
#include "mainThread.h"
24-
#include "externalThread.h"
2521
#include "referenceCount.h"
2622
#include "textEncoder.h"
27-
#include "thread.h"
2823
#include "typedObject.h"
2924
#include "typedReferenceCount.h"
3025
#include "virtualFile.h"
@@ -39,7 +34,6 @@
3934

4035
ConfigureDef(config_express);
4136
NotifyCategoryDef(express, "");
42-
NotifyCategoryDef(thread, "");
4337

4438
ConfigureFn(config_express) {
4539
init_libexpress();
@@ -67,20 +61,6 @@ ConfigVariableBool keep_temporary_files
6761
ConfigVariableDouble average_frame_rate_interval
6862
("average-frame-rate-interval", 1.0);
6963

70-
ConfigVariableDouble clock_frame_rate
71-
("clock-frame-rate", 1.0);
72-
ConfigVariableDouble clock_degrade_factor
73-
("clock-degrade-factor", 1.0);
74-
ConfigVariableDouble max_dt
75-
("max-dt", -1.0);
76-
77-
ConfigVariableDouble sleep_precision
78-
("sleep-precision", 0.01,
79-
PRC_DESC("This is the accuracy within which we can expect select() to "
80-
"return precisely. That is, if we use select() to request a "
81-
"timeout of 1.0 seconds, we can expect to actually sleep for "
82-
"somewhere between 1.0 and 1.0 + sleep-precision seconds."));
83-
8464
ConfigVariableString encryption_algorithm
8565
("encryption-algorithm", "bf-cbc",
8666
PRC_DESC("This defines the OpenSSL encryption algorithm which is used to "
@@ -169,13 +149,9 @@ init_libexpress() {
169149
}
170150
initialized = true;
171151

172-
ClockObject::init_type();
173152
Datagram::init_type();
174-
MainThread::init_type();
175-
ExternalThread::init_type();
176153
ReferenceCount::init_type();
177154
TextEncoder::init_type();
178-
Thread::init_type();
179155
TypedObject::init_type();
180156
TypedReferenceCount::init_type();
181157
VirtualFile::init_type();
@@ -193,13 +169,6 @@ init_libexpress() {
193169
ps->add_system("zlib");
194170
}
195171
#endif
196-
197-
#ifdef HAVE_THREADS
198-
{
199-
PandaSystem *ps = PandaSystem::get_global_ptr();
200-
ps->add_system("threads");
201-
}
202-
#endif
203172
}
204173

205174

0 commit comments

Comments
 (0)