1 | # |
1 | # |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | # This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | # |
3 | # |
4 | # Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | # Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | # |
5 | # |
6 | # Deliantra is free software: you can redistribute it and/or modify |
6 | # Deliantra is free software: you can redistribute it and/or modify it under |
7 | # it under the terms of the GNU General Public License as published by |
7 | # the terms of the Affero GNU General Public License as published by the |
8 | # the Free Software Foundation, either version 3 of the License, or |
8 | # Free Software Foundation, either version 3 of the License, or (at your |
9 | # (at your option) any later version. |
9 | # option) any later version. |
10 | # |
10 | # |
11 | # This program is distributed in the hope that it will be useful, |
11 | # This program is distributed in the hope that it will be useful, |
12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
12 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
14 | # GNU General Public License for more details. |
14 | # GNU General Public License for more details. |
15 | # |
15 | # |
16 | # You should have received a copy of the GNU General Public License |
16 | # You should have received a copy of the Affero GNU General Public License |
17 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
17 | # and the GNU General Public License along with this program. If not, see |
|
|
18 | # <http://www.gnu.org/licenses/>. |
18 | # |
19 | # |
19 | # The authors can be reached via e-mail to <support@deliantra.net> |
20 | # The authors can be reached via e-mail to <support@deliantra.net> |
20 | # |
21 | # |
21 | |
22 | |
22 | package cf; |
23 | package cf; |
23 | |
24 | |
24 | use 5.10.0; |
25 | use 5.10.0; |
25 | use utf8; |
26 | use utf8; |
26 | use strict "vars", "subs"; |
27 | use strict qw(vars subs); |
27 | |
28 | |
28 | use Symbol; |
29 | use Symbol; |
29 | use List::Util; |
30 | use List::Util; |
30 | use Socket; |
31 | use Socket; |
31 | use EV; |
32 | use EV; |
32 | use Opcode; |
33 | use Opcode; |
33 | use Safe; |
34 | use Safe; |
34 | use Safe::Hole; |
35 | use Safe::Hole; |
35 | use Storable (); |
36 | use Storable (); |
|
|
37 | use Carp (); |
36 | |
38 | |
|
|
39 | use Guard (); |
37 | use Coro (); |
40 | use Coro (); |
38 | use Coro::State; |
41 | use Coro::State; |
39 | use Coro::Handle; |
42 | use Coro::Handle; |
40 | use Coro::EV; |
43 | use Coro::EV; |
41 | use Coro::AnyEvent; |
44 | use Coro::AnyEvent; |
42 | use Coro::Timer; |
45 | use Coro::Timer; |
43 | use Coro::Signal; |
46 | use Coro::Signal; |
44 | use Coro::Semaphore; |
47 | use Coro::Semaphore; |
|
|
48 | use Coro::SemaphoreSet; |
45 | use Coro::AnyEvent; |
49 | use Coro::AnyEvent; |
46 | use Coro::AIO; |
50 | use Coro::AIO; |
47 | use Coro::BDB 1.6; |
51 | use Coro::BDB 1.6; |
48 | use Coro::Storable; |
52 | use Coro::Storable; |
49 | use Coro::Util (); |
53 | use Coro::Util (); |
50 | |
54 | |
51 | use JSON::XS 2.01 (); |
55 | use JSON::XS 2.01 (); |
52 | use BDB (); |
56 | use BDB (); |
53 | use Data::Dumper; |
57 | use Data::Dumper; |
54 | use Digest::MD5; |
|
|
55 | use Fcntl; |
58 | use Fcntl; |
56 | use YAML (); |
59 | use YAML::XS (); |
57 | use IO::AIO (); |
60 | use IO::AIO (); |
58 | use Time::HiRes; |
61 | use Time::HiRes; |
59 | use Compress::LZF; |
62 | use Compress::LZF; |
60 | use Digest::MD5 (); |
63 | use Digest::MD5 (); |
61 | |
64 | |
… | |
… | |
69 | $Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority |
72 | $Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority |
70 | |
73 | |
71 | # make sure c-lzf reinitialises itself |
74 | # make sure c-lzf reinitialises itself |
72 | Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; |
75 | Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve"; |
73 | Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later |
76 | Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later |
|
|
77 | |
|
|
78 | # strictly for debugging |
|
|
79 | $SIG{QUIT} = sub { Carp::cluck "SIGQUIT" }; |
74 | |
80 | |
75 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
81 | sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload |
76 | |
82 | |
77 | our %COMMAND = (); |
83 | our %COMMAND = (); |
78 | our %COMMAND_TIME = (); |
84 | our %COMMAND_TIME = (); |
… | |
… | |
83 | our %EXT_CORO = (); # coroutines bound to extensions |
89 | our %EXT_CORO = (); # coroutines bound to extensions |
84 | our %EXT_MAP = (); # pluggable maps |
90 | our %EXT_MAP = (); # pluggable maps |
85 | |
91 | |
86 | our $RELOAD; # number of reloads so far, non-zero while in reload |
92 | our $RELOAD; # number of reloads so far, non-zero while in reload |
87 | our @EVENT; |
93 | our @EVENT; |
|
|
94 | our @REFLECT; # set by XS |
|
|
95 | our %REFLECT; # set by us |
88 | |
96 | |
89 | our $CONFDIR = confdir; |
97 | our $CONFDIR = confdir; |
90 | our $DATADIR = datadir; |
98 | our $DATADIR = datadir; |
91 | our $LIBDIR = "$DATADIR/ext"; |
99 | our $LIBDIR = "$DATADIR/ext"; |
92 | our $PODDIR = "$DATADIR/pod"; |
100 | our $PODDIR = "$DATADIR/pod"; |
… | |
… | |
103 | our %RESOURCE; |
111 | our %RESOURCE; |
104 | |
112 | |
105 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
113 | our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) |
106 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
114 | our $NEXT_RUNTIME_WRITE; # when should the runtime file be written |
107 | our $NEXT_TICK; |
115 | our $NEXT_TICK; |
108 | our $USE_FSYNC = 1; # use fsync to write maps - default off |
116 | our $USE_FSYNC = 1; # use fsync to write maps - default on |
109 | |
117 | |
110 | our $BDB_DEADLOCK_WATCHER; |
118 | our $BDB_DEADLOCK_WATCHER; |
111 | our $BDB_CHECKPOINT_WATCHER; |
119 | our $BDB_CHECKPOINT_WATCHER; |
112 | our $BDB_TRICKLE_WATCHER; |
120 | our $BDB_TRICKLE_WATCHER; |
113 | our $DB_ENV; |
121 | our $DB_ENV; |
114 | |
122 | |
|
|
123 | our @EXTRA_MODULES = qw(pod match mapscript); |
|
|
124 | |
115 | our %CFG; |
125 | our %CFG; |
116 | |
126 | |
117 | our $UPTIME; $UPTIME ||= time; |
127 | our $UPTIME; $UPTIME ||= time; |
118 | our $RUNTIME; |
128 | our $RUNTIME; |
119 | our $NOW; |
129 | our $NOW; |
… | |
… | |
129 | our $LOADAVG; # same thing, but with alpha-smoothing |
139 | our $LOADAVG; # same thing, but with alpha-smoothing |
130 | our $JITTER; # average jitter |
140 | our $JITTER; # average jitter |
131 | our $TICK_START; # for load detecting purposes |
141 | our $TICK_START; # for load detecting purposes |
132 | |
142 | |
133 | our @POST_INIT; |
143 | our @POST_INIT; |
|
|
144 | |
|
|
145 | our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow) |
|
|
146 | our $REALLY_UNLOOP; # never set to true, please :) |
134 | |
147 | |
135 | binmode STDOUT; |
148 | binmode STDOUT; |
136 | binmode STDERR; |
149 | binmode STDERR; |
137 | |
150 | |
138 | # read virtual server time, if available |
151 | # read virtual server time, if available |
… | |
… | |
140 | open my $fh, "<", $RUNTIMEFILE |
153 | open my $fh, "<", $RUNTIMEFILE |
141 | or die "unable to read $RUNTIMEFILE file: $!"; |
154 | or die "unable to read $RUNTIMEFILE file: $!"; |
142 | $RUNTIME = <$fh> + 0.; |
155 | $RUNTIME = <$fh> + 0.; |
143 | } |
156 | } |
144 | |
157 | |
|
|
158 | eval "sub TICK() { $TICK } 1" or die; |
|
|
159 | |
145 | mkdir $_ |
160 | mkdir $_ |
146 | for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; |
161 | for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; |
147 | |
162 | |
148 | our $EMERGENCY_POSITION; |
163 | our $EMERGENCY_POSITION; |
149 | |
164 | |
150 | sub cf::map::normalise; |
165 | sub cf::map::normalise; |
|
|
166 | |
|
|
167 | ############################################################################# |
|
|
168 | |
|
|
169 | %REFLECT = (); |
|
|
170 | for (@REFLECT) { |
|
|
171 | my $reflect = JSON::XS::decode_json $_; |
|
|
172 | $REFLECT{$reflect->{class}} = $reflect; |
|
|
173 | } |
|
|
174 | |
|
|
175 | # this is decidedly evil |
|
|
176 | $REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} }; |
151 | |
177 | |
152 | ############################################################################# |
178 | ############################################################################# |
153 | |
179 | |
154 | =head2 GLOBAL VARIABLES |
180 | =head2 GLOBAL VARIABLES |
155 | |
181 | |
… | |
… | |
202 | returns directly I<after> the tick processing (and consequently, can only wake one process |
228 | returns directly I<after> the tick processing (and consequently, can only wake one process |
203 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
229 | per tick), while cf::wait_for_tick wakes up all waiters after tick processing. |
204 | |
230 | |
205 | =item @cf::INVOKE_RESULTS |
231 | =item @cf::INVOKE_RESULTS |
206 | |
232 | |
207 | This array contains the results of the last C<invoke ()> call. When |
233 | This array contains the results of the last C<invoke ()> call. When |
208 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
234 | C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of |
209 | that call. |
235 | that call. |
210 | |
236 | |
|
|
237 | =item %cf::REFLECT |
|
|
238 | |
|
|
239 | Contains, for each (C++) class name, a hash reference with information |
|
|
240 | about object members (methods, scalars, arrays and flags) and other |
|
|
241 | metadata, which is useful for introspection. |
|
|
242 | |
211 | =back |
243 | =back |
212 | |
244 | |
213 | =cut |
245 | =cut |
214 | |
246 | |
215 | BEGIN { |
247 | $Coro::State::WARNHOOK = sub { |
216 | *CORE::GLOBAL::warn = sub { |
|
|
217 | my $msg = join "", @_; |
248 | my $msg = join "", @_; |
218 | |
249 | |
219 | $msg .= "\n" |
250 | $msg .= "\n" |
220 | unless $msg =~ /\n$/; |
251 | unless $msg =~ /\n$/; |
221 | |
252 | |
222 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
253 | $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; |
223 | |
254 | |
224 | LOG llevError, $msg; |
255 | LOG llevError, $msg; |
225 | }; |
256 | }; |
226 | } |
|
|
227 | |
257 | |
228 | $Coro::State::DIEHOOK = sub { |
258 | $Coro::State::DIEHOOK = sub { |
229 | return unless $^S eq 0; # "eq", not "==" |
259 | return unless $^S eq 0; # "eq", not "==" |
|
|
260 | |
|
|
261 | warn Carp::longmess $_[0]; |
230 | |
262 | |
231 | if ($Coro::current == $Coro::main) {#d# |
263 | if ($Coro::current == $Coro::main) {#d# |
232 | warn "DIEHOOK called in main context, Coro bug?\n";#d# |
264 | warn "DIEHOOK called in main context, Coro bug?\n";#d# |
233 | return;#d# |
265 | return;#d# |
234 | }#d# |
266 | }#d# |
235 | |
267 | |
236 | # kill coroutine otherwise |
268 | # kill coroutine otherwise |
237 | warn Carp::longmess $_[0]; |
|
|
238 | Coro::terminate |
269 | Coro::terminate |
239 | }; |
270 | }; |
240 | |
|
|
241 | $SIG{__DIE__} = sub { }; #d#? |
|
|
242 | |
271 | |
243 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
272 | @safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; |
244 | @safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; |
273 | @safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; |
245 | @safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; |
274 | @safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; |
246 | @safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; |
275 | @safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; |
… | |
… | |
260 | )) { |
289 | )) { |
261 | @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
290 | @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; |
262 | } |
291 | } |
263 | |
292 | |
264 | $EV::DIED = sub { |
293 | $EV::DIED = sub { |
265 | warn "error in event callback: @_"; |
294 | Carp::cluck "error in event callback: @_"; |
266 | }; |
295 | }; |
267 | |
296 | |
268 | ############################################################################# |
297 | ############################################################################# |
269 | |
298 | |
270 | =head2 UTILITY FUNCTIONS |
299 | =head2 UTILITY FUNCTIONS |
… | |
… | |
328 | Wait until the given lock is available. See cf::lock_acquire. |
357 | Wait until the given lock is available. See cf::lock_acquire. |
329 | |
358 | |
330 | =item my $lock = cf::lock_acquire $string |
359 | =item my $lock = cf::lock_acquire $string |
331 | |
360 | |
332 | Wait until the given lock is available and then acquires it and returns |
361 | Wait until the given lock is available and then acquires it and returns |
333 | a Coro::guard object. If the guard object gets destroyed (goes out of scope, |
362 | a L<Guard> object. If the guard object gets destroyed (goes out of scope, |
334 | for example when the coroutine gets canceled), the lock is automatically |
363 | for example when the coroutine gets canceled), the lock is automatically |
335 | returned. |
364 | returned. |
336 | |
365 | |
337 | Locks are *not* recursive, locking from the same coro twice results in a |
366 | Locks are *not* recursive, locking from the same coro twice results in a |
338 | deadlocked coro. |
367 | deadlocked coro. |
… | |
… | |
344 | |
373 | |
345 | Return true if the lock is currently active, i.e. somebody has locked it. |
374 | Return true if the lock is currently active, i.e. somebody has locked it. |
346 | |
375 | |
347 | =cut |
376 | =cut |
348 | |
377 | |
349 | our %LOCK; |
378 | our $LOCKS = new Coro::SemaphoreSet; |
350 | our %LOCKER;#d# |
|
|
351 | |
379 | |
352 | sub lock_wait($) { |
380 | sub lock_wait($) { |
353 | my ($key) = @_; |
381 | $LOCKS->wait ($_[0]); |
354 | |
|
|
355 | if ($LOCKER{$key} == $Coro::current) {#d# |
|
|
356 | Carp::cluck "lock_wait($key) for already-acquired lock";#d# |
|
|
357 | return;#d# |
|
|
358 | }#d# |
|
|
359 | |
|
|
360 | # wait for lock, if any |
|
|
361 | while ($LOCK{$key}) { |
|
|
362 | #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>"; |
|
|
363 | push @{ $LOCK{$key} }, $Coro::current; |
|
|
364 | Coro::schedule; |
|
|
365 | } |
|
|
366 | } |
382 | } |
367 | |
383 | |
368 | sub lock_acquire($) { |
384 | sub lock_acquire($) { |
369 | my ($key) = @_; |
385 | $LOCKS->guard ($_[0]) |
370 | |
|
|
371 | # wait, to be sure we are not locked |
|
|
372 | lock_wait $key; |
|
|
373 | |
|
|
374 | $LOCK{$key} = []; |
|
|
375 | $LOCKER{$key} = $Coro::current;#d# |
|
|
376 | |
|
|
377 | Coro::guard { |
|
|
378 | delete $LOCKER{$key};#d# |
|
|
379 | # wake up all waiters, to be on the safe side |
|
|
380 | $_->ready for @{ delete $LOCK{$key} }; |
|
|
381 | } |
|
|
382 | } |
386 | } |
383 | |
387 | |
384 | sub lock_active($) { |
388 | sub lock_active($) { |
385 | my ($key) = @_; |
389 | $LOCKS->count ($_[0]) < 1 |
386 | |
|
|
387 | ! ! $LOCK{$key} |
|
|
388 | } |
390 | } |
389 | |
391 | |
390 | sub freeze_mainloop { |
392 | sub freeze_mainloop { |
391 | tick_inhibit_inc; |
393 | tick_inhibit_inc; |
392 | |
394 | |
393 | Coro::guard \&tick_inhibit_dec; |
395 | &Guard::guard (\&tick_inhibit_dec); |
394 | } |
396 | } |
395 | |
397 | |
396 | =item cf::periodic $interval, $cb |
398 | =item cf::periodic $interval, $cb |
397 | |
399 | |
398 | Like EV::periodic, but randomly selects a starting point so that the actions |
400 | Like EV::periodic, but randomly selects a starting point so that the actions |
… | |
… | |
1170 | $decname, length $$rdata, scalar @$objs; |
1172 | $decname, length $$rdata, scalar @$objs; |
1171 | |
1173 | |
1172 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1174 | if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { |
1173 | aio_chmod $fh, SAVE_MODE; |
1175 | aio_chmod $fh, SAVE_MODE; |
1174 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1176 | aio_write $fh, 0, (length $$rdata), $$rdata, 0; |
1175 | aio_fsync $fh if $cf::USE_FSYNC; |
1177 | if ($cf::USE_FSYNC) { |
|
|
1178 | aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER; |
|
|
1179 | aio_fsync $fh; |
|
|
1180 | } |
1176 | aio_close $fh; |
1181 | aio_close $fh; |
1177 | |
1182 | |
1178 | if (@$objs) { |
1183 | if (@$objs) { |
1179 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1184 | if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { |
1180 | aio_chmod $fh, SAVE_MODE; |
1185 | aio_chmod $fh, SAVE_MODE; |
1181 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1186 | my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; |
1182 | aio_write $fh, 0, (length $data), $data, 0; |
1187 | aio_write $fh, 0, (length $data), $data, 0; |
1183 | aio_fsync $fh if $cf::USE_FSYNC; |
1188 | if ($cf::USE_FSYNC) { |
|
|
1189 | aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER; |
|
|
1190 | aio_fsync $fh; |
|
|
1191 | } |
1184 | aio_close $fh; |
1192 | aio_close $fh; |
1185 | aio_rename "$filename.pst~", "$filename.pst"; |
1193 | aio_rename "$filename.pst~", "$filename.pst"; |
1186 | } |
1194 | } |
1187 | } else { |
1195 | } else { |
1188 | aio_unlink "$filename.pst"; |
1196 | aio_unlink "$filename.pst"; |
1189 | } |
1197 | } |
1190 | |
1198 | |
1191 | aio_rename "$filename~", $filename; |
1199 | aio_rename "$filename~", $filename; |
|
|
1200 | |
|
|
1201 | $filename =~ s%/[^/]+$%%; |
|
|
1202 | aio_pathsync $filename if $cf::USE_FSYNC; |
1192 | } else { |
1203 | } else { |
1193 | warn "FATAL: $filename~: $!\n"; |
1204 | warn "unable to save objects: $filename~: $!\n"; |
1194 | } |
1205 | } |
1195 | } else { |
1206 | } else { |
1196 | aio_unlink $filename; |
1207 | aio_unlink $filename; |
1197 | aio_unlink "$filename.pst"; |
1208 | aio_unlink "$filename.pst"; |
1198 | } |
1209 | } |
… | |
… | |
1289 | my ($name, $cb) = @_; |
1300 | my ($name, $cb) = @_; |
1290 | |
1301 | |
1291 | $EXTICMD{$name} = $cb; |
1302 | $EXTICMD{$name} = $cb; |
1292 | } |
1303 | } |
1293 | |
1304 | |
|
|
1305 | use File::Glob (); |
|
|
1306 | |
1294 | cf::player->attach ( |
1307 | cf::player->attach ( |
1295 | on_command => sub { |
1308 | on_command => sub { |
1296 | my ($pl, $name, $params) = @_; |
1309 | my ($pl, $name, $params) = @_; |
1297 | |
1310 | |
1298 | my $cb = $COMMAND{$name} |
1311 | my $cb = $COMMAND{$name} |
… | |
… | |
1329 | } |
1342 | } |
1330 | |
1343 | |
1331 | cf::override; |
1344 | cf::override; |
1332 | }, |
1345 | }, |
1333 | ); |
1346 | ); |
|
|
1347 | |
|
|
1348 | # "readahead" all extensions |
|
|
1349 | sub cache_extensions { |
|
|
1350 | my $grp = IO::AIO::aio_group; |
|
|
1351 | |
|
|
1352 | add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub { |
|
|
1353 | for (grep /\.ext$/, @{$_[0]}) { |
|
|
1354 | add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data; |
|
|
1355 | } |
|
|
1356 | }; |
|
|
1357 | |
|
|
1358 | $grp |
|
|
1359 | } |
1334 | |
1360 | |
1335 | sub load_extensions { |
1361 | sub load_extensions { |
1336 | cf::sync_job { |
1362 | cf::sync_job { |
1337 | my %todo; |
1363 | my %todo; |
1338 | |
1364 | |
… | |
… | |
1867 | |
1893 | |
1868 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; |
1894 | (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; |
1869 | "$UNIQUEDIR/$path" |
1895 | "$UNIQUEDIR/$path" |
1870 | } |
1896 | } |
1871 | |
1897 | |
1872 | # and all this just because we cannot iterate over |
|
|
1873 | # all maps in C++... |
|
|
1874 | sub change_all_map_light { |
|
|
1875 | my ($change) = @_; |
|
|
1876 | |
|
|
1877 | $_->change_map_light ($change) |
|
|
1878 | for grep $_->outdoor, values %cf::MAP; |
|
|
1879 | } |
|
|
1880 | |
|
|
1881 | sub decay_objects { |
1898 | sub decay_objects { |
1882 | my ($self) = @_; |
1899 | my ($self) = @_; |
1883 | |
1900 | |
1884 | return if $self->{deny_reset}; |
1901 | return if $self->{deny_reset}; |
1885 | |
1902 | |
… | |
… | |
1967 | sub find { |
1984 | sub find { |
1968 | my ($path, $origin) = @_; |
1985 | my ($path, $origin) = @_; |
1969 | |
1986 | |
1970 | $path = normalise $path, $origin && $origin->path; |
1987 | $path = normalise $path, $origin && $origin->path; |
1971 | |
1988 | |
1972 | cf::lock_wait "map_data:$path";#d#remove |
1989 | my $guard1 = cf::lock_acquire "map_data:$path";#d#remove |
1973 | cf::lock_wait "map_find:$path"; |
1990 | my $guard2 = cf::lock_acquire "map_find:$path"; |
1974 | |
1991 | |
1975 | $cf::MAP{$path} || do { |
1992 | $cf::MAP{$path} || do { |
1976 | my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it |
|
|
1977 | my $guard2 = cf::lock_acquire "map_find:$path"; |
|
|
1978 | |
|
|
1979 | my $map = new_from_path cf::map $path |
1993 | my $map = new_from_path cf::map $path |
1980 | or return; |
1994 | or return; |
1981 | |
1995 | |
1982 | $map->{last_save} = $cf::RUNTIME; |
1996 | $map->{last_save} = $cf::RUNTIME; |
1983 | |
1997 | |
… | |
… | |
2051 | unless ($self->{deny_activate}) { |
2065 | unless ($self->{deny_activate}) { |
2052 | $self->decay_objects; |
2066 | $self->decay_objects; |
2053 | $self->fix_auto_apply; |
2067 | $self->fix_auto_apply; |
2054 | $self->update_buttons; |
2068 | $self->update_buttons; |
2055 | cf::cede_to_tick; |
2069 | cf::cede_to_tick; |
2056 | $self->set_darkness_map; |
|
|
2057 | cf::cede_to_tick; |
|
|
2058 | $self->activate; |
2070 | $self->activate; |
2059 | } |
2071 | } |
2060 | |
2072 | |
2061 | $self->{last_save} = $cf::RUNTIME; |
2073 | $self->{last_save} = $cf::RUNTIME; |
2062 | $self->last_access ($cf::RUNTIME); |
2074 | $self->last_access ($cf::RUNTIME); |
… | |
… | |
2228 | |
2240 | |
2229 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2241 | my $lock = cf::lock_acquire "map_data:$self->{path}"; |
2230 | |
2242 | |
2231 | return if $self->players; |
2243 | return if $self->players; |
2232 | |
2244 | |
2233 | warn "resetting map ", $self->path; |
2245 | warn "resetting map ", $self->path, "\n"; |
2234 | |
2246 | |
2235 | $self->in_memory (cf::MAP_SWAPPED); |
2247 | $self->in_memory (cf::MAP_SWAPPED); |
2236 | |
2248 | |
2237 | # need to save uniques path |
2249 | # need to save uniques path |
2238 | unless ($self->{deny_save}) { |
2250 | unless ($self->{deny_save}) { |
… | |
… | |
2329 | : normalise $_ |
2341 | : normalise $_ |
2330 | } @{ aio_readdir $UNIQUEDIR or [] } |
2342 | } @{ aio_readdir $UNIQUEDIR or [] } |
2331 | ] |
2343 | ] |
2332 | } |
2344 | } |
2333 | |
2345 | |
|
|
2346 | =item cf::map::static_maps |
|
|
2347 | |
|
|
2348 | Returns an arrayref if paths of all static maps (all preinstalled F<.map> |
|
|
2349 | file in the shared directory excluding F</styles> and F</editor>). May |
|
|
2350 | block. |
|
|
2351 | |
|
|
2352 | =cut |
|
|
2353 | |
|
|
2354 | sub static_maps() { |
|
|
2355 | my @dirs = ""; |
|
|
2356 | my @maps; |
|
|
2357 | |
|
|
2358 | while (@dirs) { |
|
|
2359 | my $dir = shift @dirs; |
|
|
2360 | |
|
|
2361 | next if $dir eq "/styles" || $dir eq "/editor"; |
|
|
2362 | |
|
|
2363 | my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2 |
|
|
2364 | or return; |
|
|
2365 | |
|
|
2366 | for (@$files) { |
|
|
2367 | s/\.map$// or next; |
|
|
2368 | utf8::decode $_; |
|
|
2369 | push @maps, "$dir/$_"; |
|
|
2370 | } |
|
|
2371 | |
|
|
2372 | push @dirs, map "$dir/$_", @$dirs; |
|
|
2373 | } |
|
|
2374 | |
|
|
2375 | \@maps |
|
|
2376 | } |
|
|
2377 | |
2334 | =back |
2378 | =back |
2335 | |
2379 | |
2336 | =head3 cf::object |
2380 | =head3 cf::object |
2337 | |
2381 | |
2338 | =cut |
2382 | =cut |
… | |
… | |
2403 | |
2447 | |
2404 | our $SAY_CHANNEL = { |
2448 | our $SAY_CHANNEL = { |
2405 | id => "say", |
2449 | id => "say", |
2406 | title => "Map", |
2450 | title => "Map", |
2407 | reply => "say ", |
2451 | reply => "say ", |
2408 | tooltip => "Things said to and replied from npcs near you and other players on the same map only.", |
2452 | tooltip => "Things said to and replied from NPCs near you and other players on the same map only.", |
2409 | }; |
2453 | }; |
2410 | |
2454 | |
2411 | our $CHAT_CHANNEL = { |
2455 | our $CHAT_CHANNEL = { |
2412 | id => "chat", |
2456 | id => "chat", |
2413 | title => "Chat", |
2457 | title => "Chat", |
… | |
… | |
2533 | ($x, $y) = (-1, -1) |
2577 | ($x, $y) = (-1, -1) |
2534 | unless (defined $x) && (defined $y); |
2578 | unless (defined $x) && (defined $y); |
2535 | |
2579 | |
2536 | # use -1 or undef as default coordinates, not 0, 0 |
2580 | # use -1 or undef as default coordinates, not 0, 0 |
2537 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2581 | ($x, $y) = ($map->enter_x, $map->enter_y) |
2538 | if $x <=0 && $y <= 0; |
2582 | if $x <= 0 && $y <= 0; |
2539 | |
2583 | |
2540 | $map->load; |
2584 | $map->load; |
2541 | $map->load_neighbours; |
2585 | $map->load_neighbours; |
2542 | |
2586 | |
2543 | return unless $self->contr->active; |
2587 | return unless $self->contr->active; |
2544 | $self->flag (cf::FLAG_DEBUG, 0);#d# temp |
|
|
2545 | $self->activate_recursive; |
|
|
2546 | |
2588 | |
2547 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2589 | local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext |
2548 | $self->enter_map ($map, $x, $y); |
2590 | $self->enter_map ($map, $x, $y); |
|
|
2591 | |
|
|
2592 | # only activate afterwards, to support waiting in hooks |
|
|
2593 | $self->activate_recursive; |
2549 | } |
2594 | } |
2550 | |
2595 | |
2551 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2596 | =item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) |
2552 | |
2597 | |
2553 | Moves the player to the given map-path and coordinates by first freezing |
2598 | Moves the player to the given map-path and coordinates by first freezing |
… | |
… | |
2741 | |
2786 | |
2742 | utf8::encode $text; |
2787 | utf8::encode $text; |
2743 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2788 | $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); |
2744 | } |
2789 | } |
2745 | |
2790 | |
|
|
2791 | =item $client->send_big_packet ($pkt) |
|
|
2792 | |
|
|
2793 | Like C<send_packet>, but tries to compress large packets, and fragments |
|
|
2794 | them as required. |
|
|
2795 | |
|
|
2796 | =cut |
|
|
2797 | |
|
|
2798 | our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64; |
|
|
2799 | |
|
|
2800 | sub cf::client::send_big_packet { |
|
|
2801 | my ($self, $pkt) = @_; |
|
|
2802 | |
|
|
2803 | # try lzf for large packets |
|
|
2804 | $pkt = "lzf " . Compress::LZF::compress $pkt |
|
|
2805 | if 1024 <= length $pkt and $self->{can_lzf}; |
|
|
2806 | |
|
|
2807 | # split very large packets |
|
|
2808 | if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) { |
|
|
2809 | $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt; |
|
|
2810 | $pkt = "frag"; |
|
|
2811 | } |
|
|
2812 | |
|
|
2813 | $self->send_packet ($pkt); |
|
|
2814 | } |
|
|
2815 | |
2746 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
2816 | =item $client->send_msg ($channel, $msg, $color, [extra...]) |
2747 | |
2817 | |
2748 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2818 | Send a drawinfo or msg packet to the client, formatting the msg for the |
2749 | client if neccessary. C<$type> should be a string identifying the type of |
2819 | client if neccessary. C<$type> should be a string identifying the type of |
2750 | the message, with C<log> being the default. If C<$color> is negative, suppress |
2820 | the message, with C<log> being the default. If C<$color> is negative, suppress |
… | |
… | |
2752 | |
2822 | |
2753 | =cut |
2823 | =cut |
2754 | |
2824 | |
2755 | # non-persistent channels (usually the info channel) |
2825 | # non-persistent channels (usually the info channel) |
2756 | our %CHANNEL = ( |
2826 | our %CHANNEL = ( |
|
|
2827 | "c/motd" => { |
|
|
2828 | id => "infobox", |
|
|
2829 | title => "MOTD", |
|
|
2830 | reply => undef, |
|
|
2831 | tooltip => "The message of the day", |
|
|
2832 | }, |
2757 | "c/identify" => { |
2833 | "c/identify" => { |
2758 | id => "infobox", |
2834 | id => "infobox", |
2759 | title => "Identify", |
2835 | title => "Identify", |
2760 | reply => undef, |
2836 | reply => undef, |
2761 | tooltip => "Items recently identified", |
2837 | tooltip => "Items recently identified", |
… | |
… | |
2763 | "c/examine" => { |
2839 | "c/examine" => { |
2764 | id => "infobox", |
2840 | id => "infobox", |
2765 | title => "Examine", |
2841 | title => "Examine", |
2766 | reply => undef, |
2842 | reply => undef, |
2767 | tooltip => "Signs and other items you examined", |
2843 | tooltip => "Signs and other items you examined", |
|
|
2844 | }, |
|
|
2845 | "c/shopinfo" => { |
|
|
2846 | id => "infobox", |
|
|
2847 | title => "Shop Info", |
|
|
2848 | reply => undef, |
|
|
2849 | tooltip => "What your bargaining skill tells you about the shop", |
2768 | }, |
2850 | }, |
2769 | "c/book" => { |
2851 | "c/book" => { |
2770 | id => "infobox", |
2852 | id => "infobox", |
2771 | title => "Book", |
2853 | title => "Book", |
2772 | reply => undef, |
2854 | reply => undef, |
… | |
… | |
2788 | id => "infobox", |
2870 | id => "infobox", |
2789 | title => "Body Parts", |
2871 | title => "Body Parts", |
2790 | reply => undef, |
2872 | reply => undef, |
2791 | tooltip => "Shows which body parts you posess and are available", |
2873 | tooltip => "Shows which body parts you posess and are available", |
2792 | }, |
2874 | }, |
|
|
2875 | "c/statistics" => { |
|
|
2876 | id => "infobox", |
|
|
2877 | title => "Statistics", |
|
|
2878 | reply => undef, |
|
|
2879 | tooltip => "Shows your primary statistics", |
|
|
2880 | }, |
2793 | "c/skills" => { |
2881 | "c/skills" => { |
2794 | id => "infobox", |
2882 | id => "infobox", |
2795 | title => "Skills", |
2883 | title => "Skills", |
2796 | reply => undef, |
2884 | reply => undef, |
2797 | tooltip => "Shows your experience per skill and item power", |
2885 | tooltip => "Shows your experience per skill and item power", |
|
|
2886 | }, |
|
|
2887 | "c/shopitems" => { |
|
|
2888 | id => "infobox", |
|
|
2889 | title => "Shop Items", |
|
|
2890 | reply => undef, |
|
|
2891 | tooltip => "Shows the items currently for sale in this shop", |
|
|
2892 | }, |
|
|
2893 | "c/resistances" => { |
|
|
2894 | id => "infobox", |
|
|
2895 | title => "Resistances", |
|
|
2896 | reply => undef, |
|
|
2897 | tooltip => "Shows your resistances", |
|
|
2898 | }, |
|
|
2899 | "c/pets" => { |
|
|
2900 | id => "infobox", |
|
|
2901 | title => "Pets", |
|
|
2902 | reply => undef, |
|
|
2903 | tooltip => "Shows information abotu your pets/a specific pet", |
|
|
2904 | }, |
|
|
2905 | "c/perceiveself" => { |
|
|
2906 | id => "infobox", |
|
|
2907 | title => "Perceive Self", |
|
|
2908 | reply => undef, |
|
|
2909 | tooltip => "You gained detailed knowledge about yourself", |
2798 | }, |
2910 | }, |
2799 | "c/uptime" => { |
2911 | "c/uptime" => { |
2800 | id => "infobox", |
2912 | id => "infobox", |
2801 | title => "Uptime", |
2913 | title => "Uptime", |
2802 | reply => undef, |
2914 | reply => undef, |
… | |
… | |
2812 | id => "party", |
2924 | id => "party", |
2813 | title => "Party", |
2925 | title => "Party", |
2814 | reply => "gsay ", |
2926 | reply => "gsay ", |
2815 | tooltip => "Messages and chat related to your party", |
2927 | tooltip => "Messages and chat related to your party", |
2816 | }, |
2928 | }, |
|
|
2929 | "c/death" => { |
|
|
2930 | id => "death", |
|
|
2931 | title => "Death", |
|
|
2932 | reply => undef, |
|
|
2933 | tooltip => "Reason for and more info about your most recent death", |
|
|
2934 | }, |
|
|
2935 | "c/say" => $SAY_CHANNEL, |
|
|
2936 | "c/chat" => $CHAT_CHANNEL, |
2817 | ); |
2937 | ); |
2818 | |
2938 | |
2819 | sub cf::client::send_msg { |
2939 | sub cf::client::send_msg { |
2820 | my ($self, $channel, $msg, $color, @extra) = @_; |
2940 | my ($self, $channel, $msg, $color, @extra) = @_; |
2821 | |
2941 | |
… | |
… | |
2826 | |
2946 | |
2827 | # check predefined channels, for the benefit of C |
2947 | # check predefined channels, for the benefit of C |
2828 | if ($CHANNEL{$channel}) { |
2948 | if ($CHANNEL{$channel}) { |
2829 | $channel = $CHANNEL{$channel}; |
2949 | $channel = $CHANNEL{$channel}; |
2830 | |
2950 | |
2831 | $self->ext_msg (channel_info => $channel) |
2951 | $self->ext_msg (channel_info => $channel); |
2832 | if $self->can_msg; |
|
|
2833 | |
|
|
2834 | $channel = $channel->{id}; |
2952 | $channel = $channel->{id}; |
2835 | |
2953 | |
2836 | } elsif (ref $channel) { |
2954 | } elsif (ref $channel) { |
2837 | # send meta info to client, if not yet sent |
2955 | # send meta info to client, if not yet sent |
2838 | unless (exists $self->{channel}{$channel->{id}}) { |
2956 | unless (exists $self->{channel}{$channel->{id}}) { |
2839 | $self->{channel}{$channel->{id}} = $channel; |
2957 | $self->{channel}{$channel->{id}} = $channel; |
2840 | $self->ext_msg (channel_info => $channel) |
2958 | $self->ext_msg (channel_info => $channel); |
2841 | if $self->can_msg; |
|
|
2842 | } |
2959 | } |
2843 | |
2960 | |
2844 | $channel = $channel->{id}; |
2961 | $channel = $channel->{id}; |
2845 | } |
2962 | } |
2846 | |
2963 | |
2847 | return unless @extra || length $msg; |
2964 | return unless @extra || length $msg; |
2848 | |
2965 | |
2849 | if ($self->can_msg) { |
|
|
2850 | # default colour, mask it out |
2966 | # default colour, mask it out |
2851 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
2967 | $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) |
2852 | if $color & cf::NDI_DEF; |
2968 | if $color & cf::NDI_DEF; |
2853 | |
2969 | |
2854 | my $pkt = "msg " |
2970 | my $pkt = "msg " |
2855 | . $self->{json_coder}->encode ( |
2971 | . $self->{json_coder}->encode ( |
2856 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] |
2972 | [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra] |
2857 | ); |
2973 | ); |
2858 | |
2974 | |
2859 | # try lzf for large packets |
|
|
2860 | $pkt = "lzf " . Compress::LZF::compress $pkt |
|
|
2861 | if 1024 <= length $pkt and $self->{can_lzf}; |
|
|
2862 | |
|
|
2863 | # split very large packets |
|
|
2864 | if (8192 < length $pkt and $self->{can_lzf}) { |
|
|
2865 | $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt; |
|
|
2866 | $pkt = "frag"; |
|
|
2867 | } |
|
|
2868 | |
|
|
2869 | $self->send_packet ($pkt); |
2975 | $self->send_big_packet ($pkt); |
2870 | } else { |
|
|
2871 | if ($color >= 0) { |
|
|
2872 | # replace some tags by gcfclient-compatible ones |
|
|
2873 | for ($msg) { |
|
|
2874 | 1 while |
|
|
2875 | s/<b>([^<]*)<\/b>/[b]${1}[\/b]/ |
|
|
2876 | || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/ |
|
|
2877 | || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/ |
|
|
2878 | || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/ |
|
|
2879 | || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/; |
|
|
2880 | } |
|
|
2881 | |
|
|
2882 | $color &= cf::NDI_COLOR_MASK; |
|
|
2883 | |
|
|
2884 | utf8::encode $msg; |
|
|
2885 | |
|
|
2886 | if (0 && $msg =~ /\[/) { |
|
|
2887 | # COMMAND/INFO |
|
|
2888 | $self->send_packet ("drawextinfo $color 10 8 $msg") |
|
|
2889 | } else { |
|
|
2890 | $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; |
|
|
2891 | $self->send_packet ("drawinfo $color $msg") |
|
|
2892 | } |
|
|
2893 | } |
|
|
2894 | } |
|
|
2895 | } |
2976 | } |
2896 | |
2977 | |
2897 | =item $client->ext_msg ($type, @msg) |
2978 | =item $client->ext_msg ($type, @msg) |
2898 | |
2979 | |
2899 | Sends an ext event to the client. |
2980 | Sends an ext event to the client. |
… | |
… | |
2902 | |
2983 | |
2903 | sub cf::client::ext_msg($$@) { |
2984 | sub cf::client::ext_msg($$@) { |
2904 | my ($self, $type, @msg) = @_; |
2985 | my ($self, $type, @msg) = @_; |
2905 | |
2986 | |
2906 | if ($self->extcmd == 2) { |
2987 | if ($self->extcmd == 2) { |
2907 | $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2988 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); |
2908 | } elsif ($self->extcmd == 1) { # TODO: remove |
2989 | } elsif ($self->extcmd == 1) { # TODO: remove |
2909 | push @msg, msgtype => "event_$type"; |
2990 | push @msg, msgtype => "event_$type"; |
2910 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2991 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2911 | } |
2992 | } |
2912 | } |
2993 | } |
2913 | |
2994 | |
2914 | =item $client->ext_reply ($msgid, @msg) |
2995 | =item $client->ext_reply ($msgid, @msg) |
2915 | |
2996 | |
… | |
… | |
2919 | |
3000 | |
2920 | sub cf::client::ext_reply($$@) { |
3001 | sub cf::client::ext_reply($$@) { |
2921 | my ($self, $id, @msg) = @_; |
3002 | my ($self, $id, @msg) = @_; |
2922 | |
3003 | |
2923 | if ($self->extcmd == 2) { |
3004 | if ($self->extcmd == 2) { |
2924 | $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
3005 | $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); |
2925 | } elsif ($self->extcmd == 1) { |
3006 | } elsif ($self->extcmd == 1) { |
2926 | #TODO: version 1, remove |
3007 | #TODO: version 1, remove |
2927 | unshift @msg, msgtype => "reply", msgid => $id; |
3008 | unshift @msg, msgtype => "reply", msgid => $id; |
2928 | $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
3009 | $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg})); |
2929 | } |
3010 | } |
2930 | } |
3011 | } |
2931 | |
3012 | |
2932 | =item $success = $client->query ($flags, "text", \&cb) |
3013 | =item $success = $client->query ($flags, "text", \&cb) |
2933 | |
3014 | |
… | |
… | |
3060 | our $safe_hole = new Safe::Hole; |
3141 | our $safe_hole = new Safe::Hole; |
3061 | |
3142 | |
3062 | $SIG{FPE} = 'IGNORE'; |
3143 | $SIG{FPE} = 'IGNORE'; |
3063 | |
3144 | |
3064 | $safe->permit_only (Opcode::opset qw( |
3145 | $safe->permit_only (Opcode::opset qw( |
3065 | :base_core :base_mem :base_orig :base_math |
3146 | :base_core :base_mem :base_orig :base_math :base_loop |
3066 | grepstart grepwhile mapstart mapwhile |
3147 | grepstart grepwhile mapstart mapwhile |
3067 | sort time |
3148 | sort time |
3068 | )); |
3149 | )); |
3069 | |
3150 | |
3070 | # here we export the classes and methods available to script code |
3151 | # here we export the classes and methods available to script code |
… | |
… | |
3074 | The following functions and methods are available within a safe environment: |
3155 | The following functions and methods are available within a safe environment: |
3075 | |
3156 | |
3076 | cf::object |
3157 | cf::object |
3077 | contr pay_amount pay_player map x y force_find force_add destroy |
3158 | contr pay_amount pay_player map x y force_find force_add destroy |
3078 | insert remove name archname title slaying race decrease split |
3159 | insert remove name archname title slaying race decrease split |
|
|
3160 | value |
3079 | |
3161 | |
3080 | cf::object::player |
3162 | cf::object::player |
3081 | player |
3163 | player |
3082 | |
3164 | |
3083 | cf::player |
3165 | cf::player |
… | |
… | |
3089 | =cut |
3171 | =cut |
3090 | |
3172 | |
3091 | for ( |
3173 | for ( |
3092 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3174 | ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y |
3093 | insert remove inv nrof name archname title slaying race |
3175 | insert remove inv nrof name archname title slaying race |
3094 | decrease split destroy change_exp)], |
3176 | decrease split destroy change_exp value msg lore send_msg)], |
3095 | ["cf::object::player" => qw(player)], |
3177 | ["cf::object::player" => qw(player)], |
3096 | ["cf::player" => qw(peaceful)], |
3178 | ["cf::player" => qw(peaceful send_msg)], |
3097 | ["cf::map" => qw(trigger)], |
3179 | ["cf::map" => qw(trigger)], |
3098 | ) { |
3180 | ) { |
3099 | no strict 'refs'; |
3181 | no strict 'refs'; |
3100 | my ($pkg, @funs) = @$_; |
3182 | my ($pkg, @funs) = @$_; |
3101 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
3183 | *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) |
… | |
… | |
3119 | |
3201 | |
3120 | my $qcode = $code; |
3202 | my $qcode = $code; |
3121 | $qcode =~ s/"/‟/g; # not allowed in #line filenames |
3203 | $qcode =~ s/"/‟/g; # not allowed in #line filenames |
3122 | $qcode =~ s/\n/\\n/g; |
3204 | $qcode =~ s/\n/\\n/g; |
3123 | |
3205 | |
|
|
3206 | %vars = (_dummy => 0) unless %vars; |
|
|
3207 | |
|
|
3208 | my @res; |
3124 | local $_; |
3209 | local $_; |
3125 | local @safe::cf::_safe_eval_args = values %vars; |
|
|
3126 | |
3210 | |
3127 | my $eval = |
3211 | my $eval = |
3128 | "do {\n" |
3212 | "do {\n" |
3129 | . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" |
3213 | . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" |
3130 | . "#line 0 \"{$qcode}\"\n" |
3214 | . "#line 0 \"{$qcode}\"\n" |
3131 | . $code |
3215 | . $code |
3132 | . "\n}" |
3216 | . "\n}" |
3133 | ; |
3217 | ; |
3134 | |
3218 | |
|
|
3219 | if ($CFG{safe_eval}) { |
3135 | sub_generation_inc; |
3220 | sub_generation_inc; |
|
|
3221 | local @safe::cf::_safe_eval_args = values %vars; |
3136 | my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); |
3222 | @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); |
3137 | sub_generation_inc; |
3223 | sub_generation_inc; |
|
|
3224 | } else { |
|
|
3225 | local @cf::_safe_eval_args = values %vars; |
|
|
3226 | @res = wantarray ? eval eval : scalar eval $eval; |
|
|
3227 | } |
3138 | |
3228 | |
3139 | if ($@) { |
3229 | if ($@) { |
3140 | warn "$@"; |
3230 | warn "$@"; |
3141 | warn "while executing safe code '$code'\n"; |
3231 | warn "while executing safe code '$code'\n"; |
3142 | warn "with arguments " . (join " ", %vars) . "\n"; |
3232 | warn "with arguments " . (join " ", %vars) . "\n"; |
… | |
… | |
3207 | while (my ($face, $info) = each %$faces) { |
3297 | while (my ($face, $info) = each %$faces) { |
3208 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3298 | my $idx = (cf::face::find $face) || cf::face::alloc $face; |
3209 | |
3299 | |
3210 | cf::face::set_visibility $idx, $info->{visibility}; |
3300 | cf::face::set_visibility $idx, $info->{visibility}; |
3211 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3301 | cf::face::set_magicmap $idx, $info->{magicmap}; |
3212 | cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; |
3302 | cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32}; |
3213 | cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; |
3303 | cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64}; |
3214 | |
3304 | |
3215 | cf::cede_to_tick; |
3305 | cf::cede_to_tick; |
3216 | } |
3306 | } |
3217 | |
3307 | |
3218 | while (my ($face, $info) = each %$faces) { |
3308 | while (my ($face, $info) = each %$faces) { |
… | |
… | |
3242 | |
3332 | |
3243 | cf::anim::invalidate_all; # d'oh |
3333 | cf::anim::invalidate_all; # d'oh |
3244 | } |
3334 | } |
3245 | |
3335 | |
3246 | { |
3336 | { |
3247 | # TODO: for gcfclient pleasure, we should give resources |
|
|
3248 | # that gcfclient doesn't grok a >10000 face index. |
|
|
3249 | my $res = $facedata->{resource}; |
3337 | my $res = $facedata->{resource}; |
3250 | |
3338 | |
3251 | while (my ($name, $info) = each %$res) { |
3339 | while (my ($name, $info) = each %$res) { |
3252 | if (defined $info->{type}) { |
3340 | if (defined $info->{type}) { |
3253 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3341 | my $idx = (cf::face::find $name) || cf::face::alloc $name; |
3254 | my $data; |
|
|
3255 | |
3342 | |
3256 | if ($info->{type} & 1) { |
3343 | cf::face::set_data $idx, 0, $info->{data}, $info->{hash}; |
3257 | # prepend meta info |
|
|
3258 | |
|
|
3259 | my $meta = $enc->encode ({ |
|
|
3260 | name => $name, |
|
|
3261 | %{ $info->{meta} || {} }, |
|
|
3262 | }); |
|
|
3263 | |
|
|
3264 | $data = pack "(w/a*)*", $meta, $info->{data}; |
|
|
3265 | } else { |
|
|
3266 | $data = $info->{data}; |
|
|
3267 | } |
|
|
3268 | |
|
|
3269 | cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data; |
|
|
3270 | cf::face::set_type $idx, $info->{type}; |
3344 | cf::face::set_type $idx, $info->{type}; |
3271 | } else { |
3345 | } else { |
3272 | $RESOURCE{$name} = $info; |
3346 | $RESOURCE{$name} = $info; |
3273 | } |
3347 | } |
3274 | |
3348 | |
… | |
… | |
3358 | |
3432 | |
3359 | warn "finished reloading resource files\n"; |
3433 | warn "finished reloading resource files\n"; |
3360 | } |
3434 | } |
3361 | |
3435 | |
3362 | sub reload_config { |
3436 | sub reload_config { |
|
|
3437 | warn "reloading config file...\n"; |
|
|
3438 | |
3363 | open my $fh, "<:utf8", "$CONFDIR/config" |
3439 | open my $fh, "<:utf8", "$CONFDIR/config" |
3364 | or return; |
3440 | or return; |
3365 | |
3441 | |
3366 | local $/; |
3442 | local $/; |
3367 | *CFG = YAML::Load <$fh>; |
3443 | *CFG = YAML::XS::Load scalar <$fh>; |
3368 | |
3444 | |
3369 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; |
3445 | $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; |
3370 | |
3446 | |
3371 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3447 | $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; |
3372 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
3448 | $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; |
… | |
… | |
3376 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3452 | $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" |
3377 | and die "WARNING: m(un)lockall failed: $!\n"; |
3453 | and die "WARNING: m(un)lockall failed: $!\n"; |
3378 | }; |
3454 | }; |
3379 | warn $@ if $@; |
3455 | warn $@ if $@; |
3380 | } |
3456 | } |
|
|
3457 | |
|
|
3458 | warn "finished reloading resource files\n"; |
3381 | } |
3459 | } |
3382 | |
3460 | |
3383 | sub pidfile() { |
3461 | sub pidfile() { |
3384 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3462 | sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT |
3385 | or die "$PIDFILE: $!"; |
3463 | or die "$PIDFILE: $!"; |
… | |
… | |
3397 | |
3475 | |
3398 | seek $fh, 0, 0; |
3476 | seek $fh, 0, 0; |
3399 | print $fh $$; |
3477 | print $fh $$; |
3400 | } |
3478 | } |
3401 | |
3479 | |
|
|
3480 | sub main_loop { |
|
|
3481 | warn "EV::loop starting\n"; |
|
|
3482 | if (1) { |
|
|
3483 | EV::loop; |
|
|
3484 | } |
|
|
3485 | warn "EV::loop returned\n"; |
|
|
3486 | goto &main_loop unless $REALLY_UNLOOP; |
|
|
3487 | } |
|
|
3488 | |
3402 | sub main { |
3489 | sub main { |
3403 | cf::init_globals; # initialise logging |
3490 | cf::init_globals; # initialise logging |
3404 | |
3491 | |
3405 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3492 | LOG llevInfo, "Welcome to Deliantra, v" . VERSION; |
3406 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
3493 | LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team."; |
… | |
… | |
3409 | |
3496 | |
3410 | cf::init_experience; |
3497 | cf::init_experience; |
3411 | cf::init_anim; |
3498 | cf::init_anim; |
3412 | cf::init_attackmess; |
3499 | cf::init_attackmess; |
3413 | cf::init_dynamic; |
3500 | cf::init_dynamic; |
3414 | cf::init_block; |
|
|
3415 | |
3501 | |
3416 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3502 | $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority |
3417 | |
3503 | |
3418 | # we must not ever block the main coroutine |
3504 | # we must not ever block the main coroutine |
3419 | local $Coro::idle = sub { |
3505 | local $Coro::idle = sub { |
… | |
… | |
3425 | }; |
3511 | }; |
3426 | |
3512 | |
3427 | evthread_start IO::AIO::poll_fileno; |
3513 | evthread_start IO::AIO::poll_fileno; |
3428 | |
3514 | |
3429 | cf::sync_job { |
3515 | cf::sync_job { |
|
|
3516 | cf::load_settings; |
|
|
3517 | cf::load_materials; |
|
|
3518 | |
3430 | reload_resources; |
3519 | reload_resources; |
3431 | reload_config; |
3520 | reload_config; |
3432 | db_init; |
3521 | db_init; |
3433 | |
3522 | |
3434 | cf::load_settings; |
|
|
3435 | cf::load_materials; |
|
|
3436 | cf::init_uuid; |
3523 | cf::init_uuid; |
3437 | cf::init_signals; |
3524 | cf::init_signals; |
3438 | cf::init_commands; |
3525 | cf::init_commands; |
3439 | cf::init_skills; |
3526 | cf::init_skills; |
3440 | |
3527 | |
… | |
… | |
3445 | load_extensions; |
3532 | load_extensions; |
3446 | |
3533 | |
3447 | utime time, time, $RUNTIMEFILE; |
3534 | utime time, time, $RUNTIMEFILE; |
3448 | |
3535 | |
3449 | # no (long-running) fork's whatsoever before this point(!) |
3536 | # no (long-running) fork's whatsoever before this point(!) |
|
|
3537 | use POSIX (); |
3450 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3538 | POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD}; |
3451 | |
3539 | |
3452 | (pop @POST_INIT)->(0) while @POST_INIT; |
3540 | (pop @POST_INIT)->(0) while @POST_INIT; |
3453 | }; |
3541 | }; |
3454 | |
3542 | |
3455 | EV::loop; |
3543 | main_loop; |
3456 | } |
3544 | } |
3457 | |
3545 | |
3458 | ############################################################################# |
3546 | ############################################################################# |
3459 | # initialisation and cleanup |
3547 | # initialisation and cleanup |
3460 | |
3548 | |
… | |
… | |
3555 | } |
3643 | } |
3556 | |
3644 | |
3557 | sub emergency_save() { |
3645 | sub emergency_save() { |
3558 | my $freeze_guard = cf::freeze_mainloop; |
3646 | my $freeze_guard = cf::freeze_mainloop; |
3559 | |
3647 | |
3560 | warn "enter emergency perl save\n"; |
3648 | warn "emergency_perl_save: enter\n"; |
3561 | |
3649 | |
3562 | cf::sync_job { |
3650 | cf::sync_job { |
|
|
3651 | # this is a trade-off: we want to be very quick here, so |
|
|
3652 | # save all maps without fsync, and later call a global sync |
|
|
3653 | # (which in turn might be very very slow) |
|
|
3654 | local $USE_FSYNC = 0; |
|
|
3655 | |
3563 | # use a peculiar iteration method to avoid tripping on perl |
3656 | # use a peculiar iteration method to avoid tripping on perl |
3564 | # refcount bugs in for. also avoids problems with players |
3657 | # refcount bugs in for. also avoids problems with players |
3565 | # and maps saved/destroyed asynchronously. |
3658 | # and maps saved/destroyed asynchronously. |
3566 | warn "begin emergency player save\n"; |
3659 | warn "emergency_perl_save: begin player save\n"; |
3567 | for my $login (keys %cf::PLAYER) { |
3660 | for my $login (keys %cf::PLAYER) { |
3568 | my $pl = $cf::PLAYER{$login} or next; |
3661 | my $pl = $cf::PLAYER{$login} or next; |
3569 | $pl->valid or next; |
3662 | $pl->valid or next; |
3570 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3663 | delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt |
3571 | $pl->save; |
3664 | $pl->save; |
3572 | } |
3665 | } |
3573 | warn "end emergency player save\n"; |
3666 | warn "emergency_perl_save: end player save\n"; |
3574 | |
3667 | |
3575 | warn "begin emergency map save\n"; |
3668 | warn "emergency_perl_save: begin map save\n"; |
3576 | for my $path (keys %cf::MAP) { |
3669 | for my $path (keys %cf::MAP) { |
3577 | my $map = $cf::MAP{$path} or next; |
3670 | my $map = $cf::MAP{$path} or next; |
3578 | $map->valid or next; |
3671 | $map->valid or next; |
3579 | $map->save; |
3672 | $map->save; |
3580 | } |
3673 | } |
3581 | warn "end emergency map save\n"; |
3674 | warn "emergency_perl_save: end map save\n"; |
3582 | |
3675 | |
3583 | warn "begin emergency database checkpoint\n"; |
3676 | warn "emergency_perl_save: begin database checkpoint\n"; |
3584 | BDB::db_env_txn_checkpoint $DB_ENV; |
3677 | BDB::db_env_txn_checkpoint $DB_ENV; |
3585 | warn "end emergency database checkpoint\n"; |
3678 | warn "emergency_perl_save: end database checkpoint\n"; |
3586 | |
3679 | |
3587 | warn "begin write uuid\n"; |
3680 | warn "emergency_perl_save: begin write uuid\n"; |
3588 | write_uuid_sync 1; |
3681 | write_uuid_sync 1; |
3589 | warn "end write uuid\n"; |
3682 | warn "emergency_perl_save: end write uuid\n"; |
3590 | }; |
3683 | }; |
3591 | |
3684 | |
|
|
3685 | warn "emergency_perl_save: starting sync()\n"; |
|
|
3686 | IO::AIO::aio_sync sub { |
|
|
3687 | warn "emergency_perl_save: finished sync()\n"; |
|
|
3688 | }; |
|
|
3689 | |
3592 | warn "leave emergency perl save\n"; |
3690 | warn "emergency_perl_save: leave\n"; |
3593 | } |
3691 | } |
3594 | |
3692 | |
3595 | sub post_cleanup { |
3693 | sub post_cleanup { |
3596 | my ($make_core) = @_; |
3694 | my ($make_core) = @_; |
3597 | |
3695 | |
… | |
… | |
3634 | warn "can only reload from main coroutine"; |
3732 | warn "can only reload from main coroutine"; |
3635 | return; |
3733 | return; |
3636 | } |
3734 | } |
3637 | |
3735 | |
3638 | return if $RELOAD++; |
3736 | return if $RELOAD++; |
|
|
3737 | |
|
|
3738 | my $t1 = EV::time; |
3639 | |
3739 | |
3640 | while ($RELOAD) { |
3740 | while ($RELOAD) { |
3641 | warn "reloading..."; |
3741 | warn "reloading..."; |
3642 | |
3742 | |
3643 | warn "entering sync_job"; |
3743 | warn "entering sync_job"; |
… | |
… | |
3704 | clear_package "safe::$_" |
3804 | clear_package "safe::$_" |
3705 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3805 | for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); |
3706 | |
3806 | |
3707 | warn "unloading cf.pm \"a bit\""; |
3807 | warn "unloading cf.pm \"a bit\""; |
3708 | delete $INC{"cf.pm"}; |
3808 | delete $INC{"cf.pm"}; |
3709 | delete $INC{"cf/pod.pm"}; |
3809 | delete $INC{"cf/$_.pm"} for @EXTRA_MODULES; |
3710 | |
3810 | |
3711 | # don't, removes xs symbols, too, |
3811 | # don't, removes xs symbols, too, |
3712 | # and global variables created in xs |
3812 | # and global variables created in xs |
3713 | #clear_package __PACKAGE__; |
3813 | #clear_package __PACKAGE__; |
3714 | |
3814 | |
3715 | warn "unload completed, starting to reload now"; |
3815 | warn "unload completed, starting to reload now"; |
3716 | |
3816 | |
3717 | warn "reloading cf.pm"; |
3817 | warn "reloading cf.pm"; |
3718 | require cf; |
3818 | require cf; |
3719 | cf::_connect_to_perl; # nominally unnecessary, but cannot hurt |
3819 | cf::_connect_to_perl_1; |
3720 | |
3820 | |
3721 | warn "loading config and database again"; |
3821 | warn "loading config and database again"; |
3722 | cf::reload_config; |
3822 | cf::reload_config; |
3723 | |
3823 | |
3724 | warn "loading extensions"; |
3824 | warn "loading extensions"; |
3725 | cf::load_extensions; |
3825 | cf::load_extensions; |
3726 | |
3826 | |
|
|
3827 | if ($REATTACH_ON_RELOAD) { |
3727 | warn "reattaching attachments to objects/players"; |
3828 | warn "reattaching attachments to objects/players"; |
3728 | _global_reattach; # objects, sockets |
3829 | _global_reattach; # objects, sockets |
3729 | warn "reattaching attachments to maps"; |
3830 | warn "reattaching attachments to maps"; |
3730 | reattach $_ for values %MAP; |
3831 | reattach $_ for values %MAP; |
3731 | warn "reattaching attachments to players"; |
3832 | warn "reattaching attachments to players"; |
3732 | reattach $_ for values %PLAYER; |
3833 | reattach $_ for values %PLAYER; |
|
|
3834 | } |
3733 | |
3835 | |
3734 | warn "running post_load"; |
3836 | warn "running post_init jobs"; |
3735 | (pop @POST_INIT)->(1) while @POST_INIT; |
3837 | (pop @POST_INIT)->(1) while @POST_INIT; |
3736 | |
3838 | |
3737 | warn "leaving sync_job"; |
3839 | warn "leaving sync_job"; |
3738 | |
3840 | |
3739 | 1 |
3841 | 1 |
… | |
… | |
3743 | }; |
3845 | }; |
3744 | |
3846 | |
3745 | warn "reloaded"; |
3847 | warn "reloaded"; |
3746 | --$RELOAD; |
3848 | --$RELOAD; |
3747 | } |
3849 | } |
|
|
3850 | |
|
|
3851 | $t1 = EV::time - $t1; |
|
|
3852 | warn "reload completed in ${t1}s\n"; |
3748 | }; |
3853 | }; |
3749 | |
3854 | |
3750 | our $RELOAD_WATCHER; # used only during reload |
3855 | our $RELOAD_WATCHER; # used only during reload |
3751 | |
3856 | |
3752 | sub reload_perl() { |
3857 | sub reload_perl() { |
3753 | # doing reload synchronously and two reloads happen back-to-back, |
3858 | # doing reload synchronously and two reloads happen back-to-back, |
3754 | # coro crashes during coro_state_free->destroy here. |
3859 | # coro crashes during coro_state_free->destroy here. |
3755 | |
3860 | |
|
|
3861 | $RELOAD_WATCHER ||= cf::async { |
|
|
3862 | Coro::AIO::aio_wait cache_extensions; |
|
|
3863 | |
3756 | $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub { |
3864 | $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub { |
3757 | do_reload_perl; |
3865 | do_reload_perl; |
3758 | undef $RELOAD_WATCHER; |
3866 | undef $RELOAD_WATCHER; |
|
|
3867 | }; |
3759 | }; |
3868 | }; |
3760 | } |
3869 | } |
3761 | |
3870 | |
3762 | register_command "reload" => sub { |
3871 | register_command "reload" => sub { |
3763 | my ($who, $arg) = @_; |
3872 | my ($who, $arg) = @_; |
… | |
… | |
3777 | |
3886 | |
3778 | our @WAIT_FOR_TICK; |
3887 | our @WAIT_FOR_TICK; |
3779 | our @WAIT_FOR_TICK_BEGIN; |
3888 | our @WAIT_FOR_TICK_BEGIN; |
3780 | |
3889 | |
3781 | sub wait_for_tick { |
3890 | sub wait_for_tick { |
3782 | return if tick_inhibit || $Coro::current == $Coro::main; |
3891 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3783 | |
3892 | |
3784 | my $signal = new Coro::Signal; |
3893 | my $signal = new Coro::Signal; |
3785 | push @WAIT_FOR_TICK, $signal; |
3894 | push @WAIT_FOR_TICK, $signal; |
3786 | $signal->wait; |
3895 | $signal->wait; |
3787 | } |
3896 | } |
3788 | |
3897 | |
3789 | sub wait_for_tick_begin { |
3898 | sub wait_for_tick_begin { |
3790 | return if tick_inhibit || $Coro::current == $Coro::main; |
3899 | return Coro::cede if tick_inhibit || $Coro::current == $Coro::main; |
3791 | |
3900 | |
3792 | my $signal = new Coro::Signal; |
3901 | my $signal = new Coro::Signal; |
3793 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3902 | push @WAIT_FOR_TICK_BEGIN, $signal; |
3794 | $signal->wait; |
3903 | $signal->wait; |
3795 | } |
3904 | } |
… | |
… | |
3922 | LOG llevInfo, "[ABT] [suppressed]\n"; |
4031 | LOG llevInfo, "[ABT] [suppressed]\n"; |
3923 | } |
4032 | } |
3924 | } |
4033 | } |
3925 | |
4034 | |
3926 | # load additional modules |
4035 | # load additional modules |
3927 | use cf::pod; |
4036 | require "cf/$_.pm" for @EXTRA_MODULES; |
|
|
4037 | cf::_connect_to_perl_2; |
3928 | |
4038 | |
3929 | END { cf::emergency_save } |
4039 | END { cf::emergency_save } |
3930 | |
4040 | |
3931 | 1 |
4041 | 1 |
3932 | |
4042 | |