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.297 by root, Thu Jul 5 08:10:30 2007 UTC vs.
Revision 1.434 by root, Thu May 29 03:27:37 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
3use utf8; 24use utf8;
4use strict; 25use strict;
5 26
6use Symbol; 27use Symbol;
7use List::Util; 28use List::Util;
8use Socket; 29use Socket;
9use Storable; 30use EV;
10use Event;
11use Opcode; 31use Opcode;
12use Safe; 32use Safe;
13use Safe::Hole; 33use Safe::Hole;
34use Storable ();
14 35
15use Coro 3.61 (); 36use Coro ();
16use Coro::State; 37use Coro::State;
17use Coro::Handle; 38use Coro::Handle;
18use Coro::Event; 39use Coro::AnyEvent;
19use Coro::Timer; 40use Coro::Timer;
20use Coro::Signal; 41use Coro::Signal;
21use Coro::Semaphore; 42use Coro::Semaphore;
43use Coro::AnyEvent;
22use Coro::AIO; 44use Coro::AIO;
45use Coro::BDB;
23use Coro::Storable; 46use Coro::Storable;
47use Coro::Util ();
24 48
25use JSON::XS 1.4 (); 49use JSON::XS 2.01 ();
26use BDB (); 50use BDB ();
27use Data::Dumper; 51use Data::Dumper;
28use Digest::MD5; 52use Digest::MD5;
29use Fcntl; 53use Fcntl;
30use YAML::Syck (); 54use YAML ();
31use IO::AIO 2.32 (); 55use IO::AIO ();
32use Time::HiRes; 56use Time::HiRes;
33use Compress::LZF; 57use Compress::LZF;
58use Digest::MD5 ();
59
60AnyEvent::detect;
61
62IO::AIO::max_poll_reqs 1;#d#
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45 69
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 71
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 73
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
73 98
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 101our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
81 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 107our $DB_ENV;
84 108
85our %CFG; 109our %CFG;
86 110
87our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 112our $RUNTIME;
113our $NOW;
89 114
90our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
93 118
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 121
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
100 126
101binmode STDOUT; 127binmode STDOUT;
102binmode STDERR; 128binmode STDERR;
103 129
104# read virtual server time, if available 130# read virtual server time, if available
157 183
158The raw value load value from the last tick. 184The raw value load value from the last tick.
159 185
160=item %cf::CFG 186=item %cf::CFG
161 187
162Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 189from wherever your confdir points to.
164 190
165=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
166 192
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 193These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 194returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 195per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 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.
202
171=back 203=back
172 204
173=cut 205=cut
174 206
175BEGIN { 207BEGIN {
179 $msg .= "\n" 211 $msg .= "\n"
180 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
181 213
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 214 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 215
184 utf8::encode $msg;
185 LOG llevError, $msg; 216 LOG llevError, $msg;
186 }; 217 };
187} 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#?
188 234
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
205)) { 251)) {
206 no strict 'refs'; 252 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 254}
209 255
210$Event::DIED = sub { 256$EV::DIED = sub {
211 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
212}; 258};
213 259
214############################################################################# 260#############################################################################
215 261
238 $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;
239 $d 285 $d
240 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
241} 287}
242 288
243=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
244 290
245Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
246 292
247=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
248 294
249Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
250 296
251=cut 297=cut
252 298
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 299our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 300
255sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
257 303
258=item cf::lock_wait $string 304=item cf::lock_wait $string
259 305
260Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
261 307
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
267returned. 313returned.
268 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
269Lock 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
270uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
271 320
272=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
273 322
274Return true if the lock is currently active, i.e. somebody has locked it. 323Return true if the lock is currently active, i.e. somebody has locked it.
275 324
276=cut 325=cut
277 326
278our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
279 329
280sub lock_wait($) { 330sub lock_wait($) {
281 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#
282 337
283 # wait for lock, if any 338 # wait for lock, if any
284 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 341 Coro::schedule;
292 347
293 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
294 lock_wait $key; 349 lock_wait $key;
295 350
296 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
297 353
298 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
301 } 358 }
302} 359}
303 360
306 363
307 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
308} 365}
309 366
310sub freeze_mainloop { 367sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
312 369
313 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 431 }
316 $TICK_WATCHER->stop; 432};
317 $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;
318} 446}
319 447
320=item cf::async { BLOCK } 448=item cf::async { BLOCK }
321 449
322Currently the same as Coro::async_pool, meaning you cannot use 450Currently the same as Coro::async_pool, meaning you cannot use
327 455
328BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
329 457
330=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
331 459
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
334partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
335acceptable. 463acceptable.
336 464
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
343 471
344sub sync_job(&) { 472sub sync_job(&) {
345 my ($job) = @_; 473 my ($job) = @_;
346 474
347 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 476 my $time = EV::time;
349 477
350 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
352 480
353 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 482
355 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
356 484
357 my $busy = 1; 485 my $busy = 1;
358 my @res; 486 my @res;
359 487
360 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 490 @res = eval { $job->() };
362 warn $@ if $@; 491 warn $@ if $@;
363 undef $busy; 492 undef $busy;
364 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
365 494
366 while ($busy) { 495 while ($busy) {
367 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
368 } 500 }
501 }
369 502
370 $time = Event::time - $time; 503 my $time = EV::time - $time;
371 504
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
376 506
377 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
378 } else { 508 } else {
379 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
380 510
405=item fork_call { }, $args 535=item fork_call { }, $args
406 536
407Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
411 541
412=cut 542=cut
413 543
414sub fork_call(&@) { 544sub fork_call(&@) {
415 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
416 546
417# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 547 # we seemingly have to make a local copy of the whole thing,
418# or die "socketpair: $!"; 548 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 549 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 550
422 if (my $pid = fork) { 551 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 552 reset_signals;
435 local $SIG{__WARN__}; 553 &$cb
436 local $SIG{__DIE__}; 554 }, @args;
437 eval {
438 close $fh1;
439 555
440 my @res = eval { $cb->(@args) }; 556 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 557}
442 };
443 558
444 warn $@ if $@; 559=item $coin = coin_from_name $name
445 _exit 0; 560
446 } 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
447} 584}
448 585
449=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
450 587
451Returns a single value from the environment database. 588Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
454 591
455Stores the given C<$value> in the family. It can currently store binary 592Stores the given C<$value> in the family. It can currently store binary
456data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 593data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
457 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
458=cut 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}
459 618
460our $DB; 619our $DB;
461 620
462sub db_init { 621sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 622 cf::sync_job {
467 eval { 623 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 624 };
477} 625}
478 626
479sub db_get($$) { 627sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
481 629
531 if (1) { 679 if (1) {
532 $md5 = 680 $md5 =
533 join "\x00", 681 join "\x00",
534 $processversion, 682 $processversion,
535 map { 683 map {
536 Coro::cede; 684 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 686 } 0.. $#$src;
539 687
540 688
541 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
585attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
587 735
588In 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>
589C<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
590Crossfire TRT). 738Deliantra).
591 739
592=over 4 740=over 4
593 741
594=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
595 743
847 "; 995 ";
848 die if $@; 996 die if $@;
849} 997}
850 998
851our $override; 999our $override;
852our @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?
853 1001
854sub override { 1002sub override {
855 $override = 1; 1003 $override = 1;
856 @invoke_results = (); 1004 @INVOKE_RESULTS = (@_);
857} 1005}
858 1006
859sub do_invoke { 1007sub do_invoke {
860 my $event = shift; 1008 my $event = shift;
861 my $callbacks = shift; 1009 my $callbacks = shift;
862 1010
863 @invoke_results = (); 1011 @INVOKE_RESULTS = ();
864 1012
865 local $override; 1013 local $override;
866 1014
867 for (@$callbacks) { 1015 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1016 eval { &{$_->[1]} };
877 } 1025 }
878 1026
879 0 1027 0
880} 1028}
881 1029
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1031
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1033
886Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
887 1035
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1038results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1039
892=back 1040=back
893 1041
894=cut 1042=cut
895 1043
896############################################################################# 1044#############################################################################
897# 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}
898 1088
899sub reattach { 1089sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1091 my ($obj) = @_;
902 1092
923cf::attachable->attach ( 1113cf::attachable->attach (
924 prio => -1000000, 1114 prio => -1000000,
925 on_instantiate => sub { 1115 on_instantiate => sub {
926 my ($obj, $data) = @_; 1116 my ($obj, $data) = @_;
927 1117
928 $data = from_json $data; 1118 $data = decode_json $data;
929 1119
930 for (@$data) { 1120 for (@$data) {
931 my ($name, $args) = @$_; 1121 my ($name, $args) = @$_;
932 1122
933 $obj->attach ($name, %{$args || {} }); 1123 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1139sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1140 my ($filename, $rdata, $objs) = @_;
951 1141
952 sync_job { 1142 sync_job {
953 if (length $$rdata) { 1143 if (length $$rdata) {
1144 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1145 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1146 $decname, length $$rdata, scalar @$objs;
956 1147
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1148 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1149 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1150 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1151 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1152 aio_close $fh;
962 1153
963 if (@$objs) { 1154 if (@$objs) {
964 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
965 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1157 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1158 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1159 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1160 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1161 aio_rename "$filename.pst~", "$filename.pst";
971 } 1162 }
972 } else { 1163 } else {
973 aio_unlink "$filename.pst"; 1164 aio_unlink "$filename.pst";
974 } 1165 }
979 } 1170 }
980 } else { 1171 } else {
981 aio_unlink $filename; 1172 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1173 aio_unlink "$filename.pst";
983 } 1174 }
984 } 1175 };
985} 1176}
986 1177
987sub object_freezer_as_string { 1178sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1179 my ($rdata, $objs) = @_;
989 1180
1001 or return; 1192 or return;
1002 1193
1003 unless (aio_stat "$filename.pst") { 1194 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1195 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1196 or return;
1197
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1198 my $st = eval { Coro::Storable::thaw $av };
1199 $av = $st->{objs};
1007 } 1200 }
1008 1201
1202 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1203 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1204 $decname, length $data, scalar @{$av || []};
1205
1011 return ($data, $av); 1206 ($data, $av)
1012} 1207}
1013 1208
1014=head2 COMMAND CALLBACKS 1209=head2 COMMAND CALLBACKS
1015 1210
1016=over 4 1211=over 4
1089 my ($pl, $buf) = @_; 1284 my ($pl, $buf) = @_;
1090 1285
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1286 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1287
1093 if (ref $msg) { 1288 if (ref $msg) {
1289 my ($type, $reply, @payload) =
1290 "ARRAY" eq ref $msg
1291 ? @$msg
1292 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1293
1294 my @reply;
1295
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1296 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1297 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1298 }
1299
1300 $pl->ext_reply ($reply, @reply)
1301 if $reply;
1302
1099 } else { 1303 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1304 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1305 }
1102 1306
1103 cf::override; 1307 cf::override;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1360 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1361 : "$v->{base}: extension inactive.\n";
1158 1362
1159 if (exists $v->{meta}{mandatory}) { 1363 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1364 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1365 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1366 }
1164 1367
1165 warn $msg; 1368 warn $msg;
1166 } 1369 }
1167 1370
1192use Coro::AIO; 1395use Coro::AIO;
1193 1396
1194=head3 cf::player 1397=head3 cf::player
1195 1398
1196=over 4 1399=over 4
1400
1401=item cf::player::num_playing
1402
1403Returns the official number of playing players, as per the Crossfire metaserver rules.
1404
1405=cut
1406
1407sub num_playing {
1408 scalar grep
1409 $_->ob->map
1410 && !$_->hidden
1411 && !$_->ob->flag (cf::FLAG_WIZ),
1412 cf::player::list
1413}
1197 1414
1198=item cf::player::find $login 1415=item cf::player::find $login
1199 1416
1200Returns the given player object, loading it if necessary (might block). 1417Returns the given player object, loading it if necessary (might block).
1201 1418
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1454 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1455 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1456 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1457 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1458
1242 my $pl = load_pl path $login 1459 my $f = new_from_file cf::object::thawer path $login
1243 or return; 1460 or return;
1461
1462 my $pl = cf::player::load_pl $f
1463 or return;
1464
1465 local $cf::PLAYER_LOADING{$login} = $pl;
1466 $f->resolve_delayed_derefs;
1244 $cf::PLAYER{$login} = $pl 1467 $cf::PLAYER{$login} = $pl
1245 } 1468 }
1246 } 1469 }
1247} 1470}
1248 1471
1257 return if $pl->{deny_save}; 1480 return if $pl->{deny_save};
1258 1481
1259 aio_mkdir playerdir $pl, 0770; 1482 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1483 $pl->{last_save} = $cf::RUNTIME;
1261 1484
1485 cf::get_slot 0.01;
1486
1262 $pl->save_pl ($path); 1487 $pl->save_pl ($path);
1263 Coro::cede; 1488 cf::cede_to_tick;
1264} 1489}
1265 1490
1266sub new($) { 1491sub new($) {
1267 my ($login) = @_; 1492 my ($login) = @_;
1268 1493
1274 $cf::PLAYER{$login} = $self; 1499 $cf::PLAYER{$login} = $self;
1275 1500
1276 $self 1501 $self
1277} 1502}
1278 1503
1504=item $player->send_msg ($channel, $msg, $color, [extra...])
1505
1506=cut
1507
1508sub send_msg {
1509 my $ns = shift->ns
1510 or return;
1511 $ns->send_msg (@_);
1512}
1513
1279=item $pl->quit_character 1514=item $pl->quit_character
1280 1515
1281Nukes the player without looking back. If logged in, the connection will 1516Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1517be destroyed. May block for a long time.
1283 1518
1291 $pl->{deny_save} = 1; 1526 $pl->{deny_save} = 1;
1292 $pl->password ("*"); # this should lock out the player until we nuked the dir 1527 $pl->password ("*"); # this should lock out the player until we nuked the dir
1293 1528
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1529 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1530 $pl->deactivate;
1531 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1532 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1533 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1534 $pl->ns->destroy if $pl->ns;
1298 1535
1299 my $path = playerdir $pl; 1536 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1537 my $temp = "$path~$cf::RUNTIME~deleting~";
1336 or return []; 1573 or return [];
1337 1574
1338 my @logins; 1575 my @logins;
1339 1576
1340 for my $login (@$dirs) { 1577 for my $login (@$dirs) {
1578 my $path = path $login;
1579
1580 # a .pst is a dead give-away for a valid player
1581 # if no pst file found, open and chekc for blocked users
1582 if (aio_stat "$path.pst") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1583 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1584 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1585 $buf !~ /^password -------------$/m or next; # official not-valid tag
1586 }
1344 1587
1345 utf8::decode $login; 1588 utf8::decode $login;
1346 push @logins, $login; 1589 push @logins, $login;
1347 } 1590 }
1348 1591
1381 1624
1382Expand crossfire pod fragments into protocol xml. 1625Expand crossfire pod fragments into protocol xml.
1383 1626
1384=cut 1627=cut
1385 1628
1629use re 'eval';
1630
1631my $group;
1632my $interior; $interior = qr{
1633 # match a pod interior sequence sans C<< >>
1634 (?:
1635 \ (.*?)\ (?{ $group = $^N })
1636 | < (??{$interior}) >
1637 )
1638}x;
1639
1386sub expand_cfpod { 1640sub expand_cfpod {
1387 ((my $self), (local $_)) = @_; 1641 my ($self, $pod) = @_;
1388 1642
1389 # escape & and < 1643 my $xml;
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392 1644
1393 # this is buggy, it needs to properly take care of nested <'s 1645 while () {
1646 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1647 $group = $1;
1394 1648
1395 1 while 1649 $group =~ s/&/&amp;/g;
1396 # replace B<>, I<>, U<> etc. 1650 $group =~ s/</&lt;/g;
1397 s/B<([^\>]*)>/<b>$1<\/b>/ 1651
1398 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $xml .= $group;
1399 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($pod =~ m%\G
1400 # replace G<male|female> tags 1654 ([BCGHITU])
1401 || s{G<([^>|]*)\|([^>]*)>}{ 1655 <
1402 $self->gender ? $2 : $1 1656 (?:
1403 }ge 1657 ([^<>]*) (?{ $group = $^N })
1404 # replace H<hint text> 1658 | < $interior >
1405 || s{H<([^\>]*)>} 1659 )
1660 >
1661 %gcsx
1406 { 1662 ) {
1663 my ($code, $data) = ($1, $group);
1664
1665 if ($code eq "B") {
1666 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1667 } elsif ($code eq "I") {
1668 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1669 } elsif ($code eq "U") {
1670 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1671 } elsif ($code eq "C") {
1672 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1673 } elsif ($code eq "T") {
1674 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1675 } elsif ($code eq "G") {
1676 my ($male, $female) = split /\|/, $data;
1677 $data = $self->gender ? $female : $male;
1678 $xml .= expand_cfpod ($self, $data);
1679 } elsif ($code eq "H") {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1680 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1681 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "") 1682 "")
1410 [$self->{hintmode}] 1683 [$self->{hintmode}];
1684 } else {
1685 $xml .= "error processing '$code($data)' directive";
1411 }ge; 1686 }
1687 } else {
1688 if ($pod =~ /\G(.+)/) {
1689 warn "parse error while expanding $pod (at $1)";
1690 }
1691 last;
1692 }
1693 }
1412 1694
1695 for ($xml) {
1413 # create single paragraphs (very hackish) 1696 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g; 1697 s/(?<=\S)\n(?=\w)/ /g;
1415 1698
1416 # compress some whitespace 1699 # compress some whitespace
1417 s/\s+\n/\n/g; # ws line-ends 1700 s/\s+\n/\n/g; # ws line-ends
1418 s/\n\n+/\n/g; # double lines 1701 s/\n\n+/\n/g; # double lines
1419 s/^\n+//; # beginning lines 1702 s/^\n+//; # beginning lines
1420 s/\n+$//; # ending lines 1703 s/\n+$//; # ending lines
1704 }
1421 1705
1422 $_ 1706 $xml
1423} 1707}
1708
1709no re 'eval';
1424 1710
1425sub hintmode { 1711sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1; 1712 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode} 1713 $_[0]{hintmode}
1428} 1714}
1429 1715
1430=item $player->ext_reply ($msgid, %msg) 1716=item $player->ext_reply ($msgid, @msg)
1431 1717
1432Sends an ext reply to the player. 1718Sends an ext reply to the player.
1433 1719
1434=cut 1720=cut
1435 1721
1436sub ext_reply($$%) { 1722sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1723 my ($self, $id, @msg) = @_;
1438 1724
1439 $msg{msgid} = $id; 1725 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1726}
1442 1727
1443=item $player->ext_event ($type, %msg) 1728=item $player->ext_msg ($type, @msg)
1444 1729
1445Sends an ext event to the client. 1730Sends an ext event to the client.
1446 1731
1447=cut 1732=cut
1448 1733
1449sub ext_event($$%) { 1734sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1735 my ($self, $type, @msg) = @_;
1451 1736
1452 $self->ns->ext_event ($type, %msg); 1737 $self->ns->ext_msg ($type, @msg);
1453} 1738}
1454 1739
1455=head3 cf::region 1740=head3 cf::region
1456 1741
1457=over 4 1742=over 4
1470 my ($path) = @_; 1755 my ($path) = @_;
1471 1756
1472 my ($match, $specificity); 1757 my ($match, $specificity);
1473 1758
1474 for my $region (list) { 1759 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1760 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1761 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1762 if $region->specificity > $specificity;
1478 } 1763 }
1479 } 1764 }
1480 1765
1501our $MAX_RESET = 3600; 1786our $MAX_RESET = 3600;
1502our $DEFAULT_RESET = 3000; 1787our $DEFAULT_RESET = 3000;
1503 1788
1504sub generate_random_map { 1789sub generate_random_map {
1505 my ($self, $rmp) = @_; 1790 my ($self, $rmp) = @_;
1791
1792 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1793
1506 # mit "rum" bekleckern, nicht 1794 # mit "rum" bekleckern, nicht
1507 $self->_create_random_map ( 1795 $self->_create_random_map (
1508 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1796 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1509 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1797 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1510 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1798 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1600 $self->init; # pass $1 etc. 1888 $self->init; # pass $1 etc.
1601 return $self; 1889 return $self;
1602 } 1890 }
1603 } 1891 }
1604 1892
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1893 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1894 ()
1607} 1895}
1608 1896
1609sub init { 1897sub init {
1610 my ($self) = @_; 1898 my ($self) = @_;
1632 1920
1633# the temporary/swap location 1921# the temporary/swap location
1634sub save_path { 1922sub save_path {
1635 my ($self) = @_; 1923 my ($self) = @_;
1636 1924
1637 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1925 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1638 "$TMPDIR/$path.map" 1926 "$TMPDIR/$path.map"
1639} 1927}
1640 1928
1641# the unique path, undef == no special unique path 1929# the unique path, undef == no special unique path
1642sub uniq_path { 1930sub uniq_path {
1643 my ($self) = @_; 1931 my ($self) = @_;
1644 1932
1645 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1933 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1646 "$UNIQUEDIR/$path" 1934 "$UNIQUEDIR/$path"
1647} 1935}
1648 1936
1649# and all this just because we cannot iterate over 1937# and all this just because we cannot iterate over
1650# all maps in C++... 1938# all maps in C++...
1673 1961
1674sub load_header_from($) { 1962sub load_header_from($) {
1675 my ($self, $path) = @_; 1963 my ($self, $path) = @_;
1676 1964
1677 utf8::encode $path; 1965 utf8::encode $path;
1678 #aio_open $path, O_RDONLY, 0 1966 my $f = new_from_file cf::object::thawer $path
1679 # or return;
1680
1681 $self->_load_header ($path)
1682 or return; 1967 or return;
1968
1969 $self->_load_header ($f)
1970 or return;
1971
1972 local $MAP_LOADING{$self->{path}} = $self;
1973 $f->resolve_delayed_derefs;
1683 1974
1684 $self->{load_path} = $path; 1975 $self->{load_path} = $path;
1685 1976
1686 1 1977 1
1687} 1978}
1741sub find { 2032sub find {
1742 my ($path, $origin) = @_; 2033 my ($path, $origin) = @_;
1743 2034
1744 $path = normalise $path, $origin && $origin->path; 2035 $path = normalise $path, $origin && $origin->path;
1745 2036
2037 cf::lock_wait "map_data:$path";#d#remove
1746 cf::lock_wait "map_find:$path"; 2038 cf::lock_wait "map_find:$path";
1747 2039
1748 $cf::MAP{$path} || do { 2040 $cf::MAP{$path} || do {
2041 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1749 my $guard = cf::lock_acquire "map_find:$path"; 2042 my $guard2 = cf::lock_acquire "map_find:$path";
2043
1750 my $map = new_from_path cf::map $path 2044 my $map = new_from_path cf::map $path
1751 or return; 2045 or return;
1752 2046
1753 $map->{last_save} = $cf::RUNTIME; 2047 $map->{last_save} = $cf::RUNTIME;
1754 2048
1756 or return; 2050 or return;
1757 2051
1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2052 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759 # doing this can freeze the server in a sync job, obviously 2053 # doing this can freeze the server in a sync job, obviously
1760 #$cf::WAIT_FOR_TICK->wait; 2054 #$cf::WAIT_FOR_TICK->wait;
2055 undef $guard2;
2056 undef $guard1;
1761 $map->reset; 2057 $map->reset;
1762 undef $guard;
1763 return find $path; 2058 return find $path;
1764 } 2059 }
1765 2060
1766 $cf::MAP{$path} = $map 2061 $cf::MAP{$path} = $map
1767 } 2062 }
1776 local $self->{deny_reset} = 1; # loading can take a long time 2071 local $self->{deny_reset} = 1; # loading can take a long time
1777 2072
1778 my $path = $self->{path}; 2073 my $path = $self->{path};
1779 2074
1780 { 2075 {
1781 my $guard = cf::lock_acquire "map_load:$path"; 2076 my $guard = cf::lock_acquire "map_data:$path";
1782 2077
2078 return unless $self->valid;
1783 return if $self->in_memory != cf::MAP_SWAPPED; 2079 return unless $self->in_memory == cf::MAP_SWAPPED;
1784 2080
1785 $self->in_memory (cf::MAP_LOADING); 2081 $self->in_memory (cf::MAP_LOADING);
1786 2082
1787 $self->alloc; 2083 $self->alloc;
1788 2084
1789 $self->pre_load; 2085 $self->pre_load;
1790 Coro::cede; 2086 cf::cede_to_tick;
1791 2087
2088 my $f = new_from_file cf::object::thawer $self->{load_path};
2089 $f->skip_block;
1792 $self->_load_objects ($self->{load_path}, 1) 2090 $self->_load_objects ($f)
1793 or return; 2091 or return;
1794 2092
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2093 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1796 if delete $self->{load_original}; 2094 if delete $self->{load_original};
1797 2095
1798 if (my $uniq = $self->uniq_path) { 2096 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq; 2097 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) { 2098 unless (aio_stat $uniq) {
2099 if (my $f = new_from_file cf::object::thawer $uniq) {
1801 $self->clear_unique_items; 2100 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0); 2101 $self->_load_objects ($f);
2102 $f->resolve_delayed_derefs;
2103 }
1803 } 2104 }
1804 } 2105 }
1805 2106
1806 Coro::cede; 2107 $f->resolve_delayed_derefs;
2108
2109 cf::cede_to_tick;
1807 # now do the right thing for maps 2110 # now do the right thing for maps
1808 $self->link_multipart_objects; 2111 $self->link_multipart_objects;
1809 $self->difficulty ($self->estimate_difficulty) 2112 $self->difficulty ($self->estimate_difficulty)
1810 unless $self->difficulty; 2113 unless $self->difficulty;
1811 Coro::cede; 2114 cf::cede_to_tick;
1812 2115
1813 unless ($self->{deny_activate}) { 2116 unless ($self->{deny_activate}) {
1814 $self->decay_objects; 2117 $self->decay_objects;
1815 $self->fix_auto_apply; 2118 $self->fix_auto_apply;
1816 $self->update_buttons; 2119 $self->update_buttons;
1817 Coro::cede; 2120 cf::cede_to_tick;
1818 $self->set_darkness_map; 2121 $self->set_darkness_map;
1819 Coro::cede; 2122 cf::cede_to_tick;
1820 $self->activate; 2123 $self->activate;
1821 } 2124 }
1822 2125
2126 $self->{last_save} = $cf::RUNTIME;
2127 $self->last_access ($cf::RUNTIME);
2128
1823 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
1824 } 2130 }
1825 2131
1826 $self->post_load; 2132 $self->post_load;
1827} 2133}
1828 2134
1837 2143
1838 $self 2144 $self
1839} 2145}
1840 2146
1841# find and load all maps in the 3x3 area around a map 2147# find and load all maps in the 3x3 area around a map
1842sub load_diag { 2148sub load_neighbours {
1843 my ($map) = @_; 2149 my ($map) = @_;
1844 2150
1845 my @diag; # diagonal neighbours 2151 my @neigh; # diagonal neighbours
1846 2152
1847 for (0 .. 3) { 2153 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 2154 my $neigh = $map->tile_path ($_)
1849 or next; 2155 or next;
1850 $neigh = find $neigh, $map 2156 $neigh = find $neigh, $map
1851 or next; 2157 or next;
1852 $neigh->load; 2158 $neigh->load;
1853 2159
2160 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2161 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2162 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 2163 }
1857 2164
1858 for (@diag) { 2165 for (grep defined $_->[0], @neigh) {
2166 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 2167 my $neigh = find $path, $origin
1860 or next; 2168 or next;
1861 $neigh->load; 2169 $neigh->load;
1862 } 2170 }
1863} 2171}
1864 2172
1869} 2177}
1870 2178
1871sub do_load_sync { 2179sub do_load_sync {
1872 my ($map) = @_; 2180 my ($map) = @_;
1873 2181
2182 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2183 if $Coro::current == $Coro::main;
2184
1874 cf::sync_job { $map->load }; 2185 cf::sync_job { $map->load };
1875} 2186}
1876 2187
1877our %MAP_PREFETCH; 2188our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 2189our $MAP_PREFETCHER = undef;
1879 2190
1880sub find_async { 2191sub find_async {
1881 my ($path, $origin) = @_; 2192 my ($path, $origin, $load) = @_;
1882 2193
1883 $path = normalise $path, $origin && $origin->{path}; 2194 $path = normalise $path, $origin && $origin->{path};
1884 2195
1885 if (my $map = $cf::MAP{$path}) { 2196 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2197 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1887 } 2198 }
1888 2199
1889 undef $MAP_PREFETCH{$path}; 2200 $MAP_PREFETCH{$path} |= $load;
2201
1890 $MAP_PREFETCHER ||= cf::async { 2202 $MAP_PREFETCHER ||= cf::async {
2203 $Coro::current->{desc} = "map prefetcher";
2204
1891 while (%MAP_PREFETCH) { 2205 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 2206 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 2207 if (my $map = find $k) {
1894 or next;
1895 $map->load; 2208 $map->load if $v;
2209 }
1896 2210
1897 delete $MAP_PREFETCH{$path}; 2211 delete $MAP_PREFETCH{$k};
1898 } 2212 }
1899 } 2213 }
1900 undef $MAP_PREFETCHER; 2214 undef $MAP_PREFETCHER;
1901 }; 2215 };
1902 $MAP_PREFETCHER->prio (6); 2216 $MAP_PREFETCHER->prio (6);
1905} 2219}
1906 2220
1907sub save { 2221sub save {
1908 my ($self) = @_; 2222 my ($self) = @_;
1909 2223
1910 my $lock = cf::lock_acquire "map_data:" . $self->path; 2224 my $lock = cf::lock_acquire "map_data:$self->{path}";
1911 2225
1912 $self->{last_save} = $cf::RUNTIME; 2226 $self->{last_save} = $cf::RUNTIME;
1913 2227
1914 return unless $self->dirty; 2228 return unless $self->dirty;
1915 2229
1921 return if $self->{deny_save}; 2235 return if $self->{deny_save};
1922 2236
1923 local $self->{last_access} = $self->last_access;#d# 2237 local $self->{last_access} = $self->last_access;#d#
1924 2238
1925 cf::async { 2239 cf::async {
2240 $Coro::current->{desc} = "map player save";
1926 $_->contr->save for $self->players; 2241 $_->contr->save for $self->players;
1927 }; 2242 };
2243
2244 cf::get_slot 0.02;
1928 2245
1929 if ($uniq) { 2246 if ($uniq) {
1930 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2247 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1931 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2248 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1932 } else { 2249 } else {
1938 my ($self) = @_; 2255 my ($self) = @_;
1939 2256
1940 # save first because save cedes 2257 # save first because save cedes
1941 $self->save; 2258 $self->save;
1942 2259
1943 my $lock = cf::lock_acquire "map_data:" . $self->path; 2260 my $lock = cf::lock_acquire "map_data:$self->{path}";
1944 2261
1945 return if $self->players; 2262 return if $self->players;
1946 return if $self->in_memory != cf::MAP_IN_MEMORY; 2263 return if $self->in_memory != cf::MAP_ACTIVE;
1947 return if $self->{deny_save}; 2264 return if $self->{deny_save};
1948 2265
2266 $self->in_memory (cf::MAP_SWAPPED);
2267
2268 $self->deactivate;
2269 $_->clear_links_to ($self) for values %cf::MAP;
1949 $self->clear; 2270 $self->clear;
1950 $self->in_memory (cf::MAP_SWAPPED);
1951} 2271}
1952 2272
1953sub reset_at { 2273sub reset_at {
1954 my ($self) = @_; 2274 my ($self) = @_;
1955 2275
1987 if $uniq; 2307 if $uniq;
1988 } 2308 }
1989 2309
1990 delete $cf::MAP{$self->path}; 2310 delete $cf::MAP{$self->path};
1991 2311
2312 $self->deactivate;
2313 $_->clear_links_to ($self) for values %cf::MAP;
1992 $self->clear; 2314 $self->clear;
1993
1994 $_->clear_links_to ($self) for values %cf::MAP;
1995 2315
1996 $self->unlink_save; 2316 $self->unlink_save;
1997 $self->destroy; 2317 $self->destroy;
1998} 2318}
1999 2319
2000my $nuke_counter = "aaaa"; 2320my $nuke_counter = "aaaa";
2001 2321
2002sub nuke { 2322sub nuke {
2003 my ($self) = @_; 2323 my ($self) = @_;
2004 2324
2325 {
2326 my $lock = cf::lock_acquire "map_data:$self->{path}";
2327
2005 delete $cf::MAP{$self->path}; 2328 delete $cf::MAP{$self->path};
2006 2329
2007 $self->unlink_save; 2330 $self->unlink_save;
2008 2331
2009 bless $self, "cf::map"; 2332 bless $self, "cf::map";
2010 delete $self->{deny_reset}; 2333 delete $self->{deny_reset};
2011 $self->{deny_save} = 1; 2334 $self->{deny_save} = 1;
2012 $self->reset_timeout (1); 2335 $self->reset_timeout (1);
2013 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2336 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014 2337
2015 $cf::MAP{$self->path} = $self; 2338 $cf::MAP{$self->path} = $self;
2339 }
2016 2340
2017 $self->reset; # polite request, might not happen 2341 $self->reset; # polite request, might not happen
2018} 2342}
2019 2343
2020=item $maps = cf::map::tmp_maps 2344=item $maps = cf::map::tmp_maps
2062 2386
2063sub unique_maps() { 2387sub unique_maps() {
2064 [ 2388 [
2065 map { 2389 map {
2066 utf8::decode $_; 2390 utf8::decode $_;
2067 /\.map$/ 2391 s/\.map$//; # TODO future compatibility hack
2392 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2393 ? ()
2068 ? normalise $_ 2394 : normalise $_
2069 : ()
2070 } @{ aio_readdir $UNIQUEDIR or [] } 2395 } @{ aio_readdir $UNIQUEDIR or [] }
2071 ] 2396 ]
2072} 2397}
2073 2398
2074package cf;
2075
2076=back 2399=back
2077 2400
2078=head3 cf::object 2401=head3 cf::object
2079 2402
2080=cut 2403=cut
2083 2406
2084=over 4 2407=over 4
2085 2408
2086=item $ob->inv_recursive 2409=item $ob->inv_recursive
2087 2410
2088Returns the inventory of the object _and_ their inventories, recursively. 2411Returns the inventory of the object I<and> their inventories, recursively,
2412but I<not> the object itself.
2089 2413
2090=cut 2414=cut
2091 2415
2092sub inv_recursive_; 2416sub inv_recursive_;
2093sub inv_recursive_ { 2417sub inv_recursive_ {
2096 2420
2097sub inv_recursive { 2421sub inv_recursive {
2098 inv_recursive_ inv $_[0] 2422 inv_recursive_ inv $_[0]
2099} 2423}
2100 2424
2425=item $ref = $ob->ref
2426
2427Creates and returns a persistent reference to an object that can be stored as a string.
2428
2429=item $ob = cf::object::deref ($refstring)
2430
2431returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2432even if the object actually exists. May block.
2433
2434=cut
2435
2436sub deref {
2437 my ($ref) = @_;
2438
2439 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2440 my ($uuid, $name) = ($1, $2);
2441 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2442 or return;
2443 $pl->ob->uuid eq $uuid
2444 or return;
2445
2446 $pl->ob
2447 } else {
2448 warn "$ref: cannot resolve object reference\n";
2449 undef
2450 }
2451}
2452
2101package cf; 2453package cf;
2102 2454
2103=back 2455=back
2104 2456
2105=head3 cf::object::player 2457=head3 cf::object::player
2111Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2463Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2112can be C<undef>. Does the right thing when the player is currently in a 2464can be C<undef>. Does the right thing when the player is currently in a
2113dialogue with the given NPC character. 2465dialogue with the given NPC character.
2114 2466
2115=cut 2467=cut
2468
2469our $SAY_CHANNEL = {
2470 id => "say",
2471 title => "Map",
2472 reply => "say ",
2473 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2474};
2475
2476our $CHAT_CHANNEL = {
2477 id => "chat",
2478 title => "Chat",
2479 reply => "chat ",
2480 tooltip => "Player chat and shouts, global to the server.",
2481};
2116 2482
2117# rough implementation of a future "reply" method that works 2483# rough implementation of a future "reply" method that works
2118# with dialog boxes. 2484# with dialog boxes.
2119#TODO: the first argument must go, split into a $npc->reply_to ( method 2485#TODO: the first argument must go, split into a $npc->reply_to ( method
2120sub cf::object::player::reply($$$;$) { 2486sub cf::object::player::reply($$$;$) {
2127 2493
2128 } else { 2494 } else {
2129 my $pl = $self->contr; 2495 my $pl = $self->contr;
2130 2496
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2497 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2498 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2499 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2500
2140 } else { 2501 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2502 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2503 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2143 } 2504 }
2144 } 2505 }
2506}
2507
2508=item $object->send_msg ($channel, $msg, $color, [extra...])
2509
2510=cut
2511
2512sub cf::object::send_msg {
2513 my $pl = shift->contr
2514 or return;
2515 $pl->send_msg (@_);
2145} 2516}
2146 2517
2147=item $player_object->may ("access") 2518=item $player_object->may ("access")
2148 2519
2149Returns wether the given player is authorized to access resource "access" 2520Returns wether the given player is authorized to access resource "access"
2228 # use -1 or undef as default coordinates, not 0, 0 2599 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2600 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2601 if $x <=0 && $y <= 0;
2231 2602
2232 $map->load; 2603 $map->load;
2233 $map->load_diag; 2604 $map->load_neighbours;
2234 2605
2235 return unless $self->contr->active; 2606 return unless $self->contr->active;
2236 $self->activate_recursive; 2607 $self->activate_recursive;
2237 2608
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2609 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2610 $self->enter_map ($map, $x, $y);
2240} 2611}
2241 2612
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2613=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2614
2244Moves the player to the given map-path and coordinates by first freezing 2615Moves the player to the given map-path and coordinates by first freezing
2245her, loading and preparing them map, calling the provided $check callback 2616her, loading and preparing them map, calling the provided $check callback
2246that has to return the map if sucecssful, and then unfreezes the player on 2617that has to return the map if sucecssful, and then unfreezes the player on
2247the new (success) or old (failed) map position. 2618the new (success) or old (failed) map position. In either case, $done will
2619be called at the end of this process.
2248 2620
2249=cut 2621=cut
2250 2622
2251our $GOTOGEN; 2623our $GOTOGEN;
2252 2624
2253sub cf::object::player::goto { 2625sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2626 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2627
2256 # do generation counting so two concurrent goto's will be executed in-order 2628 # do generation counting so two concurrent goto's will be executed in-order
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2629 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2630
2259 $self->enter_link; 2631 $self->enter_link;
2260 2632
2261 (async { 2633 (async {
2634 $Coro::current->{desc} = "player::goto $path $x $y";
2635
2636 # *tag paths override both path and x|y
2637 if ($path =~ /^\*(.*)$/) {
2638 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2639 my $ob = $obs[rand @obs];
2640
2641 # see if we actually can go there
2642 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2643 $ob = $obs[rand @obs];
2644 } else {
2645 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2646 }
2647 # else put us there anyways for now #d#
2648
2649 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2650 } else {
2651 ($path, $x, $y) = (undef, undef, undef);
2652 }
2653 }
2654
2262 my $map = eval { 2655 my $map = eval {
2263 my $map = cf::map::find $path; 2656 my $map = defined $path ? cf::map::find $path : undef;
2264 2657
2265 if ($map) { 2658 if ($map) {
2266 $map = $map->customise_for ($self); 2659 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map; 2660 $map = $check->($map) if $check && $map;
2268 } else { 2661 } else {
2269 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2662 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2270 } 2663 }
2271 2664
2272 $map 2665 $map
2273 }; 2666 };
2274 2667
2279 2672
2280 if ($gen == $self->{_goto_generation}) { 2673 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2674 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2675 $self->leave_link ($map, $x, $y);
2283 } 2676 }
2677
2678 $done->() if $done;
2284 })->prio (1); 2679 })->prio (1);
2285} 2680}
2286 2681
2287=item $player_object->enter_exit ($exit_object) 2682=item $player_object->enter_exit ($exit_object)
2288 2683
2308} 2703}
2309 2704
2310sub prepare_random_map { 2705sub prepare_random_map {
2311 my ($exit) = @_; 2706 my ($exit) = @_;
2312 2707
2313 my $guard = cf::lock_acquire "exit_prepare:$exit";
2314
2315 # all this does is basically replace the /! path by 2708 # all this does is basically replace the /! path by
2316 # a new random map path (?random/...) with a seed 2709 # a new random map path (?random/...) with a seed
2317 # that depends on the exit object 2710 # that depends on the exit object
2318 2711
2319 my $rmp = parse_random_map_params $exit->msg; 2712 my $rmp = parse_random_map_params $exit->msg;
2321 if ($exit->map) { 2714 if ($exit->map) {
2322 $rmp->{region} = $exit->region->name; 2715 $rmp->{region} = $exit->region->name;
2323 $rmp->{origin_map} = $exit->map->path; 2716 $rmp->{origin_map} = $exit->map->path;
2324 $rmp->{origin_x} = $exit->x; 2717 $rmp->{origin_x} = $exit->x;
2325 $rmp->{origin_y} = $exit->y; 2718 $rmp->{origin_y} = $exit->y;
2719
2720 $exit->map->touch;
2326 } 2721 }
2327 2722
2328 $rmp->{random_seed} ||= $exit->random_seed; 2723 $rmp->{random_seed} ||= $exit->random_seed;
2329 2724
2330 my $data = cf::to_json $rmp; 2725 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2331 my $md5 = Digest::MD5::md5_hex $data; 2726 my $md5 = Digest::MD5::md5_hex $data;
2332 my $meta = "$RANDOMDIR/$md5.meta"; 2727 my $meta = "$RANDOMDIR/$md5.meta";
2333 2728
2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2729 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2335 aio_write $fh, 0, (length $data), $data, 0; 2730 aio_write $fh, 0, (length $data), $data, 0;
2336 undef $fh; 2731 undef $fh;
2337 aio_rename "$meta~", $meta; 2732 aio_rename "$meta~", $meta;
2338 2733
2734 my $slaying = "?random/$md5";
2735
2736 if ($exit->valid) {
2339 $exit->slaying ("?random/$md5"); 2737 $exit->slaying ("?random/$md5");
2340 $exit->msg (undef); 2738 $exit->msg (undef);
2739 }
2341 } 2740 }
2342} 2741}
2343 2742
2344sub cf::object::player::enter_exit { 2743sub cf::object::player::enter_exit {
2345 my ($self, $exit) = @_; 2744 my ($self, $exit) = @_;
2346 2745
2347 return unless $self->type == cf::PLAYER; 2746 return unless $self->type == cf::PLAYER;
2348 2747
2349 if ($exit->slaying eq "/!") {
2350 #TODO: this should de-fi-ni-te-ly not be a sync-job
2351 # the problem is that $exit might not survive long enough
2352 # so it needs to be done right now, right here
2353 cf::sync_job { prepare_random_map $exit };
2354 }
2355
2356 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2357 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp;
2359
2360 $self->enter_link; 2748 $self->enter_link;
2361 2749
2362 # if exit is damned, update players death & WoR home-position
2363 $self->contr->savebed ($slaying, $hp, $sp)
2364 if $exit->flag (FLAG_DAMNED);
2365
2366 (async { 2750 (async {
2367 $self->deactivate_recursive; # just to be sure 2751 $Coro::current->{desc} = "enter_exit";
2752
2368 unless (eval { 2753 unless (eval {
2754 $self->deactivate_recursive; # just to be sure
2755
2756 # random map handling
2757 {
2758 my $guard = cf::lock_acquire "exit_prepare:$exit";
2759
2760 prepare_random_map $exit
2761 if $exit->slaying eq "/!";
2762 }
2763
2764 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2765 my $x = $exit->stats->hp;
2766 my $y = $exit->stats->sp;
2767
2369 $self->goto ($slaying, $hp, $sp); 2768 $self->goto ($map, $x, $y);
2370 2769
2770 # if exit is damned, update players death & WoR home-position
2771 $self->contr->savebed ($map, $x, $y)
2772 if $exit->flag (cf::FLAG_DAMNED);
2773
2371 1; 2774 1
2372 }) { 2775 }) {
2373 $self->message ("Something went wrong deep within the crossfire server. " 2776 $self->message ("Something went wrong deep within the crossfire server. "
2374 . "I'll try to bring you back to the map you were before. " 2777 . "I'll try to bring you back to the map you were before. "
2375 . "Please report this to the dungeon master!", 2778 . "Please report this to the dungeon master!",
2376 cf::NDI_UNIQUE | cf::NDI_RED); 2779 cf::NDI_UNIQUE | cf::NDI_RED);
2397 2800
2398 utf8::encode $text; 2801 utf8::encode $text;
2399 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2802 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2400} 2803}
2401 2804
2402=item $client->send_msg ($color, $type, $msg, [extra...]) 2805=item $client->send_msg ($channel, $msg, $color, [extra...])
2403 2806
2404Send a drawinfo or msg packet to the client, formatting the msg for the 2807Send a drawinfo or msg packet to the client, formatting the msg for the
2405client if neccessary. C<$type> should be a string identifying the type of 2808client if neccessary. C<$type> should be a string identifying the type of
2406the message, with C<log> being the default. If C<$color> is negative, suppress 2809the message, with C<log> being the default. If C<$color> is negative, suppress
2407the message unless the client supports the msg packet. 2810the message unless the client supports the msg packet.
2408 2811
2409=cut 2812=cut
2410 2813
2814# non-persistent channels (usually the info channel)
2815our %CHANNEL = (
2816 "c/identify" => {
2817 id => "infobox",
2818 title => "Identify",
2819 reply => undef,
2820 tooltip => "Items recently identified",
2821 },
2822 "c/examine" => {
2823 id => "infobox",
2824 title => "Examine",
2825 reply => undef,
2826 tooltip => "Signs and other items you examined",
2827 },
2828 "c/book" => {
2829 id => "infobox",
2830 title => "Book",
2831 reply => undef,
2832 tooltip => "The contents of a note or book",
2833 },
2834 "c/lookat" => {
2835 id => "infobox",
2836 title => "Look",
2837 reply => undef,
2838 tooltip => "What you saw there",
2839 },
2840 "c/who" => {
2841 id => "infobox",
2842 title => "Players",
2843 reply => undef,
2844 tooltip => "Shows players who are currently online",
2845 },
2846 "c/body" => {
2847 id => "infobox",
2848 title => "Body Parts",
2849 reply => undef,
2850 tooltip => "Shows which body parts you posess and are available",
2851 },
2852 "c/uptime" => {
2853 id => "infobox",
2854 title => "Uptime",
2855 reply => undef,
2856 tooltip => "How long the server has been running since last restart",
2857 },
2858 "c/mapinfo" => {
2859 id => "infobox",
2860 title => "Map Info",
2861 reply => undef,
2862 tooltip => "Information related to the maps",
2863 },
2864 "c/party" => {
2865 id => "party",
2866 title => "Party",
2867 reply => "gsay ",
2868 tooltip => "Messages and chat related to your party",
2869 },
2870);
2871
2411sub cf::client::send_msg { 2872sub cf::client::send_msg {
2412 my ($self, $color, $type, $msg, @extra) = @_; 2873 my ($self, $channel, $msg, $color, @extra) = @_;
2413 2874
2414 $msg = $self->pl->expand_cfpod ($msg); 2875 $msg = $self->pl->expand_cfpod ($msg);
2415 2876
2877 $color &= cf::NDI_CLIENT_MASK; # just in case...
2878
2879 # check predefined channels, for the benefit of C
2880 if ($CHANNEL{$channel}) {
2881 $channel = $CHANNEL{$channel};
2882
2883 $self->ext_msg (channel_info => $channel)
2884 if $self->can_msg;
2885
2886 $channel = $channel->{id};
2887
2888 } elsif (ref $channel) {
2889 # send meta info to client, if not yet sent
2890 unless (exists $self->{channel}{$channel->{id}}) {
2891 $self->{channel}{$channel->{id}} = $channel;
2892 $self->ext_msg (channel_info => $channel)
2893 if $self->can_msg;
2894 }
2895
2896 $channel = $channel->{id};
2897 }
2898
2416 return unless @extra || length $msg; 2899 return unless @extra || length $msg;
2417 2900
2418 if ($self->can_msg) { 2901 if ($self->can_msg) {
2902 # default colour, mask it out
2903 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2904 if $color & cf::NDI_DEF;
2905
2419 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2906 $self->send_packet ("msg " . $self->{json_coder}->encode (
2907 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2420 } else { 2908 } else {
2421 # replace some tags by gcfclient-compatible ones
2422 for ($msg) {
2423 1 while
2424 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2425 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2426 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2427 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2428 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2429 }
2430
2431 if ($color >= 0) { 2909 if ($color >= 0) {
2910 # replace some tags by gcfclient-compatible ones
2911 for ($msg) {
2912 1 while
2913 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2914 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2915 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2916 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2917 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2918 }
2919
2920 $color &= cf::NDI_COLOR_MASK;
2921
2922 utf8::encode $msg;
2923
2432 if (0 && $msg =~ /\[/) { 2924 if (0 && $msg =~ /\[/) {
2925 # COMMAND/INFO
2433 $self->send_packet ("drawextinfo $color 4 0 $msg") 2926 $self->send_packet ("drawextinfo $color 10 8 $msg")
2434 } else { 2927 } else {
2435 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2928 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2436 $self->send_packet ("drawinfo $color $msg") 2929 $self->send_packet ("drawinfo $color $msg")
2437 } 2930 }
2438 } 2931 }
2439 } 2932 }
2440} 2933}
2441 2934
2442=item $client->ext_event ($type, %msg) 2935=item $client->ext_msg ($type, @msg)
2443 2936
2444Sends an ext event to the client. 2937Sends an ext event to the client.
2445 2938
2446=cut 2939=cut
2447 2940
2448sub cf::client::ext_event($$%) { 2941sub cf::client::ext_msg($$@) {
2449 my ($self, $type, %msg) = @_; 2942 my ($self, $type, @msg) = @_;
2450 2943
2944 if ($self->extcmd == 2) {
2945 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2946 } elsif ($self->extcmd == 1) { # TODO: remove
2451 $msg{msgtype} = "event_$type"; 2947 push @msg, msgtype => "event_$type";
2452 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2949 }
2950}
2951
2952=item $client->ext_reply ($msgid, @msg)
2953
2954Sends an ext reply to the client.
2955
2956=cut
2957
2958sub cf::client::ext_reply($$@) {
2959 my ($self, $id, @msg) = @_;
2960
2961 if ($self->extcmd == 2) {
2962 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2963 } elsif ($self->extcmd == 1) {
2964 #TODO: version 1, remove
2965 unshift @msg, msgtype => "reply", msgid => $id;
2966 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2967 }
2453} 2968}
2454 2969
2455=item $success = $client->query ($flags, "text", \&cb) 2970=item $success = $client->query ($flags, "text", \&cb)
2456 2971
2457Queues a query to the client, calling the given callback with 2972Queues a query to the client, calling the given callback with
2512 my ($ns, $buf) = @_; 3027 my ($ns, $buf) = @_;
2513 3028
2514 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3029 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2515 3030
2516 if (ref $msg) { 3031 if (ref $msg) {
3032 my ($type, $reply, @payload) =
3033 "ARRAY" eq ref $msg
3034 ? @$msg
3035 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3036
3037 my @reply;
3038
2517 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3039 if (my $cb = $EXTICMD{$type}) {
2518 if (my %reply = $cb->($ns, $msg)) { 3040 @reply = $cb->($ns, @payload);
2519 $reply{msgid} = $msg->{msgid};
2520 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2521 }
2522 } 3041 }
3042
3043 $ns->ext_reply ($reply, @reply)
3044 if $reply;
3045
2523 } else { 3046 } else {
2524 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3047 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2525 } 3048 }
2526 3049
2527 cf::override; 3050 cf::override;
2574our $safe = new Safe "safe"; 3097our $safe = new Safe "safe";
2575our $safe_hole = new Safe::Hole; 3098our $safe_hole = new Safe::Hole;
2576 3099
2577$SIG{FPE} = 'IGNORE'; 3100$SIG{FPE} = 'IGNORE';
2578 3101
2579$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3102$safe->permit_only (Opcode::opset qw(
3103 :base_core :base_mem :base_orig :base_math
3104 grepstart grepwhile mapstart mapwhile
3105 sort time
3106));
2580 3107
2581# here we export the classes and methods available to script code 3108# here we export the classes and methods available to script code
2582 3109
2583=pod 3110=pod
2584 3111
2585The following functions and methods are available within a safe environment: 3112The following functions and methods are available within a safe environment:
2586 3113
2587 cf::object 3114 cf::object
2588 contr pay_amount pay_player map x y force_find force_add 3115 contr pay_amount pay_player map x y force_find force_add destroy
2589 insert remove 3116 insert remove name archname title slaying race decrease split
2590 3117
2591 cf::object::player 3118 cf::object::player
2592 player 3119 player
2593 3120
2594 cf::player 3121 cf::player
2599 3126
2600=cut 3127=cut
2601 3128
2602for ( 3129for (
2603 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3130 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2604 insert remove)], 3131 insert remove inv nrof name archname title slaying race
3132 decrease split destroy)],
2605 ["cf::object::player" => qw(player)], 3133 ["cf::object::player" => qw(player)],
2606 ["cf::player" => qw(peaceful)], 3134 ["cf::player" => qw(peaceful)],
2607 ["cf::map" => qw(trigger)], 3135 ["cf::map" => qw(trigger)],
2608) { 3136) {
2609 no strict 'refs'; 3137 no strict 'refs';
2685# the server's init and main functions 3213# the server's init and main functions
2686 3214
2687sub load_facedata($) { 3215sub load_facedata($) {
2688 my ($path) = @_; 3216 my ($path) = @_;
2689 3217
3218 # HACK to clear player env face cache, we need some signal framework
3219 # for this (global event?)
3220 %ext::player_env::MUSIC_FACE_CACHE = ();
3221
3222 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3223
2690 warn "loading facedata from $path\n"; 3224 warn "loading facedata from $path\n";
2691 3225
2692 my $facedata; 3226 my $facedata;
2693 0 < aio_load $path, $facedata 3227 0 < aio_load $path, $facedata
2694 or die "$path: $!"; 3228 or die "$path: $!";
2696 $facedata = Coro::Storable::thaw $facedata; 3230 $facedata = Coro::Storable::thaw $facedata;
2697 3231
2698 $facedata->{version} == 2 3232 $facedata->{version} == 2
2699 or cf::cleanup "$path: version mismatch, cannot proceed."; 3233 or cf::cleanup "$path: version mismatch, cannot proceed.";
2700 3234
3235 # patch in the exptable
3236 $facedata->{resource}{"res/exp_table"} = {
3237 type => FT_RSRC,
3238 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3239 };
3240 cf::cede_to_tick;
3241
2701 { 3242 {
2702 my $faces = $facedata->{faceinfo}; 3243 my $faces = $facedata->{faceinfo};
2703 3244
2704 while (my ($face, $info) = each %$faces) { 3245 while (my ($face, $info) = each %$faces) {
2705 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3246 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3247
2706 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3248 cf::face::set_visibility $idx, $info->{visibility};
3249 cf::face::set_magicmap $idx, $info->{magicmap};
2707 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3250 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2708 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3251 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2709 Coro::cede; 3252
3253 cf::cede_to_tick;
2710 } 3254 }
2711 3255
2712 while (my ($face, $info) = each %$faces) { 3256 while (my ($face, $info) = each %$faces) {
2713 next unless $info->{smooth}; 3257 next unless $info->{smooth};
3258
2714 my $idx = cf::face::find $face 3259 my $idx = cf::face::find $face
2715 or next; 3260 or next;
3261
2716 if (my $smooth = cf::face::find $info->{smooth}) { 3262 if (my $smooth = cf::face::find $info->{smooth}) {
3263 cf::face::set_smooth $idx, $smooth;
2717 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3264 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2718 } else { 3265 } else {
2719 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3266 warn "smooth face '$info->{smooth}' not found for face '$face'";
2720 } 3267 }
2721 Coro::cede; 3268
3269 cf::cede_to_tick;
2722 } 3270 }
2723 } 3271 }
2724 3272
2725 { 3273 {
2726 my $anims = $facedata->{animinfo}; 3274 my $anims = $facedata->{animinfo};
2727 3275
2728 while (my ($anim, $info) = each %$anims) { 3276 while (my ($anim, $info) = each %$anims) {
2729 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3277 cf::anim::set $anim, $info->{frames}, $info->{facings};
2730 Coro::cede; 3278 cf::cede_to_tick;
2731 } 3279 }
2732 3280
2733 cf::anim::invalidate_all; # d'oh 3281 cf::anim::invalidate_all; # d'oh
2734 } 3282 }
2735 3283
3284 {
3285 # TODO: for gcfclient pleasure, we should give resources
3286 # that gcfclient doesn't grok a >10000 face index.
3287 my $res = $facedata->{resource};
3288
3289 while (my ($name, $info) = each %$res) {
3290 if (defined $info->{type}) {
3291 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3292 my $data;
3293
3294 if ($info->{type} & 1) {
3295 # prepend meta info
3296
3297 my $meta = $enc->encode ({
3298 name => $name,
3299 %{ $info->{meta} || {} },
3300 });
3301
3302 $data = pack "(w/a*)*", $meta, $info->{data};
3303 } else {
3304 $data = $info->{data};
3305 }
3306
3307 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3308 cf::face::set_type $idx, $info->{type};
3309 } else {
3310 $RESOURCE{$name} = $info;
3311 }
3312
3313 cf::cede_to_tick;
3314 }
3315 }
3316
3317 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3318
2736 1 3319 1
2737} 3320}
2738 3321
3322cf::global->attach (on_resource_update => sub {
3323 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3324 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3325
3326 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3327 my $sound = $soundconf->{compat}[$_]
3328 or next;
3329
3330 my $face = cf::face::find "sound/$sound->[1]";
3331 cf::sound::set $sound->[0] => $face;
3332 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3333 }
3334
3335 while (my ($k, $v) = each %{$soundconf->{event}}) {
3336 my $face = cf::face::find "sound/$v";
3337 cf::sound::set $k => $face;
3338 }
3339 }
3340});
3341
3342register_exticmd fx_want => sub {
3343 my ($ns, $want) = @_;
3344
3345 while (my ($k, $v) = each %$want) {
3346 $ns->fx_want ($k, $v);
3347 }
3348};
3349
3350sub load_resource_file($) {
3351 my $guard = lock_acquire "load_resource_file";
3352
3353 my $status = load_resource_file_ $_[0];
3354 get_slot 0.1, 100;
3355 cf::arch::commit_load;
3356
3357 $status
3358}
3359
2739sub reload_regions { 3360sub reload_regions {
3361 # HACK to clear player env face cache, we need some signal framework
3362 # for this (global event?)
3363 %ext::player_env::MUSIC_FACE_CACHE = ();
3364
2740 load_resource_file "$MAPDIR/regions" 3365 load_resource_file "$MAPDIR/regions"
2741 or die "unable to load regions file\n"; 3366 or die "unable to load regions file\n";
3367
3368 for (cf::region::list) {
3369 $_->{match} = qr/$_->{match}/
3370 if exists $_->{match};
3371 }
2742} 3372}
2743 3373
2744sub reload_facedata { 3374sub reload_facedata {
2745 load_facedata "$DATADIR/facedata" 3375 load_facedata "$DATADIR/facedata"
2746 or die "unable to load facedata\n"; 3376 or die "unable to load facedata\n";
2747} 3377}
2748 3378
2749sub reload_archetypes { 3379sub reload_archetypes {
2750 load_resource_file "$DATADIR/archetypes" 3380 load_resource_file "$DATADIR/archetypes"
2751 or die "unable to load archetypes\n"; 3381 or die "unable to load archetypes\n";
2752 #d# NEED to laod twice to resolve forward references
2753 # this really needs to be done in an extra post-pass
2754 # (which needs to be synchronous, so solve it differently)
2755 load_resource_file "$DATADIR/archetypes"
2756 or die "unable to load archetypes\n";
2757} 3382}
2758 3383
2759sub reload_treasures { 3384sub reload_treasures {
2760 load_resource_file "$DATADIR/treasures" 3385 load_resource_file "$DATADIR/treasures"
2761 or die "unable to load treasurelists\n"; 3386 or die "unable to load treasurelists\n";
2762} 3387}
2763 3388
2764sub reload_resources { 3389sub reload_resources {
2765 warn "reloading resource files...\n"; 3390 warn "reloading resource files...\n";
2766 3391
3392 reload_facedata;
3393 reload_archetypes;
2767 reload_regions; 3394 reload_regions;
2768 reload_facedata;
2769 #reload_archetypes;#d#
2770 reload_archetypes;
2771 reload_treasures; 3395 reload_treasures;
2772 3396
2773 warn "finished reloading resource files\n"; 3397 warn "finished reloading resource files\n";
2774} 3398}
2775 3399
2776sub init { 3400sub init {
3401 my $guard = freeze_mainloop;
3402
2777 reload_resources; 3403 reload_resources;
2778} 3404}
2779 3405
2780sub cfg_load { 3406sub reload_config {
2781 open my $fh, "<:utf8", "$CONFDIR/config" 3407 open my $fh, "<:utf8", "$CONFDIR/config"
2782 or return; 3408 or return;
2783 3409
2784 local $/; 3410 local $/;
2785 *CFG = YAML::Syck::Load <$fh>; 3411 *CFG = YAML::Load <$fh>;
2786 3412
2787 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3413 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2788 3414
2789 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3415 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2790 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3416 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2801sub main { 3427sub main {
2802 # we must not ever block the main coroutine 3428 # we must not ever block the main coroutine
2803 local $Coro::idle = sub { 3429 local $Coro::idle = sub {
2804 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3430 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2805 (async { 3431 (async {
2806 Event::one_event; 3432 $Coro::current->{desc} = "IDLE BUG HANDLER";
3433 EV::loop EV::LOOP_ONESHOT;
2807 })->prio (Coro::PRIO_MAX); 3434 })->prio (Coro::PRIO_MAX);
2808 }; 3435 };
2809 3436
2810 cfg_load; 3437 {
3438 my $guard = freeze_mainloop;
3439 reload_config;
2811 db_init; 3440 db_init;
2812 load_extensions; 3441 load_extensions;
2813 3442
2814 $TICK_WATCHER->start; 3443 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3444 }
3445
2815 Event::loop; 3446 EV::loop;
2816} 3447}
2817 3448
2818############################################################################# 3449#############################################################################
2819# initialisation and cleanup 3450# initialisation and cleanup
2820 3451
2821# install some emergency cleanup handlers 3452# install some emergency cleanup handlers
2822BEGIN { 3453BEGIN {
3454 our %SIGWATCHER = ();
2823 for my $signal (qw(INT HUP TERM)) { 3455 for my $signal (qw(INT HUP TERM)) {
2824 Event->signal ( 3456 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2825 reentrant => 0,
2826 data => WF_AUTOCANCEL,
2827 signal => $signal,
2828 prio => 0,
2829 cb => sub {
2830 cf::cleanup "SIG$signal"; 3457 cf::cleanup "SIG$signal";
2831 },
2832 ); 3458 };
2833 } 3459 }
2834} 3460}
2835 3461
2836sub write_runtime { 3462sub write_runtime_sync {
2837 my $runtime = "$LOCALDIR/runtime"; 3463 my $runtime = "$LOCALDIR/runtime";
2838 3464
2839 # first touch the runtime file to show we are still running: 3465 # first touch the runtime file to show we are still running:
2840 # the fsync below can take a very very long time. 3466 # the fsync below can take a very very long time.
2841 3467
2867 and return; 3493 and return;
2868 3494
2869 warn "runtime file written.\n"; 3495 warn "runtime file written.\n";
2870 3496
2871 1 3497 1
3498}
3499
3500our $uuid_lock;
3501our $uuid_skip;
3502
3503sub write_uuid_sync($) {
3504 $uuid_skip ||= $_[0];
3505
3506 return if $uuid_lock;
3507 local $uuid_lock = 1;
3508
3509 my $uuid = "$LOCALDIR/uuid";
3510
3511 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3512 or return;
3513
3514 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3515 $uuid_skip = 0;
3516
3517 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3518 and return;
3519
3520 # always fsync - this file is important
3521 aio_fsync $fh
3522 and return;
3523
3524 close $fh
3525 or return;
3526
3527 aio_rename "$uuid~", $uuid
3528 and return;
3529
3530 warn "uuid file written ($value).\n";
3531
3532 1
3533
3534}
3535
3536sub write_uuid($$) {
3537 my ($skip, $sync) = @_;
3538
3539 $sync ? write_uuid_sync $skip
3540 : async { write_uuid_sync $skip };
2872} 3541}
2873 3542
2874sub emergency_save() { 3543sub emergency_save() {
2875 my $freeze_guard = cf::freeze_mainloop; 3544 my $freeze_guard = cf::freeze_mainloop;
2876 3545
2882 # and maps saved/destroyed asynchronously. 3551 # and maps saved/destroyed asynchronously.
2883 warn "begin emergency player save\n"; 3552 warn "begin emergency player save\n";
2884 for my $login (keys %cf::PLAYER) { 3553 for my $login (keys %cf::PLAYER) {
2885 my $pl = $cf::PLAYER{$login} or next; 3554 my $pl = $cf::PLAYER{$login} or next;
2886 $pl->valid or next; 3555 $pl->valid or next;
3556 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2887 $pl->save; 3557 $pl->save;
2888 } 3558 }
2889 warn "end emergency player save\n"; 3559 warn "end emergency player save\n";
2890 3560
2891 warn "begin emergency map save\n"; 3561 warn "begin emergency map save\n";
2897 warn "end emergency map save\n"; 3567 warn "end emergency map save\n";
2898 3568
2899 warn "begin emergency database checkpoint\n"; 3569 warn "begin emergency database checkpoint\n";
2900 BDB::db_env_txn_checkpoint $DB_ENV; 3570 BDB::db_env_txn_checkpoint $DB_ENV;
2901 warn "end emergency database checkpoint\n"; 3571 warn "end emergency database checkpoint\n";
3572
3573 warn "begin write uuid\n";
3574 write_uuid_sync 1;
3575 warn "end write uuid\n";
2902 }; 3576 };
2903 3577
2904 warn "leave emergency perl save\n"; 3578 warn "leave emergency perl save\n";
2905} 3579}
2906 3580
2921 warn "reloading..."; 3595 warn "reloading...";
2922 3596
2923 warn "entering sync_job"; 3597 warn "entering sync_job";
2924 3598
2925 cf::sync_job { 3599 cf::sync_job {
2926 cf::write_runtime; # external watchdog should not bark 3600 cf::write_runtime_sync; # external watchdog should not bark
2927 cf::emergency_save; 3601 cf::emergency_save;
2928 cf::write_runtime; # external watchdog should not bark 3602 cf::write_runtime_sync; # external watchdog should not bark
2929 3603
2930 warn "syncing database to disk"; 3604 warn "syncing database to disk";
2931 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
2932 3606
2933 # if anything goes wrong in here, we should simply crash as we already saved 3607 # if anything goes wrong in here, we should simply crash as we already saved
2934
2935 warn "cancelling all WF_AUTOCANCEL watchers";
2936 for (Event::all_watchers) {
2937 $_->cancel if $_->data & WF_AUTOCANCEL;
2938 }
2939 3608
2940 warn "flushing outstanding aio requests"; 3609 warn "flushing outstanding aio requests";
2941 for (;;) { 3610 for (;;) {
2942 BDB::flush; 3611 BDB::flush;
2943 IO::AIO::flush; 3612 IO::AIO::flush;
2944 Coro::cede; 3613 Coro::cede_notself;
2945 last unless IO::AIO::nreqs || BDB::nreqs; 3614 last unless IO::AIO::nreqs || BDB::nreqs;
2946 warn "iterate..."; 3615 warn "iterate...";
2947 } 3616 }
2948 3617
2949 ++$RELOAD; 3618 ++$RELOAD;
3008 warn "reloading cf.pm"; 3677 warn "reloading cf.pm";
3009 require cf; 3678 require cf;
3010 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3679 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3011 3680
3012 warn "loading config and database again"; 3681 warn "loading config and database again";
3013 cf::cfg_load; 3682 cf::reload_config;
3014 3683
3015 warn "loading extensions"; 3684 warn "loading extensions";
3016 cf::load_extensions; 3685 cf::load_extensions;
3017 3686
3018 warn "reattaching attachments to objects/players"; 3687 warn "reattaching attachments to objects/players";
3025 warn "leaving sync_job"; 3694 warn "leaving sync_job";
3026 3695
3027 1 3696 1
3028 } or do { 3697 } or do {
3029 warn $@; 3698 warn $@;
3030 warn "error while reloading, exiting."; 3699 cf::cleanup "error while reloading, exiting.";
3031 exit 1;
3032 }; 3700 };
3033 3701
3034 warn "reloaded"; 3702 warn "reloaded";
3035}; 3703};
3036 3704
3038 3706
3039sub reload_perl() { 3707sub reload_perl() {
3040 # doing reload synchronously and two reloads happen back-to-back, 3708 # doing reload synchronously and two reloads happen back-to-back,
3041 # coro crashes during coro_state_free->destroy here. 3709 # coro crashes during coro_state_free->destroy here.
3042 3710
3043 $RELOAD_WATCHER ||= Event->timer ( 3711 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3044 reentrant => 0,
3045 after => 0,
3046 data => WF_AUTOCANCEL,
3047 cb => sub {
3048 do_reload_perl; 3712 do_reload_perl;
3049 undef $RELOAD_WATCHER; 3713 undef $RELOAD_WATCHER;
3050 },
3051 ); 3714 };
3052} 3715}
3053 3716
3054register_command "reload" => sub { 3717register_command "reload" => sub {
3055 my ($who, $arg) = @_; 3718 my ($who, $arg) = @_;
3056 3719
3057 if ($who->flag (FLAG_WIZ)) { 3720 if ($who->flag (FLAG_WIZ)) {
3058 $who->message ("reloading server."); 3721 $who->message ("reloading server.");
3722 async {
3723 $Coro::current->{desc} = "perl_reload";
3059 async { reload_perl }; 3724 reload_perl;
3725 };
3060 } 3726 }
3061}; 3727};
3062 3728
3063unshift @INC, $LIBDIR; 3729unshift @INC, $LIBDIR;
3064 3730
3066 3732
3067our @WAIT_FOR_TICK; 3733our @WAIT_FOR_TICK;
3068our @WAIT_FOR_TICK_BEGIN; 3734our @WAIT_FOR_TICK_BEGIN;
3069 3735
3070sub wait_for_tick { 3736sub wait_for_tick {
3071 return unless $TICK_WATCHER->is_active;
3072 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3073 3738
3074 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3075 push @WAIT_FOR_TICK, $signal; 3740 push @WAIT_FOR_TICK, $signal;
3076 $signal->wait; 3741 $signal->wait;
3077} 3742}
3078 3743
3079sub wait_for_tick_begin { 3744sub wait_for_tick_begin {
3080 return unless $TICK_WATCHER->is_active;
3081 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3082 3746
3083 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3084 push @WAIT_FOR_TICK_BEGIN, $signal; 3748 push @WAIT_FOR_TICK_BEGIN, $signal;
3085 $signal->wait; 3749 $signal->wait;
3086} 3750}
3087 3751
3088 my $min = 1e6;#d# 3752sub tick {
3089 my $avg = 10;
3090$TICK_WATCHER = Event->timer (
3091 reentrant => 0,
3092 parked => 1,
3093 prio => 0,
3094 at => $NEXT_TICK || $TICK,
3095 data => WF_AUTOCANCEL,
3096 cb => sub {
3097 if ($Coro::current != $Coro::main) { 3753 if ($Coro::current != $Coro::main) {
3098 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3754 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3099 unless ++$bug_warning > 10; 3755 unless ++$bug_warning > 10;
3100 return; 3756 return;
3101 } 3757 }
3102 3758
3103 $NOW = $tick_start = Event::time;
3104
3105 cf::server_tick; # one server iteration 3759 cf::server_tick; # one server iteration
3106 3760
3107 0 && sync_job {#d# 3761 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3108 for(1..10) { 3762 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3109 my $t = Event::time; 3763 Coro::async_pool {
3110 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3764 $Coro::current->{desc} = "runtime saver";
3111 or die; 3765 write_runtime_sync
3112 3766 or warn "ERROR: unable to write runtime file: $!";
3113 $map->width (50);
3114 $map->height (50);
3115 $map->alloc;
3116 $map->_load_objects ("/tmp/x.map", 1);
3117 my $t = Event::time - $t;
3118
3119 #next unless $t < 0.0013;#d#
3120 if ($t < $min) {
3121 $min = $t;
3122 }
3123 $avg = $avg * 0.99 + $t * 0.01;
3124 }
3125 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3126 exit 0;
3127 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3128 }; 3767 };
3768 }
3129 3769
3130 $RUNTIME += $TICK;
3131 $NEXT_TICK += $TICK;
3132
3133 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3134 $NEXT_RUNTIME_WRITE = $NOW + 10;
3135 Coro::async_pool {
3136 write_runtime
3137 or warn "ERROR: unable to write runtime file: $!";
3138 };
3139 }
3140
3141# my $AFTER = Event::time;
3142# warn $AFTER - $NOW;#d#
3143
3144 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3770 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3145 $sig->send; 3771 $sig->send;
3146 } 3772 }
3147 while (my $sig = shift @WAIT_FOR_TICK) { 3773 while (my $sig = shift @WAIT_FOR_TICK) {
3148 $sig->send; 3774 $sig->send;
3149 } 3775 }
3150 3776
3151 $NOW = Event::time; 3777 $LOAD = ($NOW - $TICK_START) / $TICK;
3152
3153 # if we are delayed by four ticks or more, skip them all
3154 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3155
3156 $TICK_WATCHER->at ($NEXT_TICK);
3157 $TICK_WATCHER->start;
3158
3159 $LOAD = ($NOW - $tick_start) / $TICK;
3160 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3778 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3161 3779
3162 _post_tick; 3780 if (0) {
3163 3781 if ($NEXT_TICK) {
3164 3782 my $jitter = $TICK_START - $NEXT_TICK;
3783 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3784 warn "jitter $JITTER\n";#d#
3785 }
3165 }, 3786 }
3166); 3787}
3167 3788
3168{ 3789{
3169 BDB::max_poll_time $TICK * 0.1; 3790 # configure BDB
3170 $BDB_POLL_WATCHER = Event->io ( 3791
3171 reentrant => 0,
3172 fd => BDB::poll_fileno,
3173 poll => 'r',
3174 prio => 0,
3175 data => WF_AUTOCANCEL,
3176 cb => \&BDB::poll_cb,
3177 );
3178 BDB::min_parallel 8; 3792 BDB::min_parallel 8;
3179 3793 BDB::max_poll_reqs $TICK * 0.1;
3180 BDB::set_sync_prepare { 3794 $AnyEvent::BDB::WATCHER->priority (1);
3181 my $status;
3182 my $current = $Coro::current;
3183 (
3184 sub {
3185 $status = $!;
3186 $current->ready; undef $current;
3187 },
3188 sub {
3189 Coro::schedule while defined $current;
3190 $! = $status;
3191 },
3192 )
3193 };
3194 3795
3195 unless ($DB_ENV) { 3796 unless ($DB_ENV) {
3196 $DB_ENV = BDB::db_env_create; 3797 $DB_ENV = BDB::db_env_create;
3798 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3799 | BDB::LOG_AUTOREMOVE, 1);
3800 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3801 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3197 3802
3198 cf::sync_job { 3803 cf::sync_job {
3199 eval { 3804 eval {
3200 BDB::db_env_open 3805 BDB::db_env_open
3201 $DB_ENV, 3806 $DB_ENV,
3203 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3808 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3204 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3809 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3205 0666; 3810 0666;
3206 3811
3207 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3812 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3208
3209 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3210 $DB_ENV->set_lk_detect;
3211 }; 3813 };
3212 3814
3213 cf::cleanup "db_env_open(db): $@" if $@; 3815 cf::cleanup "db_env_open(db): $@" if $@;
3214 }; 3816 };
3215 } 3817 }
3818
3819 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3820 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3821 };
3822 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3823 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3824 };
3825 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3826 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3827 };
3216} 3828}
3217 3829
3218{ 3830{
3831 # configure IO::AIO
3832
3219 IO::AIO::min_parallel 8; 3833 IO::AIO::min_parallel 8;
3220
3221 undef $Coro::AIO::WATCHER;
3222 IO::AIO::max_poll_time $TICK * 0.1; 3834 IO::AIO::max_poll_time $TICK * 0.1;
3223 $AIO_POLL_WATCHER = Event->io ( 3835 #undef $AnyEvent::AIO::WATCHER;
3224 reentrant => 0,
3225 data => WF_AUTOCANCEL,
3226 fd => IO::AIO::poll_fileno,
3227 poll => 'r',
3228 prio => 6,
3229 cb => \&IO::AIO::poll_cb,
3230 );
3231} 3836}
3232 3837
3233my $_log_backtrace; 3838my $_log_backtrace;
3234 3839
3235sub _log_backtrace { 3840sub _log_backtrace {
3239 3844
3240 # limit the # of concurrent backtraces 3845 # limit the # of concurrent backtraces
3241 if ($_log_backtrace < 2) { 3846 if ($_log_backtrace < 2) {
3242 ++$_log_backtrace; 3847 ++$_log_backtrace;
3243 async { 3848 async {
3849 $Coro::current->{desc} = "abt $msg";
3850
3244 my @bt = fork_call { 3851 my @bt = fork_call {
3245 @addr = map { sprintf "%x", $_ } @addr; 3852 @addr = map { sprintf "%x", $_ } @addr;
3246 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3853 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3247 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3854 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3248 or die "addr2line: $!"; 3855 or die "addr2line: $!";
3271# load additional modules 3878# load additional modules
3272use cf::pod; 3879use cf::pod;
3273 3880
3274END { cf::emergency_save } 3881END { cf::emergency_save }
3275 3882
3883evthread_start IO::AIO::poll_fileno;
3884
32761 38851
3277 3886

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines