edfd378e93
Merge branch 'master' into jgrpp
...
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
5 years ago
4438413f48
Linkgraph: Replace RB-tree with B-tree in MCF Dijkstra
5 years ago
04f659e768
Fix: Some typos found using codespell
5 years ago
6bf4b67486
Set abort_job in LinkGraphJob saveload constructor
5 years ago
e7a916d2ce
Linkgraph: Add asymmetric: equal and nearest demand distribution modes
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
361758b516
Merge branches 'crashlog_improvements', 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/core/smallstack_type.hpp
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/linkgraphjob.h
# src/misc.cpp
# src/network/network_udp.cpp
# src/openttd.cpp
# src/saveload/saveload.cpp
5 years ago
05bc2ed7cb
Codechange: Replace custom thread code with C++11 thread objects.
...
We assume a conforming C++11 compiler environment that has a valid <thread>-header.
Failure to run a real thread is handled gracefully.
5 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
117b56caeb
Linkgraph: Replace a std::list with a std::vector.
7 years ago
c86a027e88
Linkgraph: Use an arena allocator for path objects.
...
Fixes leaks when job is aborted early.
7 years ago
3f2c561867
Linkgraph: Add support for aborting MCF passes early.
7 years ago
28211c21fc
Linkgraph: Fix a memory leak when aborting job early.
7 years ago
375dbdbfe1
Linkgraph: Allow job threads to be aborted early when clearing schedule.
8 years ago
d08d1cbd67
Linkgraph: Avoid attempting to merge/apply job when cleaning schedule.
...
This can cause crashes when switching savegame.
Move job merge/apply out of destructor into separate function.
8 years ago
1cede8431f
Linkgraph: Support running multiple jobs per spawned thread.
8 years ago
84e61b690a
Linkgraph: Changes to job scheduling algorithm.
...
This is to improve responsiveness of link graph updates, whilst
avoiding being blocked waiting for updates to complete.
Previously, large numbers of cheap jobs resulted in poor responsiveness
as it took a long time for jobs to cycle round.
Add 'linkgraph' debug category.
8 years ago
78cf5ca682
Add setting for linkgraph times to be in non daylength scaled days.
...
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
9 years ago
c6854afcef
Pause the game instead of blocking when link graph jobs lag.
...
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
9 years ago
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 years ago
780e595933
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 years ago
ebcba0c0e3
(svn r26347) -Fix [FS#5898]: Make sure link graph jobs can delete themselves after SLA_NULL.
10 years ago
cc77d40336
(svn r26347) -Fix [FS#5898]: Make sure link graph jobs can delete themselves after SLA_NULL.
10 years ago
86ebb981f1
(svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs.
11 years ago
e37656f2e5
(svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs.
11 years ago
b31a1119fb
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
91407b924e
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
6580fd4b8f
(svn r25885) -Codechange: Keep paths sorted so that the ones with flow == 0 are in the back and don't have to be iterated over so often.
11 years ago
b3b460cae2
(svn r25885) -Codechange: Keep paths sorted so that the ones with flow == 0 are in the back and don't have to be iterated over so often.
11 years ago
8d50c98ef9
(svn r25741) -Fix: shift join dates of link graph jobs when using the date cheat
11 years ago
bcbaa92485
(svn r25741) -Fix: shift join dates of link graph jobs when using the date cheat
11 years ago
72f464e6b5
(svn r25423) -Fix: integer overflows in MCF solver
11 years ago
b923eb31a8
(svn r25423) -Fix: integer overflows in MCF solver
11 years ago
5eac8ba705
(svn r25387) -Fix: "typos" in @file filename
11 years ago
b860353a66
(svn r25387) -Fix: "typos" in @file filename
11 years ago
bfd6f2bb85
(svn r25353) -Add: link graph job implementation
11 years ago
22f56ffdd7
(svn r25353) -Add: link graph job implementation
11 years ago
Jonathan G Rennison
JMcKiern
Henry Wilson
Michael Lutz
frosch
fonsinchen
rubidium