ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.220 by root, Sat Feb 17 23:54:35 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Storable; 30use Socket;
31use EV;
9use Opcode; 32use Opcode;
10use Safe; 33use Safe;
11use Safe::Hole; 34use Safe::Hole;
35use Storable ();
12 36
13use Coro 3.5 (); 37use Coro ();
38use Coro::State;
39use Coro::Handle;
40use Coro::EV;
14use Coro::Event; 41use Coro::AnyEvent;
15use Coro::Timer; 42use Coro::Timer;
16use Coro::Signal; 43use Coro::Signal;
17use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
18use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
48use Coro::Storable;
49use Coro::Util ();
19 50
51use JSON::XS 2.01 ();
20use BDB (); 52use BDB ();
21use Data::Dumper; 53use Data::Dumper;
22use Digest::MD5; 54use Digest::MD5;
23use Fcntl; 55use Fcntl;
56use YAML ();
24use IO::AIO 2.32 (); 57use IO::AIO ();
25use YAML::Syck ();
26use Time::HiRes; 58use Time::HiRes;
27use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
28 61
62AnyEvent::detect;
63
64# configure various modules to our taste
65#
66$Storable::canonical = 1; # reduce rsync transfers
67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
29Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
30 69
31use Event; $Event::Eval = 1; # no idea why this is required, but it is 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 71
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34
35# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
36$YAML::Syck::ImplicitUnicode = 1;
37
38$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
39 73
40our %COMMAND = (); 74our %COMMAND = ();
41our %COMMAND_TIME = (); 75our %COMMAND_TIME = ();
42 76
43our @EXTS = (); # list of extension package names 77our @EXTS = (); # list of extension package names
44our %EXTCMD = (); 78our %EXTCMD = ();
79our %EXTICMD = ();
45our %EXT_CORO = (); # coroutines bound to extensions 80our %EXT_CORO = (); # coroutines bound to extensions
46our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
47 82
83our $RELOAD; # number of reloads so far
48our @EVENT; 84our @EVENT;
49our $LIBDIR = datadir . "/ext";
50 85
51our $TICK = MAX_TIME * 1e-6; 86our $CONFDIR = confdir;
52our $TICK_WATCHER; 87our $DATADIR = datadir;
53our $AIO_POLL_WATCHER; 88our $LIBDIR = "$DATADIR/ext";
89our $PODDIR = "$DATADIR/pod";
90our $MAPDIR = "$DATADIR/" . mapdir;
91our $LOCALDIR = localdir;
92our $TMPDIR = "$LOCALDIR/" . tmpdir;
93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
95our $RANDOMDIR = "$LOCALDIR/random";
96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
98
99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
54our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
55our $NEXT_TICK; 101our $NEXT_TICK;
56our $NOW;
57our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
58 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
59our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
60our $DB_ENV; 107our $DB_ENV;
61 108
62our %CFG; 109our %CFG;
63 110
64our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
65our $RUNTIME; 112our $RUNTIME;
113our $NOW;
66 114
67our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
68our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
69our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
70our $RANDOM_MAPS = cf::localdir . "/random";
71our $BDB_ENV_DIR = cf::localdir . "/db";
72
73our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
74our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
75 118
76# used to convert map paths into valid unix filenames by replacing / by ∕ 119# used to convert map paths into valid unix filenames by replacing / by ∕
77our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
78 121
122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
125our $TICK_START; # for load detecting purposes
126
79binmode STDOUT; 127binmode STDOUT;
80binmode STDERR; 128binmode STDERR;
81 129
82# read virtual server time, if available 130# read virtual server time, if available
83unless ($RUNTIME || !-e cf::localdir . "/runtime") { 131unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
84 open my $fh, "<", cf::localdir . "/runtime" 132 open my $fh, "<", "$LOCALDIR/runtime"
85 or die "unable to read runtime file: $!"; 133 or die "unable to read runtime file: $!";
86 $RUNTIME = <$fh> + 0.; 134 $RUNTIME = <$fh> + 0.;
87} 135}
88 136
89mkdir cf::localdir; 137mkdir $_
90mkdir cf::localdir . "/" . cf::playerdir; 138 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
91mkdir cf::localdir . "/" . cf::tmpdir;
92mkdir cf::localdir . "/" . cf::uniquedir;
93mkdir $RANDOM_MAPS;
94mkdir $BDB_ENV_DIR;
95 139
96our $EMERGENCY_POSITION; 140our $EMERGENCY_POSITION;
97 141
98sub cf::map::normalise; 142sub cf::map::normalise;
99 143
110=item $cf::RUNTIME 154=item $cf::RUNTIME
111 155
112The time this server has run, starts at 0 and is increased by $cf::TICK on 156The time this server has run, starts at 0 and is increased by $cf::TICK on
113every server tick. 157every server tick.
114 158
115=item $cf::LIBDIR 159=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
160$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
161$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
116 162
117The perl library directory, where extensions and cf-specific modules can 163Various directories - "/etc", read-only install directory, perl-library
118be found. It will be added to C<@INC> automatically. 164directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
165unique-items directory, player file directory, random maps directory and
166database environment.
119 167
120=item $cf::NOW 168=item $cf::NOW
121 169
122The time of the last (current) server tick. 170The time of the last (current) server tick.
123 171
124=item $cf::TICK 172=item $cf::TICK
125 173
126The interval between server ticks, in seconds. 174The interval between server ticks, in seconds.
127 175
176=item $cf::LOADAVG
177
178The current CPU load on the server (alpha-smoothed), as a value between 0
179(none) and 1 (overloaded), indicating how much time is spent on processing
180objects per tick. Healthy values are < 0.5.
181
182=item $cf::LOAD
183
184The raw value load value from the last tick.
185
128=item %cf::CFG 186=item %cf::CFG
129 187
130Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
131from wherever your confdir points to. 189from wherever your confdir points to.
132 190
133=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 191=item cf::wait_for_tick, cf::wait_for_tick_begin
134 192
135These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
136or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 194returns directly I<after> the tick processing (and consequently, can only wake one process
137processing has been done. Call C<< ->wait >> on them to maximise the 195per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
138window of cpu time available, or simply to synchronise to the server tick. 196
197=item @cf::INVOKE_RESULTS
198
199This array contains the results of the last C<invoke ()> call. When
200C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
201that call.
139 202
140=back 203=back
141 204
142=cut 205=cut
143 206
144BEGIN { 207BEGIN {
145 *CORE::GLOBAL::warn = sub { 208 *CORE::GLOBAL::warn = sub {
146 my $msg = join "", @_; 209 my $msg = join "", @_;
147 utf8::encode $msg;
148 210
149 $msg .= "\n" 211 $msg .= "\n"
150 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
151 213
214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
215
152 LOG llevError, $msg; 216 LOG llevError, $msg;
153 }; 217 };
154} 218}
219
220$Coro::State::DIEHOOK = sub {
221 return unless $^S eq 0; # "eq", not "=="
222
223 if ($Coro::current == $Coro::main) {#d#
224 warn "DIEHOOK called in main context, Coro bug?\n";#d#
225 return;#d#
226 }#d#
227
228 # kill coroutine otherwise
229 warn Carp::longmess $_[0];
230 Coro::terminate
231};
232
233$SIG{__DIE__} = sub { }; #d#?
155 234
156@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
157@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
158@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
159@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
160@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 239@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
240@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
161@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 241@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
162 242
163# we bless all objects into (empty) derived classes to force a method lookup 243# we bless all objects into (empty) derived classes to force a method lookup
164# within the Safe compartment. 244# within the Safe compartment.
165for my $pkg (qw( 245for my $pkg (qw(
166 cf::global cf::attachable 246 cf::global cf::attachable
167 cf::object cf::object::player 247 cf::object cf::object::player
168 cf::client cf::player 248 cf::client cf::player
169 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
170 cf::map cf::party cf::region 251 cf::party cf::region
171)) { 252)) {
172 no strict 'refs';
173 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
174} 254}
175 255
176$Event::DIED = sub { 256$EV::DIED = sub {
177 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
178}; 258};
259
260#############################################################################
179 261
180=head2 UTILITY FUNCTIONS 262=head2 UTILITY FUNCTIONS
181 263
182=over 4 264=over 4
183 265
202 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 284 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
203 $d 285 $d
204 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
205} 287}
206 288
207use JSON::Syck (); # TODO# replace by JSON::PC once working
208
209=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
210 290
211Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
212 292
213=cut
214
215sub from_json($) {
216 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
217 JSON::Syck::Load $_[0]
218}
219
220=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
221 294
222Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
223 296
224=cut 297=cut
225 298
226sub to_json($) { 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
227 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 300
228 JSON::Syck::Dump $_[0] 301sub encode_json($) { $json_coder->encode ($_[0]) }
229} 302sub decode_json($) { $json_coder->decode ($_[0]) }
230 303
231=item cf::lock_wait $string 304=item cf::lock_wait $string
232 305
233Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
234 307
237Wait until the given lock is available and then acquires it and returns 310Wait until the given lock is available and then acquires it and returns
238a Coro::guard object. If the guard object gets destroyed (goes out of scope, 311a Coro::guard object. If the guard object gets destroyed (goes out of scope,
239for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
240returned. 313returned.
241 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
242Lock names should begin with a unique identifier (for example, cf::map::find 318Lock names should begin with a unique identifier (for example, cf::map::find
243uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
244 320
321=item $locked = cf::lock_active $string
322
323Return true if the lock is currently active, i.e. somebody has locked it.
324
245=cut 325=cut
246 326
247our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
248 329
249sub lock_wait($) { 330sub lock_wait($) {
250 my ($key) = @_; 331 my ($key) = @_;
332
333 if ($LOCKER{$key} == $Coro::current) {#d#
334 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
335 return;#d#
336 }#d#
251 337
252 # wait for lock, if any 338 # wait for lock, if any
253 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
254 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
255 Coro::schedule; 341 Coro::schedule;
261 347
262 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
263 lock_wait $key; 349 lock_wait $key;
264 350
265 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
266 353
267 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
268 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
269 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
270 } 358 }
271} 359}
272 360
361sub lock_active($) {
362 my ($key) = @_;
363
364 ! ! $LOCK{$key}
365}
366
273sub freeze_mainloop { 367sub freeze_mainloop {
274 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
275 369
276 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
277 $TICK_WATCHER->start; 371}
372
373=item cf::periodic $interval, $cb
374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
386}
387
388=item cf::get_slot $time[, $priority[, $name]]
389
390Allocate $time seconds of blocking CPU time at priority C<$priority>:
391This call blocks and returns only when you have at least C<$time> seconds
392of cpu time till the next tick. The slot is only valid till the next cede.
393
394The optional C<$name> can be used to identify the job to run. It might be
395used for statistical purposes and should identify the same time-class.
396
397Useful for short background jobs.
398
399=cut
400
401our @SLOT_QUEUE;
402our $SLOT_QUEUE;
403
404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
408 my $signal = new Coro::Signal;
409
410 while () {
411 next_job:
412 my $avail = cf::till_tick;
413 if ($avail > 0.01) {
414 for (0 .. $#SLOT_QUEUE) {
415 if ($SLOT_QUEUE[$_][0] < $avail) {
416 my $job = splice @SLOT_QUEUE, $_, 1, ();
417 $job->[2]->send;
418 Coro::cede;
419 goto next_job;
420 }
421 }
422 }
423
424 if (@SLOT_QUEUE) {
425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
426 push @cf::WAIT_FOR_TICK, $signal;
427 $signal->wait;
428 } else {
429 Coro::schedule;
430 }
278 }; 431 }
279 $TICK_WATCHER->stop; 432};
280 $guard 433
434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
437 my ($time, $pri, $name) = @_;
438
439 $time = $TICK * .6 if $time > $TICK * .6;
440 my $sig = new Coro::Signal;
441
442 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
443 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
444 $SLOT_QUEUE->ready;
445 $sig->wait;
281} 446}
282 447
283=item cf::async { BLOCK } 448=item cf::async { BLOCK }
284 449
285Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
290 455
291BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
292 457
293=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
294 459
295The design of crossfire+ requires that the main coro ($Coro::main) is 460The design of Deliantra requires that the main coroutine ($Coro::main)
296always able to handle events or runnable, as crossfire+ is only partly 461is always able to handle events or runnable, as Deliantra is only
297reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
463acceptable.
298 464
299If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
300the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
301server will be frozen during this time, so the block should either finish 467server will be frozen during this time, so the block should either finish
302fast or be very important. 468fast or be very important.
305 471
306sub sync_job(&) { 472sub sync_job(&) {
307 my ($job) = @_; 473 my ($job) = @_;
308 474
309 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
476 my $time = EV::time;
477
310 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
311 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
312 480
313 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
314 # (but this is cancel-safe) 482
315 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
316 484
317 my $busy = 1; 485 my $busy = 1;
318 my @res; 486 my @res;
319 487
320 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
321 @res = eval { $job->() }; 490 @res = eval { $job->() };
322 warn $@ if $@; 491 warn $@ if $@;
323 undef $busy; 492 undef $busy;
324 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
325 494
326 while ($busy) { 495 while ($busy) {
327 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
328 } 500 }
501 }
502
503 my $time = EV::time - $time;
504
505 $TICK_START += $time; # do not account sync jobs to server load
329 506
330 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
331 } else { 508 } else {
332 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
333 510
353 $EXT_CORO{$coro+0} = $coro; 530 $EXT_CORO{$coro+0} = $coro;
354 531
355 $coro 532 $coro
356} 533}
357 534
358sub write_runtime { 535=item fork_call { }, $args
359 my $guard = cf::lock_acquire "write_runtime";
360 536
361 my $runtime = cf::localdir . "/runtime"; 537Executes the given code block with the given arguments in a seperate
538process, returning the results. Everything must be serialisable with
539Coro::Storable. May, of course, block. Note that the executed sub may
540never block itself or use any form of event handling.
362 541
363 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 542=cut
364 or return;
365 543
366 my $value = $cf::RUNTIME + 90 + 10; 544sub fork_call(&@) {
367 # 10 is the runtime save interval, for a monotonic clock 545 my ($cb, @args) = @_;
368 # 60 allows for the watchdog to kill the server.
369 546
370 (aio_write $fh, 0, (length $value), $value, 0) <= 0 547 # we seemingly have to make a local copy of the whole thing,
371 and return; 548 # otherwise perl prematurely frees the stuff :/
549 # TODO: investigate and fix (likely this will be rather laborious)
372 550
373 # always fsync - this file is important 551 my @res = Coro::Util::fork_eval {
374 aio_fsync $fh 552 reset_signals;
375 and return; 553 &$cb
554 }, @args;
376 555
377 close $fh 556 wantarray ? @res : $res[-1]
378 or return; 557}
379 558
380 aio_rename "$runtime~", $runtime 559=item $coin = coin_from_name $name
381 and return;
382 560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
585
586=item $value = cf::db_get $family => $key
587
588Returns a single value from the environment database.
589
590=item cf::db_put $family => $key => $value
591
592Stores the given C<$value> in the family. It can currently store binary
593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
594
595=item $db = cf::db_table "name"
596
597Create and/or open a new database table. The string must not be "db" and must be unique
598within each server.
599
600=cut
601
602sub db_table($) {
603 my ($name) = @_;
604 my $db = BDB::db_create $DB_ENV;
605
606 eval {
607 $db->set_flags (BDB::CHKSUM);
608
609 utf8::encode $name;
610 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
611 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
612 cf::cleanup "db_open(db): $!" if $!;
613 };
614 cf::cleanup "db_open(db): $@" if $@;
615
616 $db
617}
618
619our $DB;
620
621sub db_init {
622 cf::sync_job {
623 $DB ||= db_table "db";
624 };
625}
626
627sub db_get($$) {
628 my $key = "$_[0]/$_[1]";
629
630 cf::sync_job {
631 BDB::db_get $DB, undef, $key, my $data;
632
633 $! ? ()
634 : $data
383 1 635 }
636}
637
638sub db_put($$$) {
639 BDB::dbreq_pri 4;
640 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
641}
642
643=item cf::cache $id => [$paths...], $processversion => $process
644
645Generic caching function that returns the value of the resource $id,
646caching and regenerating as required.
647
648This function can block.
649
650=cut
651
652sub cache {
653 my ($id, $src, $processversion, $process) = @_;
654
655 my $meta =
656 join "\x00",
657 $processversion,
658 map {
659 aio_stat $_
660 and Carp::croak "$_: $!";
661
662 ($_, (stat _)[7,9])
663 } @$src;
664
665 my $dbmeta = db_get cache => "$id/meta";
666 if ($dbmeta ne $meta) {
667 # changed, we may need to process
668
669 my @data;
670 my $md5;
671
672 for (0 .. $#$src) {
673 0 <= aio_load $src->[$_], $data[$_]
674 or Carp::croak "$src->[$_]: $!";
675 }
676
677 # if processing is expensive, check
678 # checksum first
679 if (1) {
680 $md5 =
681 join "\x00",
682 $processversion,
683 map {
684 cf::cede_to_tick;
685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
686 } 0.. $#$src;
687
688
689 my $dbmd5 = db_get cache => "$id/md5";
690 if ($dbmd5 eq $md5) {
691 db_put cache => "$id/meta", $meta;
692
693 return db_get cache => "$id/data";
694 }
695 }
696
697 my $t1 = Time::HiRes::time;
698 my $data = $process->(\@data);
699 my $t2 = Time::HiRes::time;
700
701 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
702
703 db_put cache => "$id/data", $data;
704 db_put cache => "$id/md5" , $md5;
705 db_put cache => "$id/meta", $meta;
706
707 return $data;
708 }
709
710 db_get cache => "$id/data"
711}
712
713=item cf::datalog type => key => value, ...
714
715Log a datalog packet of the given type with the given key-value pairs.
716
717=cut
718
719sub datalog($@) {
720 my ($type, %kv) = @_;
721 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
384} 722}
385 723
386=back 724=back
387 725
388=cut 726=cut
395attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
396to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
397 735
398In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
399C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
400crossfire+). 738Deliantra).
401 739
402=over 4 740=over 4
403 741
404=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
405 743
568 $registry = $CB_TYPE[$object_type] ||= []; 906 $registry = $CB_TYPE[$object_type] ||= [];
569 907
570 } elsif ($type eq "subtype") { 908 } elsif ($type eq "subtype") {
571 defined $object_type or Carp::croak "subtype specified without type"; 909 defined $object_type or Carp::croak "subtype specified without type";
572 my $object_subtype = shift @arg; 910 my $object_subtype = shift @arg;
573 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 911 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
574 912
575 } elsif ($type eq "package") { 913 } elsif ($type eq "package") {
576 my $pkg = shift @arg; 914 my $pkg = shift @arg;
577 915
578 while (my ($name, $id) = each %cb_id) { 916 while (my ($name, $id) = each %cb_id) {
607 _attach $registry, $klass, @attach; 945 _attach $registry, $klass, @attach;
608 } 946 }
609 947
610 $obj->{$name} = \%arg; 948 $obj->{$name} = \%arg;
611 } else { 949 } else {
612 warn "object uses attachment '$name' that is not available, postponing.\n"; 950 warn "object uses attachment '$name' which is not available, postponing.\n";
613 } 951 }
614 952
615 $obj->{_attachment}{$name} = undef; 953 $obj->{_attachment}{$name} = undef;
616} 954}
617 955
619 if (ref $_[0]) { 957 if (ref $_[0]) {
620 _object_attach @_; 958 _object_attach @_;
621 } else { 959 } else {
622 _attach shift->_attach_registry, @_; 960 _attach shift->_attach_registry, @_;
623 } 961 }
962 _recalc_want;
624}; 963};
625 964
626# all those should be optimised 965# all those should be optimised
627sub cf::attachable::detach { 966sub cf::attachable::detach {
628 my ($obj, $name) = @_; 967 my ($obj, $name) = @_;
631 delete $obj->{_attachment}{$name}; 970 delete $obj->{_attachment}{$name};
632 reattach ($obj); 971 reattach ($obj);
633 } else { 972 } else {
634 Carp::croak "cannot, currently, detach class attachments"; 973 Carp::croak "cannot, currently, detach class attachments";
635 } 974 }
975 _recalc_want;
636}; 976};
637 977
638sub cf::attachable::attached { 978sub cf::attachable::attached {
639 my ($obj, $name) = @_; 979 my ($obj, $name) = @_;
640 980
655 "; 995 ";
656 die if $@; 996 die if $@;
657} 997}
658 998
659our $override; 999our $override;
660our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1000our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
661 1001
662sub override { 1002sub override {
663 $override = 1; 1003 $override = 1;
664 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
665} 1005}
666 1006
667sub do_invoke { 1007sub do_invoke {
668 my $event = shift; 1008 my $event = shift;
669 my $callbacks = shift; 1009 my $callbacks = shift;
670 1010
671 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
672 1012
673 local $override; 1013 local $override;
674 1014
675 for (@$callbacks) { 1015 for (@$callbacks) {
676 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
685 } 1025 }
686 1026
687 0 1027 0
688} 1028}
689 1029
690=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
691 1031
692=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
693 1033
694Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
695 1035
696This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1036This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
697removed in future versions), and there is no public API to access override 1037removed in future versions), and there is no public API to access override
698results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
699 1039
700=back 1040=back
701 1041
702=cut 1042=cut
703 1043
704############################################################################# 1044#############################################################################
705# object support 1045# object support
1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
1080sub _can_merge {
1081 my ($ob1, $ob2) = @_;
1082
1083 ++$SLOW_MERGES;#d#
1084
1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
1087}
706 1088
707sub reattach { 1089sub reattach {
708 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
709 my ($obj) = @_; 1091 my ($obj) = @_;
710 1092
1093 # no longer needed after getting rid of delete_package?
711 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
712 1095
713 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
714 1097
715 @$registry = (); 1098 @$registry = ();
716 1099
731cf::attachable->attach ( 1114cf::attachable->attach (
732 prio => -1000000, 1115 prio => -1000000,
733 on_instantiate => sub { 1116 on_instantiate => sub {
734 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
735 1118
736 $data = from_json $data; 1119 $data = decode_json $data;
737 1120
738 for (@$data) { 1121 for (@$data) {
739 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
740 1123
741 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
757sub object_freezer_save { 1140sub object_freezer_save {
758 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
759 1142
760 sync_job { 1143 sync_job {
761 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
762 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
763 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
764 1148
765 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
766 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
767 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
768 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
769 close $fh; 1153 aio_close $fh;
770 1154
771 if (@$objs) { 1155 if (@$objs) {
772 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
773 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
774 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
775 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
776 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
777 close $fh; 1161 aio_close $fh;
778 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
779 } 1163 }
780 } else { 1164 } else {
781 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
782 } 1166 }
787 } 1171 }
788 } else { 1172 } else {
789 aio_unlink $filename; 1173 aio_unlink $filename;
790 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
791 } 1175 }
792 } 1176 };
793} 1177}
794 1178
795sub object_freezer_as_string { 1179sub object_freezer_as_string {
796 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
797 1181
809 or return; 1193 or return;
810 1194
811 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
812 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
813 or return; 1197 or return;
1198
814 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
815 } 1201 }
816 1202
1203 utf8::decode (my $decname = $filename);
817 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
818 $filename, length $data, scalar @{$av || []};#d# 1205 $decname, length $data, scalar @{$av || []};
1206
819 return ($data, $av); 1207 ($data, $av)
820} 1208}
1209
1210=head2 COMMAND CALLBACKS
1211
1212=over 4
1213
1214=cut
821 1215
822############################################################################# 1216#############################################################################
823# command handling &c 1217# command handling &c
824 1218
825=item cf::register_command $name => \&callback($ob,$args); 1219=item cf::register_command $name => \&callback($ob,$args);
838 push @{ $COMMAND{$name} }, [$caller, $cb]; 1232 push @{ $COMMAND{$name} }, [$caller, $cb];
839} 1233}
840 1234
841=item cf::register_extcmd $name => \&callback($pl,$packet); 1235=item cf::register_extcmd $name => \&callback($pl,$packet);
842 1236
843Register a callbackf ro execution when the client sends an extcmd packet. 1237Register a callback for execution when the client sends an (synchronous)
1238extcmd packet. Ext commands will be processed in the order they are
1239received by the server, like other user commands. The first argument is
1240the logged-in player. Ext commands can only be processed after a player
1241has logged in successfully.
844 1242
845If the callback returns something, it is sent back as if reply was being 1243If the callback returns something, it is sent back as if reply was being
846called. 1244called.
847 1245
1246=item cf::register_exticmd $name => \&callback($ns,$packet);
1247
1248Register a callback for execution when the client sends an (asynchronous)
1249exticmd packet. Exti commands are processed by the server as soon as they
1250are received, i.e. out of order w.r.t. other commands. The first argument
1251is a client socket. Exti commands can be received anytime, even before
1252log-in.
1253
1254If the callback returns something, it is sent back as if reply was being
1255called.
1256
848=cut 1257=cut
849 1258
850sub register_extcmd { 1259sub register_extcmd {
851 my ($name, $cb) = @_; 1260 my ($name, $cb) = @_;
852 1261
853 $EXTCMD{$name} = $cb; 1262 $EXTCMD{$name} = $cb;
1263}
1264
1265sub register_exticmd {
1266 my ($name, $cb) = @_;
1267
1268 $EXTICMD{$name} = $cb;
854} 1269}
855 1270
856cf::player->attach ( 1271cf::player->attach (
857 on_command => sub { 1272 on_command => sub {
858 my ($pl, $name, $params) = @_; 1273 my ($pl, $name, $params) = @_;
867 cf::override; 1282 cf::override;
868 }, 1283 },
869 on_extcmd => sub { 1284 on_extcmd => sub {
870 my ($pl, $buf) = @_; 1285 my ($pl, $buf) = @_;
871 1286
872 my $msg = eval { from_json $buf }; 1287 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
873 1288
874 if (ref $msg) { 1289 if (ref $msg) {
1290 my ($type, $reply, @payload) =
1291 "ARRAY" eq ref $msg
1292 ? @$msg
1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1294
1295 my @reply;
1296
875 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1297 if (my $cb = $EXTCMD{$type}) {
876 if (my %reply = $cb->($pl, $msg)) { 1298 @reply = $cb->($pl, @payload);
877 $pl->ext_reply ($msg->{msgid}, %reply);
878 }
879 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
880 } else { 1304 } else {
881 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
882 } 1306 }
883 1307
884 cf::override; 1308 cf::override;
885 }, 1309 },
886); 1310);
887 1311
888sub load_extension {
889 my ($path) = @_;
890
891 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
892 my $base = $1;
893 my $pkg = $1;
894 $pkg =~ s/[^[:word:]]/_/g;
895 $pkg = "ext::$pkg";
896
897 warn "... loading '$path' into '$pkg'\n";
898
899 open my $fh, "<:utf8", $path
900 or die "$path: $!";
901
902 my $source =
903 "package $pkg; use strict; use utf8;\n"
904 . "#line 1 \"$path\"\n{\n"
905 . (do { local $/; <$fh> })
906 . "\n};\n1";
907
908 unless (eval $source) {
909 my $msg = $@ ? "$path: $@\n"
910 : "extension disabled.\n";
911 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
912 warn $@;
913 warn "mandatory extension failed to load, exiting.\n";
914 exit 1;
915 }
916 die $@;
917 }
918
919 push @EXTS, $pkg;
920}
921
922sub load_extensions { 1312sub load_extensions {
1313 cf::sync_job {
1314 my %todo;
1315
923 for my $ext (<$LIBDIR/*.ext>) { 1316 for my $path (<$LIBDIR/*.ext>) {
924 next unless -r $ext; 1317 next unless -r $path;
925 eval { 1318
926 load_extension $ext; 1319 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1320 my $base = $1;
1321 my $pkg = $1;
1322 $pkg =~ s/[^[:word:]]/_/g;
1323 $pkg = "ext::$pkg";
1324
1325 open my $fh, "<:utf8", $path
1326 or die "$path: $!";
1327
1328 my $source = do { local $/; <$fh> };
1329
1330 my %ext = (
1331 path => $path,
1332 base => $base,
1333 pkg => $pkg,
1334 );
1335
1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1338
1339 $ext{source} =
1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1341 . "#line 1 \"$path\"\n{\n"
1342 . $source
1343 . "\n};\n1";
1344
1345 $todo{$base} = \%ext;
1346 }
1347
1348 my %done;
1349 while (%todo) {
1350 my $progress;
1351
1352 while (my ($k, $v) = each %todo) {
1353 for (split /,\s*/, $v->{meta}{depends}) {
1354 goto skip
1355 unless exists $done{$_};
1356 }
1357
1358 warn "... loading '$k' into '$v->{pkg}'\n";
1359
1360 unless (eval $v->{source}) {
1361 my $msg = $@ ? "$v->{path}: $@\n"
1362 : "$v->{base}: extension inactive.\n";
1363
1364 if (exists $v->{meta}{mandatory}) {
1365 warn $msg;
1366 cf::cleanup "mandatory extension failed to load, exiting.";
1367 }
1368
1369 warn $msg;
1370 }
1371
1372 $done{$k} = delete $todo{$k};
1373 push @EXTS, $v->{pkg};
1374 $progress = 1;
927 1 1375 }
928 } or warn "$ext not loaded: $@"; 1376
1377 skip:
1378 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1379 unless $progress;
1380 }
929 } 1381 };
930} 1382}
931 1383
932############################################################################# 1384#############################################################################
933 1385
1386=back
1387
934=head2 CORE EXTENSIONS 1388=head2 CORE EXTENSIONS
935 1389
936Functions and methods that extend core crossfire objects. 1390Functions and methods that extend core crossfire objects.
937 1391
938=cut 1392=cut
943 1397
944=head3 cf::player 1398=head3 cf::player
945 1399
946=over 4 1400=over 4
947 1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1415
948=item cf::player::find $login 1416=item cf::player::find $login
949 1417
950Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
951 1419
952=cut 1420=cut
953 1421
954sub playerdir($) { 1422sub playerdir($) {
955 cf::localdir 1423 "$PLAYERDIR/"
956 . "/"
957 . cf::playerdir
958 . "/"
959 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1424 . (ref $_[0] ? $_[0]->ob->name : $_[0])
960} 1425}
961 1426
962sub path($) { 1427sub path($) {
963 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1428 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
964 1429
965 (playerdir $login) . "/$login.pl" 1430 (playerdir $login) . "/playerdata"
966} 1431}
967 1432
968sub find_active($) { 1433sub find_active($) {
969 $cf::PLAYER{$_[0]} 1434 $cf::PLAYER{$_[0]}
970 and $cf::PLAYER{$_[0]}->active 1435 and $cf::PLAYER{$_[0]}->active
983 my $login = $_[0]; 1448 my $login = $_[0];
984 1449
985 my $guard = cf::lock_acquire "user_find:$login"; 1450 my $guard = cf::lock_acquire "user_find:$login";
986 1451
987 $cf::PLAYER{$_[0]} || do { 1452 $cf::PLAYER{$_[0]} || do {
988 my $pl = load_pl path $login 1453 # rename old playerfiles to new ones
1454 #TODO: remove when no longer required
1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1458 aio_unlink +(playerdir $login) . "/$login.pl";
1459
1460 my $f = new_from_file cf::object::thawer path $login
989 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
990 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
991 } 1469 }
992 } 1470 }
993} 1471}
994 1472
1003 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1004 1482
1005 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1006 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1007 1485
1486 cf::get_slot 0.01;
1487
1008 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1009 Coro::cede; 1489 cf::cede_to_tick;
1010} 1490}
1011 1491
1012sub new($) { 1492sub new($) {
1013 my ($login) = @_; 1493 my ($login) = @_;
1014 1494
1020 $cf::PLAYER{$login} = $self; 1500 $cf::PLAYER{$login} = $self;
1021 1501
1022 $self 1502 $self
1023} 1503}
1024 1504
1505=item $player->send_msg ($channel, $msg, $color, [extra...])
1506
1507=cut
1508
1509sub send_msg {
1510 my $ns = shift->ns
1511 or return;
1512 $ns->send_msg (@_);
1513}
1514
1025=item $pl->quit_character 1515=item $pl->quit_character
1026 1516
1027Nukes the player without looking back. If logged in, the connection will 1517Nukes the player without looking back. If logged in, the connection will
1028be destroyed. May block for a long time. 1518be destroyed. May block for a long time.
1029 1519
1037 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1038 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1039 1529
1040 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1041 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1042 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1043 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1044 1536
1045 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1046 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1054 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP; 1546 $cf::MAP{$_}->nuke for grep /$prefix/, keys %cf::MAP;
1055 1547
1056 IO::AIO::aio_rmtree $temp; 1548 IO::AIO::aio_rmtree $temp;
1057} 1549}
1058 1550
1551=item $pl->kick
1552
1553Kicks a player out of the game. This destroys the connection.
1554
1555=cut
1556
1557sub kick {
1558 my ($pl, $kicker) = @_;
1559
1560 $pl->invoke (cf::EVENT_PLAYER_KICK, $kicker);
1561 $pl->killer ("kicked");
1562 $pl->ns->destroy;
1563}
1564
1059=item cf::player::list_logins 1565=item cf::player::list_logins
1060 1566
1061Returns am arrayref of all valid playernames in the system, can take a 1567Returns am arrayref of all valid playernames in the system, can take a
1062while and may block, so not sync_job-capable, ever. 1568while and may block, so not sync_job-capable, ever.
1063 1569
1064=cut 1570=cut
1065 1571
1066sub list_logins { 1572sub list_logins {
1067 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1573 my $dirs = aio_readdir $PLAYERDIR
1068 or return []; 1574 or return [];
1069 1575
1070 my @logins; 1576 my @logins;
1071 1577
1072 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1073 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1074 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1075 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1076 1588
1077 utf8::decode $login; 1589 utf8::decode $login;
1078 push @logins, $login; 1590 push @logins, $login;
1079 } 1591 }
1080 1592
1107 } 1619 }
1108 1620
1109 \@paths 1621 \@paths
1110} 1622}
1111 1623
1624=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1625
1626Expand crossfire pod fragments into protocol xml.
1627
1628=cut
1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1641sub expand_cfpod {
1642 my ($self, $pod) = @_;
1643
1644 my $xml;
1645
1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1649
1650 $group =~ s/&/&amp;/g;
1651 $group =~ s/</&lt;/g;
1652
1653 $xml .= $group;
1654 } elsif ($pod =~ m%\G
1655 ([BCGHITU])
1656 <
1657 (?:
1658 ([^<>]*) (?{ $group = $^N })
1659 | < $interior >
1660 )
1661 >
1662 %gcsx
1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1683 "")
1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1695
1696 for ($xml) {
1697 # create single paragraphs (very hackish)
1698 s/(?<=\S)\n(?=\w)/ /g;
1699
1700 # compress some whitespace
1701 s/\s+\n/\n/g; # ws line-ends
1702 s/\n\n+/\n/g; # double lines
1703 s/^\n+//; # beginning lines
1704 s/\n+$//; # ending lines
1705 }
1706
1707 $xml
1708}
1709
1710no re 'eval';
1711
1712sub hintmode {
1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1714 $_[0]{hintmode}
1715}
1716
1112=item $player->ext_reply ($msgid, $msgtype, %msg) 1717=item $player->ext_reply ($msgid, @msg)
1113 1718
1114Sends an ext reply to the player. 1719Sends an ext reply to the player.
1115 1720
1116=cut 1721=cut
1117 1722
1118sub ext_reply($$$%) { 1723sub ext_reply($$@) {
1119 my ($self, $id, %msg) = @_; 1724 my ($self, $id, @msg) = @_;
1120 1725
1121 $msg{msgid} = $id; 1726 $self->ns->ext_reply ($id, @msg)
1122
1123 $self->send ("ext " . cf::to_json \%msg);
1124} 1727}
1125 1728
1126package cf; 1729=item $player->ext_msg ($type, @msg)
1730
1731Sends an ext event to the client.
1732
1733=cut
1734
1735sub ext_msg($$@) {
1736 my ($self, $type, @msg) = @_;
1737
1738 $self->ns->ext_msg ($type, @msg);
1739}
1740
1741=head3 cf::region
1742
1743=over 4
1744
1745=cut
1746
1747package cf::region;
1748
1749=item cf::region::find_by_path $path
1750
1751Tries to decuce the likely region for a map knowing only its path.
1752
1753=cut
1754
1755sub find_by_path($) {
1756 my ($path) = @_;
1757
1758 my ($match, $specificity);
1759
1760 for my $region (list) {
1761 if ($region->{match} && $path =~ $region->{match}) {
1762 ($match, $specificity) = ($region, $region->specificity)
1763 if $region->specificity > $specificity;
1764 }
1765 }
1766
1767 $match
1768}
1127 1769
1128=back 1770=back
1129
1130 1771
1131=head3 cf::map 1772=head3 cf::map
1132 1773
1133=over 4 1774=over 4
1134 1775
1146our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1147our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1148 1789
1149sub generate_random_map { 1790sub generate_random_map {
1150 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1151 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1152 $self->_create_random_map ( 1796 $self->_create_random_map (
1153 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1154 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1155 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1189 my ($self, $merge) = @_; 1833 my ($self, $merge) = @_;
1190 1834
1191 # we have to keep some variables in memory intact 1835 # we have to keep some variables in memory intact
1192 local $self->{path}; 1836 local $self->{path};
1193 local $self->{load_path}; 1837 local $self->{load_path};
1194 local $self->{deny_save};
1195 local $self->{deny_reset};
1196 1838
1197 $self->SUPER::thawer_merge ($merge); 1839 $self->SUPER::thawer_merge ($merge);
1198} 1840}
1199 1841
1200sub normalise { 1842sub normalise {
1247 $self->init; # pass $1 etc. 1889 $self->init; # pass $1 etc.
1248 return $self; 1890 return $self;
1249 } 1891 }
1250 } 1892 }
1251 1893
1252 Carp::carp "unable to resolve path '$path' (base '$base')."; 1894 Carp::cluck "unable to resolve path '$path' (base '$base').";
1253 () 1895 ()
1254} 1896}
1255 1897
1256sub init { 1898sub init {
1257 my ($self) = @_; 1899 my ($self) = @_;
1272 1914
1273# the original (read-only) location 1915# the original (read-only) location
1274sub load_path { 1916sub load_path {
1275 my ($self) = @_; 1917 my ($self) = @_;
1276 1918
1277 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1919 "$MAPDIR/$self->{path}.map"
1278} 1920}
1279 1921
1280# the temporary/swap location 1922# the temporary/swap location
1281sub save_path { 1923sub save_path {
1282 my ($self) = @_; 1924 my ($self) = @_;
1283 1925
1284 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1285 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1927 "$TMPDIR/$path.map"
1286} 1928}
1287 1929
1288# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1289sub uniq_path { 1931sub uniq_path {
1290 my ($self) = @_; 1932 my ($self) = @_;
1291 1933
1292 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1293 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1935 "$UNIQUEDIR/$path"
1294} 1936}
1295 1937
1296# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1297# all maps in C++... 1939# all maps in C++...
1298sub change_all_map_light { 1940sub change_all_map_light {
1300 1942
1301 $_->change_map_light ($change) 1943 $_->change_map_light ($change)
1302 for grep $_->outdoor, values %cf::MAP; 1944 for grep $_->outdoor, values %cf::MAP;
1303} 1945}
1304 1946
1947sub decay_objects {
1948 my ($self) = @_;
1949
1950 return if $self->{deny_reset};
1951
1952 $self->do_decay_objects;
1953}
1954
1305sub unlink_save { 1955sub unlink_save {
1306 my ($self) = @_; 1956 my ($self) = @_;
1307 1957
1308 utf8::encode (my $save = $self->save_path); 1958 utf8::encode (my $save = $self->save_path);
1309 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1959 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
1312 1962
1313sub load_header_from($) { 1963sub load_header_from($) {
1314 my ($self, $path) = @_; 1964 my ($self, $path) = @_;
1315 1965
1316 utf8::encode $path; 1966 utf8::encode $path;
1317 #aio_open $path, O_RDONLY, 0 1967 my $f = new_from_file cf::object::thawer $path
1318 # or return;
1319
1320 $self->_load_header ($path)
1321 or return; 1968 or return;
1969
1970 $self->_load_header ($f)
1971 or return;
1972
1973 local $MAP_LOADING{$self->{path}} = $self;
1974 $f->resolve_delayed_derefs;
1322 1975
1323 $self->{load_path} = $path; 1976 $self->{load_path} = $path;
1324 1977
1325 1 1978 1
1326} 1979}
1365 $self->load_header_orig 2018 $self->load_header_orig
1366 or return; 2019 or return;
1367 $self->prepare_orig; 2020 $self->prepare_orig;
1368 } 2021 }
1369 2022
2023 $self->{deny_reset} = 1
2024 if $self->no_reset;
2025
2026 $self->default_region (cf::region::find_by_path $self->{path})
2027 unless $self->default_region;
2028
1370 1 2029 1
1371} 2030}
1372 2031
1373sub find; 2032sub find;
1374sub find { 2033sub find {
1375 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1376 2035
1377 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1378 2037
2038 cf::lock_wait "map_data:$path";#d#remove
1379 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1380 2040
1381 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1382 my $guard = cf::lock_acquire "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
1383 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1384 or return; 2046 or return;
1385 2047
1386 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1387 2049
1388 $map->load_header 2050 $map->load_header
1389 or return; 2051 or return;
1390 2052
1391 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1392 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1393 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2057 undef $guard1;
1394 $map->reset; 2058 $map->reset;
1395 undef $guard;
1396 return find $path; 2059 return find $path;
1397 } 2060 }
1398 2061
1399 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1400 } 2063 }
1407 my ($self) = @_; 2070 my ($self) = @_;
1408 2071
1409 local $self->{deny_reset} = 1; # loading can take a long time 2072 local $self->{deny_reset} = 1; # loading can take a long time
1410 2073
1411 my $path = $self->{path}; 2074 my $path = $self->{path};
2075
2076 {
1412 my $guard = cf::lock_acquire "map_load:$path"; 2077 my $guard = cf::lock_acquire "map_data:$path";
1413 2078
2079 return unless $self->valid;
1414 return if $self->in_memory != cf::MAP_SWAPPED; 2080 return unless $self->in_memory == cf::MAP_SWAPPED;
1415 2081
1416 $self->in_memory (cf::MAP_LOADING); 2082 $self->in_memory (cf::MAP_LOADING);
1417 2083
1418 $self->alloc; 2084 $self->alloc;
1419 2085
1420 $self->pre_load; 2086 $self->pre_load;
2087 cf::cede_to_tick;
1421 2088
1422 $self->_load_objects ($self->{load_path}, 1) 2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2090 $f->skip_block;
2091 $self->_load_objects ($f)
1423 or return; 2092 or return;
1424 2093
1425 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1426 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1427 2096
1428 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1429 utf8::encode $uniq; 2098 utf8::encode $uniq;
1430 if (aio_open $uniq, O_RDONLY, 0) { 2099 unless (aio_stat $uniq) {
2100 if (my $f = new_from_file cf::object::thawer $uniq) {
1431 $self->clear_unique_items; 2101 $self->clear_unique_items;
1432 $self->_load_objects ($uniq, 0); 2102 $self->_load_objects ($f);
2103 $f->resolve_delayed_derefs;
2104 }
1433 } 2105 }
1434 } 2106 }
1435 2107
1436 Coro::cede; 2108 $f->resolve_delayed_derefs;
1437 2109
2110 cf::cede_to_tick;
1438 # now do the right thing for maps 2111 # now do the right thing for maps
1439 $self->link_multipart_objects; 2112 $self->link_multipart_objects;
1440
1441 unless ($self->{deny_activate}) {
1442 $self->decay_objects;
1443 $self->fix_auto_apply;
1444 $self->update_buttons;
1445 Coro::cede;
1446 $self->set_darkness_map;
1447 $self->difficulty ($self->estimate_difficulty) 2113 $self->difficulty ($self->estimate_difficulty)
1448 unless $self->difficulty; 2114 unless $self->difficulty;
1449 Coro::cede; 2115 cf::cede_to_tick;
2116
2117 unless ($self->{deny_activate}) {
2118 $self->decay_objects;
2119 $self->fix_auto_apply;
2120 $self->update_buttons;
2121 cf::cede_to_tick;
2122 $self->set_darkness_map;
2123 cf::cede_to_tick;
1450 $self->activate; 2124 $self->activate;
2125 }
2126
2127 $self->{last_save} = $cf::RUNTIME;
2128 $self->last_access ($cf::RUNTIME);
2129
2130 $self->in_memory (cf::MAP_ACTIVE);
1451 } 2131 }
1452 2132
1453 $self->post_load; 2133 $self->post_load;
1454
1455 $self->in_memory (cf::MAP_IN_MEMORY);
1456} 2134}
1457 2135
1458sub customise_for { 2136sub customise_for {
1459 my ($self, $ob) = @_; 2137 my ($self, $ob) = @_;
1460 2138
1461 return find "~" . $ob->name . "/" . $self->{path} 2139 return find "~" . $ob->name . "/" . $self->{path}
1462 if $self->per_player; 2140 if $self->per_player;
1463 2141
2142# return find "?party/" . $ob->name . "/" . $self->{path}
2143# if $self->per_party;
2144
1464 $self 2145 $self
1465} 2146}
1466 2147
1467# find and load all maps in the 3x3 area around a map 2148# find and load all maps in the 3x3 area around a map
1468sub load_diag { 2149sub load_neighbours {
1469 my ($map) = @_; 2150 my ($map) = @_;
1470 2151
1471 my @diag; # diagonal neighbours 2152 my @neigh; # diagonal neighbours
1472 2153
1473 for (0 .. 3) { 2154 for (0 .. 3) {
1474 my $neigh = $map->tile_path ($_) 2155 my $neigh = $map->tile_path ($_)
1475 or next; 2156 or next;
1476 $neigh = find $neigh, $map 2157 $neigh = find $neigh, $map
1477 or next; 2158 or next;
1478 $neigh->load; 2159 $neigh->load;
1479 2160
2161 push @neigh,
1480 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2162 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1481 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2163 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1482 } 2164 }
1483 2165
1484 for (@diag) { 2166 for (grep defined $_->[0], @neigh) {
2167 my ($path, $origin) = @$_;
1485 my $neigh = find @$_ 2168 my $neigh = find $path, $origin
1486 or next; 2169 or next;
1487 $neigh->load; 2170 $neigh->load;
1488 } 2171 }
1489} 2172}
1490 2173
1495} 2178}
1496 2179
1497sub do_load_sync { 2180sub do_load_sync {
1498 my ($map) = @_; 2181 my ($map) = @_;
1499 2182
2183 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2184 if $Coro::current == $Coro::main;
2185
1500 cf::sync_job { $map->load }; 2186 cf::sync_job { $map->load };
1501} 2187}
1502 2188
1503our %MAP_PREFETCH; 2189our %MAP_PREFETCH;
1504our $MAP_PREFETCHER = undef; 2190our $MAP_PREFETCHER = undef;
1505 2191
1506sub find_async { 2192sub find_async {
1507 my ($path, $origin) = @_; 2193 my ($path, $origin, $load) = @_;
1508 2194
1509 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
1510 2196
1511 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
1512 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1513 } 2199 }
1514 2200
1515 undef $MAP_PREFETCH{$path}; 2201 $MAP_PREFETCH{$path} |= $load;
2202
1516 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
1517 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
1518 for my $path (keys %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
1519 my $map = find $path 2208 if (my $map = find $k) {
1520 or next;
1521 $map->load; 2209 $map->load if $v;
2210 }
1522 2211
1523 delete $MAP_PREFETCH{$path}; 2212 delete $MAP_PREFETCH{$k};
1524 } 2213 }
1525 } 2214 }
1526 undef $MAP_PREFETCHER; 2215 undef $MAP_PREFETCHER;
1527 }; 2216 };
1528 $MAP_PREFETCHER->prio (6); 2217 $MAP_PREFETCHER->prio (6);
1531} 2220}
1532 2221
1533sub save { 2222sub save {
1534 my ($self) = @_; 2223 my ($self) = @_;
1535 2224
1536 my $lock = cf::lock_acquire "map_data:" . $self->path; 2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
1537 2226
1538 $self->{last_save} = $cf::RUNTIME; 2227 $self->{last_save} = $cf::RUNTIME;
1539 2228
1540 return unless $self->dirty; 2229 return unless $self->dirty;
1541 2230
1547 return if $self->{deny_save}; 2236 return if $self->{deny_save};
1548 2237
1549 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
1550 2239
1551 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
1552 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
1553 }; 2243 };
2244
2245 cf::get_slot 0.02;
1554 2246
1555 if ($uniq) { 2247 if ($uniq) {
1556 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1557 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1558 } else { 2250 } else {
1564 my ($self) = @_; 2256 my ($self) = @_;
1565 2257
1566 # save first because save cedes 2258 # save first because save cedes
1567 $self->save; 2259 $self->save;
1568 2260
1569 my $lock = cf::lock_acquire "map_data:" . $self->path; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
1570 2262
1571 return if $self->players; 2263 return if $self->players;
1572 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
1573 return if $self->{deny_save}; 2265 return if $self->{deny_save};
1574 2266
2267 $self->in_memory (cf::MAP_SWAPPED);
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
1575 $self->clear; 2271 $self->clear;
1576 $self->in_memory (cf::MAP_SWAPPED);
1577} 2272}
1578 2273
1579sub reset_at { 2274sub reset_at {
1580 my ($self) = @_; 2275 my ($self) = @_;
1581 2276
1582 # TODO: safety, remove and allow resettable per-player maps 2277 # TODO: safety, remove and allow resettable per-player maps
1583 return 1e99 if $self->isa ("ext::map_per_player");#d#
1584 return 1e99 if $self->{deny_reset}; 2278 return 1e99 if $self->{deny_reset};
1585 2279
1586 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2280 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1587 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2281 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1588 2282
1599 my ($self) = @_; 2293 my ($self) = @_;
1600 2294
1601 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2295 my $lock = cf::lock_acquire "map_data:$self->{path}";
1602 2296
1603 return if $self->players; 2297 return if $self->players;
1604 return if $self->isa ("ext::map_per_player");#d#
1605 2298
1606 warn "resetting map ", $self->path;#d# 2299 warn "resetting map ", $self->path;
1607 2300
1608 $self->in_memory (cf::MAP_SWAPPED); 2301 $self->in_memory (cf::MAP_SWAPPED);
1609 2302
1610 # need to save uniques path 2303 # need to save uniques path
1611 unless ($self->{deny_save}) { 2304 unless ($self->{deny_save}) {
1615 if $uniq; 2308 if $uniq;
1616 } 2309 }
1617 2310
1618 delete $cf::MAP{$self->path}; 2311 delete $cf::MAP{$self->path};
1619 2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
1620 $self->clear; 2315 $self->clear;
1621
1622 $_->clear_links_to ($self) for values %cf::MAP;
1623 2316
1624 $self->unlink_save; 2317 $self->unlink_save;
1625 $self->destroy; 2318 $self->destroy;
1626} 2319}
1627 2320
1628my $nuke_counter = "aaaa"; 2321my $nuke_counter = "aaaa";
1629 2322
1630sub nuke { 2323sub nuke {
1631 my ($self) = @_; 2324 my ($self) = @_;
1632 2325
2326 {
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
1633 delete $cf::MAP{$self->path}; 2329 delete $cf::MAP{$self->path};
1634 2330
1635 $self->unlink_save; 2331 $self->unlink_save;
1636 2332
1637 bless $self, "cf::map"; 2333 bless $self, "cf::map";
1638 delete $self->{deny_reset}; 2334 delete $self->{deny_reset};
1639 $self->{deny_save} = 1; 2335 $self->{deny_save} = 1;
1640 $self->reset_timeout (1); 2336 $self->reset_timeout (1);
1641 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1642 2338
1643 $cf::MAP{$self->path} = $self; 2339 $cf::MAP{$self->path} = $self;
2340 }
1644 2341
1645 $self->reset; # polite request, might not happen 2342 $self->reset; # polite request, might not happen
2343}
2344
2345=item $maps = cf::map::tmp_maps
2346
2347Returns an arrayref with all map paths of currently instantiated and saved
2348maps. May block.
2349
2350=cut
2351
2352sub tmp_maps() {
2353 [
2354 map {
2355 utf8::decode $_;
2356 /\.map$/
2357 ? normalise $_
2358 : ()
2359 } @{ aio_readdir $TMPDIR or [] }
2360 ]
2361}
2362
2363=item $maps = cf::map::random_maps
2364
2365Returns an arrayref with all map paths of currently instantiated and saved
2366random maps. May block.
2367
2368=cut
2369
2370sub random_maps() {
2371 [
2372 map {
2373 utf8::decode $_;
2374 /\.map$/
2375 ? normalise "?random/$_"
2376 : ()
2377 } @{ aio_readdir $RANDOMDIR or [] }
2378 ]
1646} 2379}
1647 2380
1648=item cf::map::unique_maps 2381=item cf::map::unique_maps
1649 2382
1650Returns an arrayref of paths of all shared maps that have 2383Returns an arrayref of paths of all shared maps that have
1651instantiated unique items. May block. 2384instantiated unique items. May block.
1652 2385
1653=cut 2386=cut
1654 2387
1655sub unique_maps() { 2388sub unique_maps() {
1656 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2389 [
1657 or return; 2390 map {
1658
1659 my @paths;
1660
1661 for (@$files) {
1662 utf8::decode $_; 2391 utf8::decode $_;
1663 next if /\.pst$/; 2392 s/\.map$//; # TODO future compatibility hack
1664 next unless /^$PATH_SEP/o; 2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
1665 2394 ? ()
1666 push @paths, cf::map::normalise $_; 2395 : normalise $_
2396 } @{ aio_readdir $UNIQUEDIR or [] }
1667 } 2397 ]
1668
1669 \@paths
1670} 2398}
1671
1672package cf;
1673 2399
1674=back 2400=back
1675 2401
1676=head3 cf::object 2402=head3 cf::object
1677 2403
1681 2407
1682=over 4 2408=over 4
1683 2409
1684=item $ob->inv_recursive 2410=item $ob->inv_recursive
1685 2411
1686Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
1687 2414
1688=cut 2415=cut
1689 2416
1690sub inv_recursive_; 2417sub inv_recursive_;
1691sub inv_recursive_ { 2418sub inv_recursive_ {
1694 2421
1695sub inv_recursive { 2422sub inv_recursive {
1696 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
1697} 2424}
1698 2425
2426=item $ref = $ob->ref
2427
2428Creates and returns a persistent reference to an object that can be stored as a string.
2429
2430=item $ob = cf::object::deref ($refstring)
2431
2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2433even if the object actually exists. May block.
2434
2435=cut
2436
2437sub deref {
2438 my ($ref) = @_;
2439
2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2441 my ($uuid, $name) = ($1, $2);
2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2443 or return;
2444 $pl->ob->uuid eq $uuid
2445 or return;
2446
2447 $pl->ob
2448 } else {
2449 warn "$ref: cannot resolve object reference\n";
2450 undef
2451 }
2452}
2453
1699package cf; 2454package cf;
1700 2455
1701=back 2456=back
1702 2457
1703=head3 cf::object::player 2458=head3 cf::object::player
1709Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2464Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
1710can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
1711dialogue with the given NPC character. 2466dialogue with the given NPC character.
1712 2467
1713=cut 2468=cut
2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
1714 2483
1715# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
1716# with dialog boxes. 2485# with dialog boxes.
1717#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
1718sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
1720 2489
1721 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2490 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1722 2491
1723 if ($self->{record_replies}) { 2492 if ($self->{record_replies}) {
1724 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2493 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2494
1725 } else { 2495 } else {
2496 my $pl = $self->contr;
2497
2498 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2499 my $dialog = $pl->{npc_dialog};
2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2501
2502 } else {
1726 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
1727 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2505 }
1728 } 2506 }
2507}
2508
2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2510
2511=cut
2512
2513sub cf::object::send_msg {
2514 my $pl = shift->contr
2515 or return;
2516 $pl->send_msg (@_);
1729} 2517}
1730 2518
1731=item $player_object->may ("access") 2519=item $player_object->may ("access")
1732 2520
1733Returns wether the given player is authorized to access resource "access" 2521Returns wether the given player is authorized to access resource "access"
1780 $self->deactivate_recursive; 2568 $self->deactivate_recursive;
1781 2569
1782 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2570 return if UNIVERSAL::isa $self->map, "ext::map_link";
1783 2571
1784 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2572 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1785 if $self->map; 2573 if $self->map && $self->map->{path} ne "{link}";
1786 2574
1787 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2575 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1788} 2576}
1789 2577
1790sub cf::object::player::leave_link { 2578sub cf::object::player::leave_link {
1791 my ($self, $map, $x, $y) = @_; 2579 my ($self, $map, $x, $y) = @_;
2580
2581 return unless $self->contr->active;
1792 2582
1793 my $link_pos = delete $self->{_link_pos}; 2583 my $link_pos = delete $self->{_link_pos};
1794 2584
1795 unless ($map) { 2585 unless ($map) {
1796 # restore original map position 2586 # restore original map position
1810 # use -1 or undef as default coordinates, not 0, 0 2600 # use -1 or undef as default coordinates, not 0, 0
1811 ($x, $y) = ($map->enter_x, $map->enter_y) 2601 ($x, $y) = ($map->enter_x, $map->enter_y)
1812 if $x <=0 && $y <= 0; 2602 if $x <=0 && $y <= 0;
1813 2603
1814 $map->load; 2604 $map->load;
1815 $map->load_diag; 2605 $map->load_neighbours;
1816 2606
1817 return unless $self->contr->active; 2607 return unless $self->contr->active;
1818 $self->activate_recursive; 2608 $self->activate_recursive;
1819 2609
1820 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2610 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1821 $self->enter_map ($map, $x, $y); 2611 $self->enter_map ($map, $x, $y);
1822} 2612}
1823 2613
1824cf::player->attach ( 2614=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1825 on_logout => sub {
1826 my ($pl) = @_;
1827 2615
1828 # abort map switching before logout 2616Moves the player to the given map-path and coordinates by first freezing
1829 if ($pl->ob->{_link_pos}) { 2617her, loading and preparing them map, calling the provided $check callback
1830 cf::sync_job { 2618that has to return the map if sucecssful, and then unfreezes the player on
1831 $pl->ob->leave_link 2619the new (success) or old (failed) map position. In either case, $done will
1832 }; 2620be called at the end of this process.
1833 }
1834 },
1835 on_login => sub {
1836 my ($pl) = @_;
1837 2621
1838 # try to abort aborted map switching on player login :) 2622Note that $check will be called with a potentially non-loaded map, so if
1839 # should happen only on crashes 2623it needs a loaded map it has to call C<< ->load >>.
1840 if ($pl->ob->{_link_pos}) {
1841 $pl->ob->enter_link;
1842 (async {
1843 $pl->ob->reply (undef,
1844 "There was an internal problem at your last logout, "
1845 . "the server will try to bring you to your intended destination in a second.",
1846 cf::NDI_RED);
1847 # we need this sleep as the login has a concurrent enter_exit running
1848 # and this sleep increases chances of the player not ending up in scorn
1849 Coro::Timer::sleep 1;
1850 $pl->ob->leave_link;
1851 })->prio (2);
1852 }
1853 },
1854);
1855 2624
1856=item $player_object->goto ($path, $x, $y)
1857
1858=cut 2625=cut
2626
2627our $GOTOGEN;
1859 2628
1860sub cf::object::player::goto { 2629sub cf::object::player::goto {
1861 my ($self, $path, $x, $y) = @_; 2630 my ($self, $path, $x, $y, $check, $done) = @_;
2631
2632 # do generation counting so two concurrent goto's will be executed in-order
2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1862 2634
1863 $self->enter_link; 2635 $self->enter_link;
1864 2636
1865 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2640 # *tag paths override both path and x|y
2641 if ($path =~ /^\*(.*)$/) {
2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2643 my $ob = $obs[rand @obs];
2644
2645 # see if we actually can go there
2646 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2647 $ob = $obs[rand @obs];
2648 } else {
2649 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 }
2651 # else put us there anyways for now #d#
2652
2653 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2654 } else {
2655 ($path, $x, $y) = (undef, undef, undef);
2656 }
2657 }
2658
1866 my $map = eval { 2659 my $map = eval {
1867 my $map = cf::map::find $path; 2660 my $map = defined $path ? cf::map::find $path : undef;
2661
2662 if ($map) {
1868 $map = $map->customise_for ($self) if $map; 2663 $map = $map->customise_for ($self);
2664 $map = $check->($map) if $check && $map;
2665 } else {
2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2667 }
2668
1869 $map 2669 $map
2670 };
2671
2672 if ($@) {
2673 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2674 LOG llevError | logBacktrace, Carp::longmess $@;
1870 } or 2675 }
1871 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1872 2676
2677 if ($gen == $self->{_goto_generation}) {
2678 delete $self->{_goto_generation};
1873 $self->leave_link ($map, $x, $y); 2679 $self->leave_link ($map, $x, $y);
2680 }
2681
2682 $done->() if $done;
1874 })->prio (1); 2683 })->prio (1);
1875} 2684}
1876 2685
1877=item $player_object->enter_exit ($exit_object) 2686=item $player_object->enter_exit ($exit_object)
1878 2687
1898} 2707}
1899 2708
1900sub prepare_random_map { 2709sub prepare_random_map {
1901 my ($exit) = @_; 2710 my ($exit) = @_;
1902 2711
1903 my $guard = cf::lock_acquire "exit_prepare:$exit";
1904
1905 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
1906 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
1907 # that depends on the exit object 2714 # that depends on the exit object
1908 2715
1909 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
1911 if ($exit->map) { 2718 if ($exit->map) {
1912 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
1913 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
1914 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
1915 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
1916 } 2725 }
1917 2726
1918 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
1919 2728
1920 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
1921 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
1922 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
1923 2732
1924 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1925 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
1926 undef $fh; 2735 undef $fh;
1927 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
1928 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
1929 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
1930 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
1931 } 2744 }
1932} 2745}
1933 2746
1934sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
1935 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
1936 2749
1937 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
1938 2751
1939 if ($exit->slaying eq "/!") {
1940 #TODO: this should de-fi-ni-te-ly not be a sync-job
1941 cf::sync_job { prepare_random_map $exit };
1942 }
1943
1944 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1945 my $hp = $exit->stats->hp;
1946 my $sp = $exit->stats->sp;
1947
1948 $self->enter_link; 2752 $self->enter_link;
1949 2753
1950 (async { 2754 (async {
1951 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
1952 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
1953 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
1954 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
1955 1; 2778 1
1956 }) { 2779 }) {
1957 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
1958 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
1959 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
1960 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
1961 2784
1962 warn "ERROR in enter_exit: $@"; 2785 warn "ERROR in enter_exit: $@";
1963 $self->leave_link; 2786 $self->leave_link;
1964 } 2787 }
1965 })->prio (1); 2788 })->prio (1);
1978 2801
1979sub cf::client::send_drawinfo { 2802sub cf::client::send_drawinfo {
1980 my ($self, $text, $flags) = @_; 2803 my ($self, $text, $flags) = @_;
1981 2804
1982 utf8::encode $text; 2805 utf8::encode $text;
1983 $self->send_packet (sprintf "drawinfo %d %s", $flags, $text); 2806 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
1984} 2807}
1985 2808
2809=item $client->send_msg ($channel, $msg, $color, [extra...])
2810
2811Send a drawinfo or msg packet to the client, formatting the msg for the
2812client if neccessary. C<$type> should be a string identifying the type of
2813the message, with C<log> being the default. If C<$color> is negative, suppress
2814the message unless the client supports the msg packet.
2815
2816=cut
2817
2818# non-persistent channels (usually the info channel)
2819our %CHANNEL = (
2820 "c/identify" => {
2821 id => "infobox",
2822 title => "Identify",
2823 reply => undef,
2824 tooltip => "Items recently identified",
2825 },
2826 "c/examine" => {
2827 id => "infobox",
2828 title => "Examine",
2829 reply => undef,
2830 tooltip => "Signs and other items you examined",
2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2874);
2875
2876sub cf::client::send_msg {
2877 my ($self, $channel, $msg, $color, @extra) = @_;
2878
2879 $msg = $self->pl->expand_cfpod ($msg);
2880
2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2882
2883 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2892 } elsif (ref $channel) {
2893 # send meta info to client, if not yet sent
2894 unless (exists $self->{channel}{$channel->{id}}) {
2895 $self->{channel}{$channel->{id}} = $channel;
2896 $self->ext_msg (channel_info => $channel)
2897 if $self->can_msg;
2898 }
2899
2900 $channel = $channel->{id};
2901 }
2902
2903 return unless @extra || length $msg;
2904
2905 if ($self->can_msg) {
2906 # default colour, mask it out
2907 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2908 if $color & cf::NDI_DEF;
2909
2910 $self->send_packet ("msg " . $self->{json_coder}->encode (
2911 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2912 } else {
2913 if ($color >= 0) {
2914 # replace some tags by gcfclient-compatible ones
2915 for ($msg) {
2916 1 while
2917 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2918 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2919 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2920 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2921 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2922 }
2923
2924 $color &= cf::NDI_COLOR_MASK;
2925
2926 utf8::encode $msg;
2927
2928 if (0 && $msg =~ /\[/) {
2929 # COMMAND/INFO
2930 $self->send_packet ("drawextinfo $color 10 8 $msg")
2931 } else {
2932 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2933 $self->send_packet ("drawinfo $color $msg")
2934 }
2935 }
2936 }
2937}
2938
2939=item $client->ext_msg ($type, @msg)
2940
2941Sends an ext event to the client.
2942
2943=cut
2944
2945sub cf::client::ext_msg($$@) {
2946 my ($self, $type, @msg) = @_;
2947
2948 if ($self->extcmd == 2) {
2949 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2950 } elsif ($self->extcmd == 1) { # TODO: remove
2951 push @msg, msgtype => "event_$type";
2952 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2953 }
2954}
2955
2956=item $client->ext_reply ($msgid, @msg)
2957
2958Sends an ext reply to the client.
2959
2960=cut
2961
2962sub cf::client::ext_reply($$@) {
2963 my ($self, $id, @msg) = @_;
2964
2965 if ($self->extcmd == 2) {
2966 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2967 } elsif ($self->extcmd == 1) {
2968 #TODO: version 1, remove
2969 unshift @msg, msgtype => "reply", msgid => $id;
2970 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2971 }
2972}
1986 2973
1987=item $success = $client->query ($flags, "text", \&cb) 2974=item $success = $client->query ($flags, "text", \&cb)
1988 2975
1989Queues a query to the client, calling the given callback with 2976Queues a query to the client, calling the given callback with
1990the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2977the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
1991C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2978C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
1992 2979
1993Queries can fail, so check the return code. Or don't, as queries will become 2980Queries can fail, so check the return code. Or don't, as queries will
1994reliable at some point in the future. 2981become reliable at some point in the future.
1995 2982
1996=cut 2983=cut
1997 2984
1998sub cf::client::query { 2985sub cf::client::query {
1999 my ($self, $flags, $text, $cb) = @_; 2986 my ($self, $flags, $text, $cb) = @_;
2007 utf8::encode $text; 2994 utf8::encode $text;
2008 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2995 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2009 2996
2010 $self->send_packet ($self->{query_queue}[0][0]) 2997 $self->send_packet ($self->{query_queue}[0][0])
2011 if @{ $self->{query_queue} } == 1; 2998 if @{ $self->{query_queue} } == 1;
2999
3000 1
2012} 3001}
2013 3002
2014cf::client->attach ( 3003cf::client->attach (
3004 on_connect => sub {
3005 my ($ns) = @_;
3006
3007 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
3008 },
2015 on_reply => sub { 3009 on_reply => sub {
2016 my ($ns, $msg) = @_; 3010 my ($ns, $msg) = @_;
2017 3011
2018 # this weird shuffling is so that direct followup queries 3012 # this weird shuffling is so that direct followup queries
2019 # get handled first 3013 # get handled first
2031 } else { 3025 } else {
2032 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 3026 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2033 } 3027 }
2034 } 3028 }
2035 }, 3029 },
3030 on_exticmd => sub {
3031 my ($ns, $buf) = @_;
3032
3033 my $msg = eval { $ns->{json_coder}->decode ($buf) };
3034
3035 if (ref $msg) {
3036 my ($type, $reply, @payload) =
3037 "ARRAY" eq ref $msg
3038 ? @$msg
3039 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3040
3041 my @reply;
3042
3043 if (my $cb = $EXTICMD{$type}) {
3044 @reply = $cb->($ns, @payload);
3045 }
3046
3047 $ns->ext_reply ($reply, @reply)
3048 if $reply;
3049
3050 } else {
3051 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3052 }
3053
3054 cf::override;
3055 },
2036); 3056);
2037 3057
2038=item $client->async (\&cb) 3058=item $client->async (\&cb)
2039 3059
2040Create a new coroutine, running the specified callback. The coroutine will 3060Create a new coroutine, running the specified callback. The coroutine will
2081our $safe = new Safe "safe"; 3101our $safe = new Safe "safe";
2082our $safe_hole = new Safe::Hole; 3102our $safe_hole = new Safe::Hole;
2083 3103
2084$SIG{FPE} = 'IGNORE'; 3104$SIG{FPE} = 'IGNORE';
2085 3105
2086$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3106$safe->permit_only (Opcode::opset qw(
3107 :base_core :base_mem :base_orig :base_math
3108 grepstart grepwhile mapstart mapwhile
3109 sort time
3110));
2087 3111
2088# here we export the classes and methods available to script code 3112# here we export the classes and methods available to script code
2089 3113
2090=pod 3114=pod
2091 3115
2092The following fucntions and emthods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2093 3117
2094 cf::object contr pay_amount pay_player map 3118 cf::object
3119 contr pay_amount pay_player map x y force_find force_add destroy
3120 insert remove name archname title slaying race decrease split
3121
2095 cf::object::player player 3122 cf::object::player
2096 cf::player peaceful 3123 player
2097 cf::map trigger 3124
3125 cf::player
3126 peaceful
3127
3128 cf::map
3129 trigger
2098 3130
2099=cut 3131=cut
2100 3132
2101for ( 3133for (
2102 ["cf::object" => qw(contr pay_amount pay_player map)], 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3135 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)],
2103 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2104 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2105 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2106) { 3140) {
2107 no strict 'refs'; 3141 no strict 'refs';
2178=back 3212=back
2179 3213
2180=cut 3214=cut
2181 3215
2182############################################################################# 3216#############################################################################
2183
2184=head2 EXTENSION DATABASE SUPPORT
2185
2186Crossfire maintains a very simple database for extension use. It can
2187currently store anything that can be serialised using Storable, which
2188excludes objects.
2189
2190The parameter C<$family> should best start with the name of the extension
2191using it, it should be unique.
2192
2193=over 4
2194
2195=item $value = cf::db_get $family => $key
2196
2197Returns a single value from the database.
2198
2199=item cf::db_put $family => $key => $value
2200
2201Stores the given C<$value> in the family.
2202
2203=cut
2204
2205our $DB;
2206
2207sub db_init {
2208 unless ($DB) {
2209 $DB = BDB::db_create $DB_ENV;
2210
2211 cf::sync_job {
2212 eval {
2213 $DB->set_flags (BDB::CHKSUM);
2214
2215 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2216 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2217 cf::cleanup "db_open(db): $!" if $!;
2218 };
2219 cf::cleanup "db_open(db): $@" if $@;
2220 };
2221
2222 my $path = cf::localdir . "/database.pst";
2223 if (stat $path) {
2224 cf::sync_job {
2225 my $pst = Storable::retrieve $path;
2226
2227 cf::db_put (board => data => $pst->{board});
2228 cf::db_put (guildrules => data => $pst->{guildrules});
2229 cf::db_put (rent => balance => $pst->{rent}{balance});
2230 BDB::db_env_txn_checkpoint $DB_ENV;
2231
2232 unlink $path;
2233 };
2234 }
2235 }
2236}
2237
2238sub db_get($$) {
2239 my $key = "$_[0]/$_[1]";
2240
2241 cf::sync_job {
2242 BDB::db_get $DB, undef, $key, my $data;
2243
2244 $! ? ()
2245 : Compress::LZF::sthaw $data
2246 }
2247}
2248
2249sub db_put($$$) {
2250 BDB::dbreq_pri 4;
2251 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2252}
2253
2254#############################################################################
2255# the server's init and main functions 3217# the server's init and main functions
2256 3218
2257sub init_resources { 3219sub load_facedata($) {
2258 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3220 my ($path) = @_;
3221
3222 # HACK to clear player env face cache, we need some signal framework
3223 # for this (global event?)
3224 %ext::player_env::MUSIC_FACE_CACHE = ();
3225
3226 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3227
3228 warn "loading facedata from $path\n";
3229
3230 my $facedata;
3231 0 < aio_load $path, $facedata
3232 or die "$path: $!";
3233
3234 $facedata = Coro::Storable::thaw $facedata;
3235
3236 $facedata->{version} == 2
3237 or cf::cleanup "$path: version mismatch, cannot proceed.";
3238
3239 # patch in the exptable
3240 $facedata->{resource}{"res/exp_table"} = {
3241 type => FT_RSRC,
3242 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3243 };
3244 cf::cede_to_tick;
3245
3246 {
3247 my $faces = $facedata->{faceinfo};
3248
3249 while (my ($face, $info) = each %$faces) {
3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
3252 cf::face::set_visibility $idx, $info->{visibility};
3253 cf::face::set_magicmap $idx, $info->{magicmap};
3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3256
3257 cf::cede_to_tick;
3258 }
3259
3260 while (my ($face, $info) = each %$faces) {
3261 next unless $info->{smooth};
3262
3263 my $idx = cf::face::find $face
3264 or next;
3265
3266 if (my $smooth = cf::face::find $info->{smooth}) {
3267 cf::face::set_smooth $idx, $smooth;
3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3269 } else {
3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
3271 }
3272
3273 cf::cede_to_tick;
3274 }
3275 }
3276
3277 {
3278 my $anims = $facedata->{animinfo};
3279
3280 while (my ($anim, $info) = each %$anims) {
3281 cf::anim::set $anim, $info->{frames}, $info->{facings};
3282 cf::cede_to_tick;
3283 }
3284
3285 cf::anim::invalidate_all; # d'oh
3286 }
3287
3288 {
3289 # TODO: for gcfclient pleasure, we should give resources
3290 # that gcfclient doesn't grok a >10000 face index.
3291 my $res = $facedata->{resource};
3292
3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3296 my $data;
3297
3298 if ($info->{type} & 1) {
3299 # prepend meta info
3300
3301 my $meta = $enc->encode ({
3302 name => $name,
3303 %{ $info->{meta} || {} },
3304 });
3305
3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
3313 } else {
3314 $RESOURCE{$name} = $info;
3315 }
3316
3317 cf::cede_to_tick;
3318 }
3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3322
3323 1
3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
3345
3346register_exticmd fx_want => sub {
3347 my ($ns, $want) = @_;
3348
3349 while (my ($k, $v) = each %$want) {
3350 $ns->fx_want ($k, $v);
3351 }
3352};
3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3363
3364sub reload_regions {
3365 # HACK to clear player env face cache, we need some signal framework
3366 # for this (global event?)
3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3368
3369 load_resource_file "$MAPDIR/regions"
2259 or die "unable to load regions file\n";#d# 3370 or die "unable to load regions file\n";
2260}
2261 3371
2262sub cfg_load { 3372 for (cf::region::list) {
3373 $_->{match} = qr/$_->{match}/
3374 if exists $_->{match};
3375 }
3376}
3377
3378sub reload_facedata {
3379 load_facedata "$DATADIR/facedata"
3380 or die "unable to load facedata\n";
3381}
3382
3383sub reload_archetypes {
3384 load_resource_file "$DATADIR/archetypes"
3385 or die "unable to load archetypes\n";
3386}
3387
3388sub reload_treasures {
3389 load_resource_file "$DATADIR/treasures"
3390 or die "unable to load treasurelists\n";
3391}
3392
3393sub reload_resources {
3394 warn "reloading resource files...\n";
3395
3396 reload_facedata;
3397 reload_archetypes;
3398 reload_regions;
3399 reload_treasures;
3400
3401 warn "finished reloading resource files\n";
3402}
3403
3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
3409 reload_resources;
3410}
3411
3412sub reload_config {
2263 open my $fh, "<:utf8", cf::confdir . "/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
2264 or return; 3414 or return;
2265 3415
2266 local $/; 3416 local $/;
2267 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
2268 3418
2269 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2270 3420
2271 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2272 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2278 }; 3428 };
2279 warn $@ if $@; 3429 warn $@ if $@;
2280 } 3430 }
2281} 3431}
2282 3432
2283sub init {
2284 init_resources;
2285}
2286
2287sub main { 3433sub main {
2288 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
2289 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
2290 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2291 (async { 3437 (async {
2292 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
2293 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
2294 }; 3441 };
2295 3442
2296 cfg_load; 3443 {
3444 my $guard = freeze_mainloop;
3445 reload_config;
2297 db_init; 3446 db_init;
2298 load_extensions; 3447 load_extensions;
2299 3448
2300 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
2301 Event::loop; 3452 EV::loop;
2302} 3453}
2303 3454
2304############################################################################# 3455#############################################################################
2305# initialisation and cleanup 3456# initialisation and cleanup
2306 3457
2307# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
2308BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
2309 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
2310 Event->signal ( 3462 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2311 reentrant => 0,
2312 data => WF_AUTOCANCEL,
2313 signal => $signal,
2314 prio => 0,
2315 cb => sub {
2316 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
2317 },
2318 ); 3464 };
3465 }
3466}
3467
3468sub write_runtime_sync {
3469 my $runtime = "$LOCALDIR/runtime";
3470
3471 # first touch the runtime file to show we are still running:
3472 # the fsync below can take a very very long time.
3473
3474 IO::AIO::aio_utime $runtime, undef, undef;
3475
3476 my $guard = cf::lock_acquire "write_runtime";
3477
3478 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3479 or return;
3480
3481 my $value = $cf::RUNTIME + 90 + 10;
3482 # 10 is the runtime save interval, for a monotonic clock
3483 # 60 allows for the watchdog to kill the server.
3484
3485 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3486 and return;
3487
3488 # always fsync - this file is important
3489 aio_fsync $fh
3490 and return;
3491
3492 # touch it again to show we are up-to-date
3493 aio_utime $fh, undef, undef;
3494
3495 close $fh
3496 or return;
3497
3498 aio_rename "$runtime~", $runtime
3499 and return;
3500
3501 warn "runtime file written.\n";
3502
2319 } 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
2320} 3547}
2321 3548
2322sub emergency_save() { 3549sub emergency_save() {
2323 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
2324 3551
2330 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
2331 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
2332 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
2333 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
2334 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2335 $pl->save; 3563 $pl->save;
2336 } 3564 }
2337 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
2338 3566
2339 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
2345 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
2346 3574
2347 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
2348 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
2349 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
2350 }; 3582 };
2351 3583
2352 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
2353} 3585}
2354 3586
2357 3589
2358 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
2359 if $make_core; 3591 if $make_core;
2360} 3592}
2361 3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3621
2362sub reload() { 3622sub do_reload_perl() {
2363 # can/must only be called in main 3623 # can/must only be called in main
2364 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
2365 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
2366 return; 3626 return;
2367 } 3627 }
2368 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
2369 warn "reloading..."; 3632 warn "reloading...";
2370 3633
2371 warn "entering sync_job"; 3634 warn "entering sync_job";
2372 3635
2373 cf::sync_job { 3636 cf::sync_job {
2374 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
2375 cf::emergency_save; 3638 cf::emergency_save;
2376 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
2377 3640
2378 warn "syncing database to disk"; 3641 warn "syncing database to disk";
2379 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
2380 3643
2381 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
2382 3645
2383 warn "cancelling all WF_AUTOCANCEL watchers";
2384 for (Event::all_watchers) {
2385 $_->cancel if $_->data & WF_AUTOCANCEL;
2386 }
2387
2388 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
2389 for (;;) {
2390 BDB::flush;
2391 IO::AIO::flush;
2392 Coro::cede;
2393 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
2394 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2395 }
2396
2397 warn "cancelling all extension coros";
2398 $_->cancel for values %EXT_CORO;
2399 %EXT_CORO = ();
2400
2401 warn "removing commands";
2402 %COMMAND = ();
2403
2404 warn "removing ext commands";
2405 %EXTCMD = ();
2406
2407 warn "unloading/nuking all extensions";
2408 for my $pkg (@EXTS) {
2409 warn "... unloading $pkg";
2410
2411 if (my $cb = $pkg->can ("unload")) {
2412 eval {
2413 $cb->($pkg);
2414 1
2415 } or warn "$pkg unloaded, but with errors: $@";
2416 } 3649 }
2417 3650
2418 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
2419 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
2420 } 3653 %EXT_CORO = ();
2421 3654
2422 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
2423 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
2424 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2425 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
2426 warn "... unloading $k"; 3664 warn "... unloading $pkg";
2427 delete $INC{$k};
2428 3665
2429 $k =~ s/\.pm$//;
2430 $k =~ s/\//::/g;
2431
2432 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
2433 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
2434 } 3675 }
2435 3676
2436 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
2437 } 3692 }
2438 3693
2439 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
2440 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
2441 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2442 3697
2443 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
2444 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3700 delete $INC{"cf/pod.pm"};
2445 3701
2446 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
2447 # and global variables created in xs 3703 # and global variables created in xs
2448 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
2449 3705
2450 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
2451 3707
2452 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
2453 require cf; 3709 require cf;
2454 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2455 3711
2456 warn "loading config and database again"; 3712 warn "loading config and database again";
2457 cf::cfg_load; 3713 cf::reload_config;
2458 3714
2459 warn "loading extensions"; 3715 warn "loading extensions";
2460 cf::load_extensions; 3716 cf::load_extensions;
2461 3717
2462 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
2463 _global_reattach; 3719 _global_reattach; # objects, sockets
2464 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
2465 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3722 warn "reattaching attachments to players";
3723 reattach $_ for values %PLAYER;
2466 3724
2467 warn "loading reloadable resources";
2468 init_resources;
2469
2470 warn "leaving sync_job"; 3725 warn "leaving sync_job";
2471 3726
2472 1 3727 1
2473 } or do { 3728 } or do {
2474 warn $@; 3729 warn $@;
2475 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
2476 exit 1; 3731 };
3732
3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3736};
3737
3738our $RELOAD_WATCHER; # used only during reload
3739
3740sub reload_perl() {
3741 # doing reload synchronously and two reloads happen back-to-back,
3742 # coro crashes during coro_state_free->destroy here.
3743
3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3745 do_reload_perl;
3746 undef $RELOAD_WATCHER;
2477 }; 3747 };
2478 3748}
2479 warn "reloaded";
2480};
2481
2482our $RELOAD_WATCHER; # used only during reload
2483 3749
2484register_command "reload" => sub { 3750register_command "reload" => sub {
2485 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
2486 3752
2487 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
2488 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
2489 3755 async {
2490 # doing reload synchronously and two reloads happen back-to-back, 3756 $Coro::current->{desc} = "perl_reload";
2491 # coro crashes during coro_state_free->destroy here.
2492
2493 $RELOAD_WATCHER ||= Event->timer (
2494 reentrant => 0,
2495 after => 0,
2496 data => WF_AUTOCANCEL,
2497 cb => sub {
2498 reload; 3757 reload_perl;
2499 undef $RELOAD_WATCHER;
2500 },
2501 ); 3758 };
2502 } 3759 }
2503}; 3760};
2504 3761
2505unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
2506 3763
2507my $bug_warning = 0; 3764my $bug_warning = 0;
2508 3765
2509$TICK_WATCHER = Event->timer ( 3766our @WAIT_FOR_TICK;
2510 reentrant => 0, 3767our @WAIT_FOR_TICK_BEGIN;
2511 parked => 1, 3768
2512 prio => 0, 3769sub wait_for_tick {
2513 at => $NEXT_TICK || $TICK, 3770 return if tick_inhibit || $Coro::current == $Coro::main;
2514 data => WF_AUTOCANCEL, 3771
2515 cb => sub { 3772 my $signal = new Coro::Signal;
3773 push @WAIT_FOR_TICK, $signal;
3774 $signal->wait;
3775}
3776
3777sub wait_for_tick_begin {
3778 return if tick_inhibit || $Coro::current == $Coro::main;
3779
3780 my $signal = new Coro::Signal;
3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3782 $signal->wait;
3783}
3784
3785sub tick {
2516 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
2517 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2518 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
2519 return; 3789 return;
2520 } 3790 }
2521 3791
2522 $NOW = Event::time;
2523
2524 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
2525 $RUNTIME += $TICK;
2526 $NEXT_TICK += $TICK;
2527 3793
2528 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2529 $NEXT_RUNTIME_WRITE = $NOW + 10; 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2530 Coro::async_pool { 3796 Coro::async_pool {
3797 $Coro::current->{desc} = "runtime saver";
2531 write_runtime 3798 write_runtime_sync
2532 or warn "ERROR: unable to write runtime file: $!"; 3799 or warn "ERROR: unable to write runtime file: $!";
2533 };
2534 } 3800 };
2535
2536 $WAIT_FOR_TICK->broadcast;
2537 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited;
2538
2539# my $AFTER = Event::time;
2540# warn $AFTER - $NOW;#d#
2541
2542 # if we are delayed by four ticks or more, skip them all
2543 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2544
2545 $TICK_WATCHER->at ($NEXT_TICK);
2546 $TICK_WATCHER->start;
2547 }, 3801 }
2548); 3802
3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3804 $sig->send;
3805 }
3806 while (my $sig = shift @WAIT_FOR_TICK) {
3807 $sig->send;
3808 }
3809
3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3812
3813 if (0) {
3814 if ($NEXT_TICK) {
3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3819 }
3820}
2549 3821
2550{ 3822{
2551 BDB::max_poll_time $TICK * 0.1; 3823 # configure BDB
2552 $BDB_POLL_WATCHER = Event->io ( 3824
2553 reentrant => 0,
2554 fd => BDB::poll_fileno,
2555 poll => 'r',
2556 prio => 0,
2557 data => WF_AUTOCANCEL,
2558 cb => \&BDB::poll_cb,
2559 );
2560 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
2561 3826 BDB::max_poll_reqs $TICK * 0.1;
2562 BDB::set_sync_prepare { 3827 $AnyEvent::BDB::WATCHER->priority (1);
2563 my $status;
2564 my $current = $Coro::current;
2565 (
2566 sub {
2567 $status = $!;
2568 $current->ready; undef $current;
2569 },
2570 sub {
2571 Coro::schedule while defined $current;
2572 $! = $status;
2573 },
2574 )
2575 };
2576 3828
2577 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
2578 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2579 3836
2580 cf::sync_job { 3837 cf::sync_job {
2581 eval { 3838 eval {
2582 BDB::db_env_open 3839 BDB::db_env_open
2583 $DB_ENV, 3840 $DB_ENV,
2584 $BDB_ENV_DIR, 3841 $BDBDIR,
2585 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3842 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2586 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3843 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2587 0666; 3844 0666;
2588 3845
2589 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3846 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2590
2591 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2592 $DB_ENV->set_lk_detect;
2593 }; 3847 };
2594 3848
2595 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
2596 }; 3850 };
2597 } 3851 }
3852
3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3855 };
3856 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3858 };
3859 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3861 };
2598} 3862}
2599 3863
2600{ 3864{
3865 # configure IO::AIO
3866
2601 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
2602
2603 undef $Coro::AIO::WATCHER;
2604 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
2605 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
2606 reentrant => 0,
2607 data => WF_AUTOCANCEL,
2608 fd => IO::AIO::poll_fileno,
2609 poll => 'r',
2610 prio => 6,
2611 cb => \&IO::AIO::poll_cb,
2612 );
2613} 3870}
3871
3872my $_log_backtrace;
3873
3874sub _log_backtrace {
3875 my ($msg, @addr) = @_;
3876
3877 $msg =~ s/\n//;
3878
3879 # limit the # of concurrent backtraces
3880 if ($_log_backtrace < 2) {
3881 ++$_log_backtrace;
3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3885 my @bt = fork_call {
3886 @addr = map { sprintf "%x", $_ } @addr;
3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3889 or die "addr2line: $!";
3890
3891 my @funcs;
3892 my @res = <$fh>;
3893 chomp for @res;
3894 while (@res) {
3895 my ($func, $line) = splice @res, 0, 2, ();
3896 push @funcs, "[$func] $line";
3897 }
3898
3899 @funcs
3900 };
3901
3902 LOG llevInfo, "[ABT] $msg\n";
3903 LOG llevInfo, "[ABT] $_\n" for @bt;
3904 --$_log_backtrace;
3905 };
3906 } else {
3907 LOG llevInfo, "[ABT] $msg\n";
3908 LOG llevInfo, "[ABT] [suppressed]\n";
3909 }
3910}
3911
3912# load additional modules
3913use cf::pod;
2614 3914
2615END { cf::emergency_save } 3915END { cf::emergency_save }
2616 3916
26171 39171
2618 3918

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines