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.337 by root, Tue Aug 21 00:54:01 2007 UTC vs.
Revision 1.441 by root, Sat Aug 30 05:19:03 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.64 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.32 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::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
41Compress::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
42
43$Event::Eval = 1; # no idea why this is required, but it is
44
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47 69
48$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
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our %RESOURCE;
75 98
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 99our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 100our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 101our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 102our $USE_FSYNC = 1; # use fsync to write maps - default off
83 103
104our $BDB_DEADLOCK_WATCHER;
105our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 106our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 107our $DB_ENV;
86 108
87our %CFG; 109our %CFG;
88 110
89our $UPTIME; $UPTIME ||= time; 111our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 112our $RUNTIME;
113our $NOW;
91 114
92our %PLAYER; # all users 115our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 116our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 117our $LINK_MAP; # the special {link} map, which is always available
95 118
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 120our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 121
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 122our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 123our $LOADAVG; # same thing, but with alpha-smoothing
124our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 125our $TICK_START; # for load detecting purposes
102 126
103binmode STDOUT; 127binmode STDOUT;
104binmode STDERR; 128binmode STDERR;
105 129
106# read virtual server time, if available 130# read virtual server time, if available
159 183
160The raw value load value from the last tick. 184The raw value load value from the last tick.
161 185
162=item %cf::CFG 186=item %cf::CFG
163 187
164Configuration for the server, loaded from C</etc/crossfire/config>, or 188Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 189from wherever your confdir points to.
166 190
167=item cf::wait_for_tick, cf::wait_for_tick_begin 191=item cf::wait_for_tick, cf::wait_for_tick_begin
168 192
169These 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
187 $msg .= "\n" 211 $msg .= "\n"
188 unless $msg =~ /\n$/; 212 unless $msg =~ /\n$/;
189 213
190 $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;
191 215
192 utf8::encode $msg;
193 LOG llevError, $msg; 216 LOG llevError, $msg;
194 }; 217 };
195} 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#?
196 234
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 235@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 236@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 237@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 238@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 245for my $pkg (qw(
208 cf::global cf::attachable 246 cf::global cf::attachable
209 cf::object cf::object::player 247 cf::object cf::object::player
210 cf::client cf::player 248 cf::client cf::player
211 cf::arch cf::living 249 cf::arch cf::living
250 cf::map cf::mapspace
212 cf::map cf::party cf::region 251 cf::party cf::region
213)) { 252)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 253 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 254}
217 255
218$Event::DIED = sub { 256$EV::DIED = sub {
219 warn "error in event callback: @_"; 257 warn "error in event callback: @_";
220}; 258};
221 259
222############################################################################# 260#############################################################################
223 261
246 $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;
247 $d 285 $d
248 } || "[unable to dump $_[0]: '$@']"; 286 } || "[unable to dump $_[0]: '$@']";
249} 287}
250 288
251=item $ref = cf::from_json $json 289=item $ref = cf::decode_json $json
252 290
253Converts a JSON string into the corresponding perl data structure. 291Converts a JSON string into the corresponding perl data structure.
254 292
255=item $json = cf::to_json $ref 293=item $json = cf::encode_json $ref
256 294
257Converts a perl data structure into its JSON representation. 295Converts a perl data structure into its JSON representation.
258 296
259=cut 297=cut
260 298
261our $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
262 300
263sub to_json ($) { $json_coder->encode ($_[0]) } 301sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 302sub decode_json($) { $json_coder->decode ($_[0]) }
265 303
266=item cf::lock_wait $string 304=item cf::lock_wait $string
267 305
268Wait until the given lock is available. See cf::lock_acquire. 306Wait until the given lock is available. See cf::lock_acquire.
269 307
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 312for example when the coroutine gets canceled), the lock is automatically
275returned. 313returned.
276 314
315Locks are *not* recursive, locking from the same coro twice results in a
316deadlocked coro.
317
277Lock 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
278uses map_find and cf::map::load uses map_load). 319uses map_find and cf::map::load uses map_load).
279 320
280=item $locked = cf::lock_active $string 321=item $locked = cf::lock_active $string
281 322
282Return 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.
283 324
284=cut 325=cut
285 326
286our %LOCK; 327our %LOCK;
328our %LOCKER;#d#
287 329
288sub lock_wait($) { 330sub lock_wait($) {
289 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#
290 337
291 # wait for lock, if any 338 # wait for lock, if any
292 while ($LOCK{$key}) { 339 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 340 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 341 Coro::schedule;
300 347
301 # wait, to be sure we are not locked 348 # wait, to be sure we are not locked
302 lock_wait $key; 349 lock_wait $key;
303 350
304 $LOCK{$key} = []; 351 $LOCK{$key} = [];
352 $LOCKER{$key} = $Coro::current;#d#
305 353
306 Coro::guard { 354 Coro::guard {
355 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 356 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 357 $_->ready for @{ delete $LOCK{$key} };
309 } 358 }
310} 359}
311 360
314 363
315 ! ! $LOCK{$key} 364 ! ! $LOCK{$key}
316} 365}
317 366
318sub freeze_mainloop { 367sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
320 369
321 my $guard = Coro::guard { 370 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 371}
323 }; 372
324 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
325 $guard 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
326} 386}
327 387
328=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
329 389
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 401our @SLOT_QUEUE;
342our $SLOT_QUEUE; 402our $SLOT_QUEUE;
343 403
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
346 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
347 409
348 while () { 410 while () {
349 next_job: 411 next_job:
350 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
358 } 420 }
359 } 421 }
360 } 422 }
361 423
362 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 427 $signal->wait;
366 } else { 428 } else {
367 Coro::schedule; 429 Coro::schedule;
368 } 430 }
369 } 431 }
370}; 432};
371 433
372sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
373 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
374 438
375 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
377 441
391 455
392BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
393 457
394=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
395 459
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
398partly 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
399acceptable. 463acceptable.
400 464
401If 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
402the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
407 471
408sub sync_job(&) { 472sub sync_job(&) {
409 my ($job) = @_; 473 my ($job) = @_;
410 474
411 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 476 my $time = EV::time;
413 477
414 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
416 480
417 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 482
419 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
420 484
421 my $busy = 1; 485 my $busy = 1;
422 my @res; 486 my @res;
423 487
424 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 490 @res = eval { $job->() };
426 warn $@ if $@; 491 warn $@ if $@;
427 undef $busy; 492 undef $busy;
428 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
429 494
430 while ($busy) { 495 while ($busy) {
431 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
432 } 500 }
501 }
433 502
434 $time = Event::time - $time; 503 my $time = EV::time - $time;
435 504
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
440 506
441 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
442 } else { 508 } else {
443 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
444 510
469=item fork_call { }, $args 535=item fork_call { }, $args
470 536
471Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
475 541
476=cut 542=cut
477 543
478sub fork_call(&@) { 544sub fork_call(&@) {
479 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
480 546
481 # we seemingly have to make a local copy of the whole thing, 547 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 548 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 549 # TODO: investigate and fix (likely this will be rather laborious)
484 550
485 my @res = Coro::Util::fork_eval { 551 my @res = Coro::Util::fork_eval {
486 reset_signals; 552 reset_signals;
487 &$cb 553 &$cb
488 }, @args; 554 }, @args;
489 555
490 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
491} 557}
492 558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
584}
585
493=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
494 587
495Returns a single value from the environment database. 588Returns a single value from the environment database.
496 589
497=item cf::db_put $family => $key => $value 590=item cf::db_put $family => $key => $value
498 591
499Stores 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
500data 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).
501 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
502=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}
503 618
504our $DB; 619our $DB;
505 620
506sub db_init { 621sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 622 cf::sync_job {
511 eval { 623 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 624 };
521} 625}
522 626
523sub db_get($$) { 627sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 628 my $key = "$_[0]/$_[1]";
525 629
575 if (1) { 679 if (1) {
576 $md5 = 680 $md5 =
577 join "\x00", 681 join "\x00",
578 $processversion, 682 $processversion,
579 map { 683 map {
580 Coro::cede; 684 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 685 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 686 } 0.. $#$src;
583 687
584 688
585 my $dbmd5 = db_get cache => "$id/md5"; 689 my $dbmd5 = db_get cache => "$id/md5";
629attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
631 735
632In 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>
633C<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
634Crossfire TRT). 738Deliantra).
635 739
636=over 4 740=over 4
637 741
638=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
639 743
921 } 1025 }
922 1026
923 0 1027 0
924} 1028}
925 1029
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1031
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1033
930Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
931 1035
937 1041
938=cut 1042=cut
939 1043
940############################################################################# 1044#############################################################################
941# object support 1045# object support
942#
943 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#
944sub _can_merge { 1080sub _can_merge {
945 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
946 1082
947 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1084
951 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
952} 1087}
953 1088
954sub reattach { 1089sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1091 my ($obj) = @_;
957 1092
1093 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1095
960 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
961 1097
962 @$registry = (); 1098 @$registry = ();
963 1099
978cf::attachable->attach ( 1114cf::attachable->attach (
979 prio => -1000000, 1115 prio => -1000000,
980 on_instantiate => sub { 1116 on_instantiate => sub {
981 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
982 1118
983 $data = from_json $data; 1119 $data = decode_json $data;
984 1120
985 for (@$data) { 1121 for (@$data) {
986 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
987 1123
988 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1140sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1006 1142
1007 sync_job { 1143 sync_job {
1008 if (length $$rdata) { 1144 if (length $$rdata) {
1145 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1011 1148
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1153 aio_close $fh;
1017 1154
1018 if (@$objs) { 1155 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1161 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1163 }
1027 } else { 1164 } else {
1028 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1029 } 1166 }
1034 } 1171 }
1035 } else { 1172 } else {
1036 aio_unlink $filename; 1173 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1174 aio_unlink "$filename.pst";
1038 } 1175 }
1039 } 1176 };
1040} 1177}
1041 1178
1042sub object_freezer_as_string { 1179sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1180 my ($rdata, $objs) = @_;
1044 1181
1056 or return; 1193 or return;
1057 1194
1058 unless (aio_stat "$filename.pst") { 1195 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1196 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1197 or return;
1198
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1199 my $st = eval { Coro::Storable::thaw $av };
1200 $av = $st->{objs};
1062 } 1201 }
1063 1202
1203 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1204 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1205 $decname, length $data, scalar @{$av || []};
1206
1066 return ($data, $av); 1207 ($data, $av)
1067} 1208}
1068 1209
1069=head2 COMMAND CALLBACKS 1210=head2 COMMAND CALLBACKS
1070 1211
1071=over 4 1212=over 4
1149 my ($type, $reply, @payload) = 1290 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1291 "ARRAY" eq ref $msg
1151 ? @$msg 1292 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1293 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1294
1295 my @reply;
1296
1154 if (my $cb = $EXTCMD{$type}) { 1297 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1298 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1299 }
1300
1301 $pl->ext_reply ($reply, @reply)
1302 if $reply;
1303
1160 } else { 1304 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1305 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1306 }
1163 1307
1164 cf::override; 1308 cf::override;
1191 1335
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1338
1195 $ext{source} = 1339 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1198 . $source 1342 . $source
1199 . "\n};\n1"; 1343 . "\n};\n1";
1200 1344
1201 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1219 1363
1220 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1365 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1367 }
1225 1368
1226 warn $msg; 1369 warn $msg;
1227 } 1370 }
1228 1371
1253use Coro::AIO; 1396use Coro::AIO;
1254 1397
1255=head3 cf::player 1398=head3 cf::player
1256 1399
1257=over 4 1400=over 4
1401
1402=item cf::player::num_playing
1403
1404Returns the official number of playing players, as per the Crossfire metaserver rules.
1405
1406=cut
1407
1408sub num_playing {
1409 scalar grep
1410 $_->ob->map
1411 && !$_->hidden
1412 && !$_->ob->flag (cf::FLAG_WIZ),
1413 cf::player::list
1414}
1258 1415
1259=item cf::player::find $login 1416=item cf::player::find $login
1260 1417
1261Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1262 1419
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1459
1303 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1461 or return;
1462
1463 my $pl = cf::player::load_pl $f
1464 or return;
1465
1466 local $cf::PLAYER_LOADING{$login} = $pl;
1467 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1306 } 1469 }
1307 } 1470 }
1308} 1471}
1309 1472
1318 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1319 1482
1320 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1322 1485
1486 cf::get_slot 0.01;
1487
1323 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1324 Coro::cede; 1489 cf::cede_to_tick;
1325} 1490}
1326 1491
1327sub new($) { 1492sub new($) {
1328 my ($login) = @_; 1493 my ($login) = @_;
1329 1494
1362 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1363 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we nuked the dir
1364 1529
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1366 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1368 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1369 1536
1370 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1407 or return []; 1574 or return [];
1408 1575
1409 my @logins; 1576 my @logins;
1410 1577
1411 for my $login (@$dirs) { 1578 for my $login (@$dirs) {
1579 my $path = path $login;
1580
1581 # a .pst is a dead give-away for a valid player
1582 # if no pst file found, open and chekc for blocked users
1583 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1415 1588
1416 utf8::decode $login; 1589 utf8::decode $login;
1417 push @logins, $login; 1590 push @logins, $login;
1418 } 1591 }
1419 1592
1452 1625
1453Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1454 1627
1455=cut 1628=cut
1456 1629
1630use re 'eval';
1631
1632my $group;
1633my $interior; $interior = qr{
1634 # match a pod interior sequence sans C<< >>
1635 (?:
1636 \ (.*?)\ (?{ $group = $^N })
1637 | < (??{$interior}) >
1638 )
1639}x;
1640
1457sub expand_cfpod { 1641sub expand_cfpod {
1458 ((my $self), (local $_)) = @_; 1642 my ($self, $pod) = @_;
1459 1643
1460 # escape & and < 1644 my $xml;
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463 1645
1464 # this is buggy, it needs to properly take care of nested <'s 1646 while () {
1647 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1648 $group = $1;
1465 1649
1466 1 while 1650 $group =~ s/&/&amp;/g;
1467 # replace B<>, I<>, U<> etc. 1651 $group =~ s/</&lt;/g;
1468 s/B<([^\>]*)>/<b>$1<\/b>/ 1652
1469 || s/I<([^\>]*)>/<i>$1<\/i>/ 1653 $xml .= $group;
1470 || s/U<([^\>]*)>/<u>$1<\/u>/ 1654 } elsif ($pod =~ m%\G
1471 # replace G<male|female> tags 1655 ([BCGHITU])
1472 || s{G<([^>|]*)\|([^>]*)>}{ 1656 <
1473 $self->gender ? $2 : $1 1657 (?:
1474 }ge 1658 ([^<>]*) (?{ $group = $^N })
1475 # replace H<hint text> 1659 | < $interior >
1476 || s{H<([^\>]*)>} 1660 )
1661 >
1662 %gcsx
1477 { 1663 ) {
1664 my ($code, $data) = ($1, $group);
1665
1666 if ($code eq "B") {
1667 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1668 } elsif ($code eq "I") {
1669 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1670 } elsif ($code eq "U") {
1671 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1672 } elsif ($code eq "C") {
1673 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1674 } elsif ($code eq "T") {
1675 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1676 } elsif ($code eq "G") {
1677 my ($male, $female) = split /\|/, $data;
1678 $data = $self->gender ? $female : $male;
1679 $xml .= expand_cfpod ($self, $data);
1680 } elsif ($code eq "H") {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1681 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1682 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "") 1683 "")
1481 [$self->{hintmode}] 1684 [$self->{hintmode}];
1685 } else {
1686 $xml .= "error processing '$code($data)' directive";
1482 }ge; 1687 }
1688 } else {
1689 if ($pod =~ /\G(.+)/) {
1690 warn "parse error while expanding $pod (at $1)";
1691 }
1692 last;
1693 }
1694 }
1483 1695
1696 for ($xml) {
1484 # create single paragraphs (very hackish) 1697 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g; 1698 s/(?<=\S)\n(?=\w)/ /g;
1486 1699
1487 # compress some whitespace 1700 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends 1701 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines 1702 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines 1703 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines 1704 s/\n+$//; # ending lines
1705 }
1492 1706
1493 $_ 1707 $xml
1494} 1708}
1709
1710no re 'eval';
1495 1711
1496sub hintmode { 1712sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1; 1713 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode} 1714 $_[0]{hintmode}
1499} 1715}
1571our $MAX_RESET = 3600; 1787our $MAX_RESET = 3600;
1572our $DEFAULT_RESET = 3000; 1788our $DEFAULT_RESET = 3000;
1573 1789
1574sub generate_random_map { 1790sub generate_random_map {
1575 my ($self, $rmp) = @_; 1791 my ($self, $rmp) = @_;
1792
1793 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1794
1576 # mit "rum" bekleckern, nicht 1795 # mit "rum" bekleckern, nicht
1577 $self->_create_random_map ( 1796 $self->_create_random_map (
1578 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1797 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1579 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1798 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1580 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1799 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1702 1921
1703# the temporary/swap location 1922# the temporary/swap location
1704sub save_path { 1923sub save_path {
1705 my ($self) = @_; 1924 my ($self) = @_;
1706 1925
1707 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1708 "$TMPDIR/$path.map" 1927 "$TMPDIR/$path.map"
1709} 1928}
1710 1929
1711# the unique path, undef == no special unique path 1930# the unique path, undef == no special unique path
1712sub uniq_path { 1931sub uniq_path {
1713 my ($self) = @_; 1932 my ($self) = @_;
1714 1933
1715 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1934 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1716 "$UNIQUEDIR/$path" 1935 "$UNIQUEDIR/$path"
1717} 1936}
1718 1937
1719# and all this just because we cannot iterate over 1938# and all this just because we cannot iterate over
1720# all maps in C++... 1939# all maps in C++...
1743 1962
1744sub load_header_from($) { 1963sub load_header_from($) {
1745 my ($self, $path) = @_; 1964 my ($self, $path) = @_;
1746 1965
1747 utf8::encode $path; 1966 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1967 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1968 or return;
1969
1970 $self->_load_header ($f)
1971 or return;
1972
1973 local $MAP_LOADING{$self->{path}} = $self;
1974 $f->resolve_delayed_derefs;
1753 1975
1754 $self->{load_path} = $path; 1976 $self->{load_path} = $path;
1755 1977
1756 1 1978 1
1757} 1979}
1811sub find { 2033sub find {
1812 my ($path, $origin) = @_; 2034 my ($path, $origin) = @_;
1813 2035
1814 $path = normalise $path, $origin && $origin->path; 2036 $path = normalise $path, $origin && $origin->path;
1815 2037
2038 cf::lock_wait "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 2039 cf::lock_wait "map_find:$path";
1817 2040
1818 $cf::MAP{$path} || do { 2041 $cf::MAP{$path} || do {
2042 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1819 my $guard = cf::lock_acquire "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
2044
1820 my $map = new_from_path cf::map $path 2045 my $map = new_from_path cf::map $path
1821 or return; 2046 or return;
1822 2047
1823 $map->{last_save} = $cf::RUNTIME; 2048 $map->{last_save} = $cf::RUNTIME;
1824 2049
1826 or return; 2051 or return;
1827 2052
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2053 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 2054 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 2055 #$cf::WAIT_FOR_TICK->wait;
2056 undef $guard2;
2057 undef $guard1;
1831 $map->reset; 2058 $map->reset;
1832 undef $guard;
1833 return find $path; 2059 return find $path;
1834 } 2060 }
1835 2061
1836 $cf::MAP{$path} = $map 2062 $cf::MAP{$path} = $map
1837 } 2063 }
1846 local $self->{deny_reset} = 1; # loading can take a long time 2072 local $self->{deny_reset} = 1; # loading can take a long time
1847 2073
1848 my $path = $self->{path}; 2074 my $path = $self->{path};
1849 2075
1850 { 2076 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 2077 my $guard = cf::lock_acquire "map_data:$path";
1852 2078
2079 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 2080 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 2081
1855 $self->in_memory (cf::MAP_LOADING); 2082 $self->in_memory (cf::MAP_LOADING);
1856 2083
1857 $self->alloc; 2084 $self->alloc;
1858 2085
1859 $self->pre_load; 2086 $self->pre_load;
1860 Coro::cede; 2087 cf::cede_to_tick;
1861 2088
2089 my $f = new_from_file cf::object::thawer $self->{load_path};
2090 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 2091 $self->_load_objects ($f)
1863 or return; 2092 or return;
1864 2093
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2094 $self->post_load_original
1866 if delete $self->{load_original}; 2095 if delete $self->{load_original};
1867 2096
1868 if (my $uniq = $self->uniq_path) { 2097 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 2098 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 2099 unless (aio_stat $uniq) {
2100 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 2101 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 2102 $self->_load_objects ($f);
2103 $f->resolve_delayed_derefs;
2104 }
1873 } 2105 }
1874 } 2106 }
1875 2107
1876 Coro::cede; 2108 $f->resolve_delayed_derefs;
2109
2110 cf::cede_to_tick;
1877 # now do the right thing for maps 2111 # now do the right thing for maps
1878 $self->link_multipart_objects; 2112 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 2113 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 2114 unless $self->difficulty;
1881 Coro::cede; 2115 cf::cede_to_tick;
1882 2116
1883 unless ($self->{deny_activate}) { 2117 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 2118 $self->decay_objects;
1885 $self->fix_auto_apply; 2119 $self->fix_auto_apply;
1886 $self->update_buttons; 2120 $self->update_buttons;
1887 Coro::cede; 2121 cf::cede_to_tick;
1888 $self->set_darkness_map; 2122 $self->set_darkness_map;
1889 Coro::cede; 2123 cf::cede_to_tick;
1890 $self->activate; 2124 $self->activate;
1891 } 2125 }
1892 2126
1893 $self->{last_save} = $cf::RUNTIME; 2127 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2128 $self->last_access ($cf::RUNTIME);
1895 2129
1896 $self->in_memory (cf::MAP_IN_MEMORY); 2130 $self->in_memory (cf::MAP_ACTIVE);
1897 } 2131 }
1898 2132
1899 $self->post_load; 2133 $self->post_load;
1900} 2134}
1901 2135
1944} 2178}
1945 2179
1946sub do_load_sync { 2180sub do_load_sync {
1947 my ($map) = @_; 2181 my ($map) = @_;
1948 2182
2183 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2184 if $Coro::current == $Coro::main;
2185
1949 cf::sync_job { $map->load }; 2186 cf::sync_job { $map->load };
1950} 2187}
1951 2188
1952our %MAP_PREFETCH; 2189our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2190our $MAP_PREFETCHER = undef;
1954 2191
1955sub find_async { 2192sub find_async {
1956 my ($path, $origin) = @_; 2193 my ($path, $origin, $load) = @_;
1957 2194
1958 $path = normalise $path, $origin && $origin->{path}; 2195 $path = normalise $path, $origin && $origin->{path};
1959 2196
1960 if (my $map = $cf::MAP{$path}) { 2197 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2198 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1962 } 2199 }
1963 2200
1964 undef $MAP_PREFETCH{$path}; 2201 $MAP_PREFETCH{$path} |= $load;
2202
1965 $MAP_PREFETCHER ||= cf::async { 2203 $MAP_PREFETCHER ||= cf::async {
2204 $Coro::current->{desc} = "map prefetcher";
2205
1966 while (%MAP_PREFETCH) { 2206 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2207 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2208 if (my $map = find $k) {
1969 $map->load; 2209 $map->load if $v;
1970 } 2210 }
1971 2211
1972 delete $MAP_PREFETCH{$path}; 2212 delete $MAP_PREFETCH{$k};
1973 } 2213 }
1974 } 2214 }
1975 undef $MAP_PREFETCHER; 2215 undef $MAP_PREFETCHER;
1976 }; 2216 };
1977 $MAP_PREFETCHER->prio (6); 2217 $MAP_PREFETCHER->prio (6);
1980} 2220}
1981 2221
1982sub save { 2222sub save {
1983 my ($self) = @_; 2223 my ($self) = @_;
1984 2224
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2225 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2226
1987 $self->{last_save} = $cf::RUNTIME; 2227 $self->{last_save} = $cf::RUNTIME;
1988 2228
1989 return unless $self->dirty; 2229 return unless $self->dirty;
1990 2230
1996 return if $self->{deny_save}; 2236 return if $self->{deny_save};
1997 2237
1998 local $self->{last_access} = $self->last_access;#d# 2238 local $self->{last_access} = $self->last_access;#d#
1999 2239
2000 cf::async { 2240 cf::async {
2241 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2242 $_->contr->save for $self->players;
2002 }; 2243 };
2244
2245 cf::get_slot 0.02;
2003 2246
2004 if ($uniq) { 2247 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2248 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2006 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2249 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2007 } else { 2250 } else {
2013 my ($self) = @_; 2256 my ($self) = @_;
2014 2257
2015 # save first because save cedes 2258 # save first because save cedes
2016 $self->save; 2259 $self->save;
2017 2260
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2262
2020 return if $self->players; 2263 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2264 return if $self->in_memory != cf::MAP_ACTIVE;
2022 return if $self->{deny_save}; 2265 return if $self->{deny_save};
2023 2266
2267 $self->in_memory (cf::MAP_SWAPPED);
2268
2269 $self->deactivate;
2270 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2271 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2272}
2027 2273
2028sub reset_at { 2274sub reset_at {
2029 my ($self) = @_; 2275 my ($self) = @_;
2030 2276
2062 if $uniq; 2308 if $uniq;
2063 } 2309 }
2064 2310
2065 delete $cf::MAP{$self->path}; 2311 delete $cf::MAP{$self->path};
2066 2312
2313 $self->deactivate;
2314 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2315 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2316
2071 $self->unlink_save; 2317 $self->unlink_save;
2072 $self->destroy; 2318 $self->destroy;
2073} 2319}
2074 2320
2075my $nuke_counter = "aaaa"; 2321my $nuke_counter = "aaaa";
2076 2322
2077sub nuke { 2323sub nuke {
2078 my ($self) = @_; 2324 my ($self) = @_;
2079 2325
2326 {
2327 my $lock = cf::lock_acquire "map_data:$self->{path}";
2328
2080 delete $cf::MAP{$self->path}; 2329 delete $cf::MAP{$self->path};
2081 2330
2082 $self->unlink_save; 2331 $self->unlink_save;
2083 2332
2084 bless $self, "cf::map"; 2333 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2334 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2335 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2336 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2337 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2338
2090 $cf::MAP{$self->path} = $self; 2339 $cf::MAP{$self->path} = $self;
2340 }
2091 2341
2092 $self->reset; # polite request, might not happen 2342 $self->reset; # polite request, might not happen
2093} 2343}
2094 2344
2095=item $maps = cf::map::tmp_maps 2345=item $maps = cf::map::tmp_maps
2137 2387
2138sub unique_maps() { 2388sub unique_maps() {
2139 [ 2389 [
2140 map { 2390 map {
2141 utf8::decode $_; 2391 utf8::decode $_;
2142 /\.map$/ 2392 s/\.map$//; # TODO future compatibility hack
2393 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2394 ? ()
2143 ? normalise $_ 2395 : normalise $_
2144 : ()
2145 } @{ aio_readdir $UNIQUEDIR or [] } 2396 } @{ aio_readdir $UNIQUEDIR or [] }
2146 ] 2397 ]
2147} 2398}
2148 2399
2149package cf;
2150
2151=back 2400=back
2152 2401
2153=head3 cf::object 2402=head3 cf::object
2154 2403
2155=cut 2404=cut
2158 2407
2159=over 4 2408=over 4
2160 2409
2161=item $ob->inv_recursive 2410=item $ob->inv_recursive
2162 2411
2163Returns the inventory of the object _and_ their inventories, recursively. 2412Returns the inventory of the object I<and> their inventories, recursively,
2413but I<not> the object itself.
2164 2414
2165=cut 2415=cut
2166 2416
2167sub inv_recursive_; 2417sub inv_recursive_;
2168sub inv_recursive_ { 2418sub inv_recursive_ {
2171 2421
2172sub inv_recursive { 2422sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2423 inv_recursive_ inv $_[0]
2174} 2424}
2175 2425
2426=item $ref = $ob->ref
2427
2428Creates and returns a persistent reference to an object that can be stored as a string.
2429
2430=item $ob = cf::object::deref ($refstring)
2431
2432returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2433even if the object actually exists. May block.
2434
2435=cut
2436
2437sub deref {
2438 my ($ref) = @_;
2439
2440 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2441 my ($uuid, $name) = ($1, $2);
2442 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2443 or return;
2444 $pl->ob->uuid eq $uuid
2445 or return;
2446
2447 $pl->ob
2448 } else {
2449 warn "$ref: cannot resolve object reference\n";
2450 undef
2451 }
2452}
2453
2176package cf; 2454package cf;
2177 2455
2178=back 2456=back
2179 2457
2180=head3 cf::object::player 2458=head3 cf::object::player
2186Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2464Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2187can be C<undef>. Does the right thing when the player is currently in a 2465can be C<undef>. Does the right thing when the player is currently in a
2188dialogue with the given NPC character. 2466dialogue with the given NPC character.
2189 2467
2190=cut 2468=cut
2469
2470our $SAY_CHANNEL = {
2471 id => "say",
2472 title => "Map",
2473 reply => "say ",
2474 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2475};
2476
2477our $CHAT_CHANNEL = {
2478 id => "chat",
2479 title => "Chat",
2480 reply => "chat ",
2481 tooltip => "Player chat and shouts, global to the server.",
2482};
2191 2483
2192# rough implementation of a future "reply" method that works 2484# rough implementation of a future "reply" method that works
2193# with dialog boxes. 2485# with dialog boxes.
2194#TODO: the first argument must go, split into a $npc->reply_to ( method 2486#TODO: the first argument must go, split into a $npc->reply_to ( method
2195sub cf::object::player::reply($$$;$) { 2487sub cf::object::player::reply($$$;$) {
2207 my $dialog = $pl->{npc_dialog}; 2499 my $dialog = $pl->{npc_dialog};
2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2500 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2209 2501
2210 } else { 2502 } else {
2211 $msg = $npc->name . " says: $msg" if $npc; 2503 $msg = $npc->name . " says: $msg" if $npc;
2212 $self->message ($msg, $flags); 2504 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2213 } 2505 }
2214 } 2506 }
2215} 2507}
2216 2508
2217=item $object->send_msg ($channel, $msg, $color, [extra...]) 2509=item $object->send_msg ($channel, $msg, $color, [extra...])
2325her, loading and preparing them map, calling the provided $check callback 2617her, loading and preparing them map, calling the provided $check callback
2326that has to return the map if sucecssful, and then unfreezes the player on 2618that has to return the map if sucecssful, and then unfreezes the player on
2327the new (success) or old (failed) map position. In either case, $done will 2619the new (success) or old (failed) map position. In either case, $done will
2328be called at the end of this process. 2620be called at the end of this process.
2329 2621
2622Note that $check will be called with a potentially non-loaded map, so if
2623it needs a loaded map it has to call C<< ->load >>.
2624
2330=cut 2625=cut
2331 2626
2332our $GOTOGEN; 2627our $GOTOGEN;
2333 2628
2334sub cf::object::player::goto { 2629sub cf::object::player::goto {
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2633 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2634
2340 $self->enter_link; 2635 $self->enter_link;
2341 2636
2342 (async { 2637 (async {
2638 $Coro::current->{desc} = "player::goto $path $x $y";
2639
2640 # *tag paths override both path and x|y
2641 if ($path =~ /^\*(.*)$/) {
2642 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2643 my $ob = $obs[rand @obs];
2644
2645 # see if we actually can go there
2646 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2647 $ob = $obs[rand @obs];
2648 } else {
2649 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2650 }
2651 # else put us there anyways for now #d#
2652
2653 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2654 } else {
2655 ($path, $x, $y) = (undef, undef, undef);
2656 }
2657 }
2658
2343 my $map = eval { 2659 my $map = eval {
2344 my $map = cf::map::find $path; 2660 my $map = defined $path ? cf::map::find $path : undef;
2345 2661
2346 if ($map) { 2662 if ($map) {
2347 $map = $map->customise_for ($self); 2663 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2664 $map = $check->($map) if $check && $map;
2349 } else { 2665 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2666 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2667 }
2352 2668
2353 $map 2669 $map
2354 }; 2670 };
2355 2671
2391} 2707}
2392 2708
2393sub prepare_random_map { 2709sub prepare_random_map {
2394 my ($exit) = @_; 2710 my ($exit) = @_;
2395 2711
2396 my $guard = cf::lock_acquire "exit_prepare:$exit";
2397
2398 # all this does is basically replace the /! path by 2712 # all this does is basically replace the /! path by
2399 # a new random map path (?random/...) with a seed 2713 # a new random map path (?random/...) with a seed
2400 # that depends on the exit object 2714 # that depends on the exit object
2401 2715
2402 my $rmp = parse_random_map_params $exit->msg; 2716 my $rmp = parse_random_map_params $exit->msg;
2404 if ($exit->map) { 2718 if ($exit->map) {
2405 $rmp->{region} = $exit->region->name; 2719 $rmp->{region} = $exit->region->name;
2406 $rmp->{origin_map} = $exit->map->path; 2720 $rmp->{origin_map} = $exit->map->path;
2407 $rmp->{origin_x} = $exit->x; 2721 $rmp->{origin_x} = $exit->x;
2408 $rmp->{origin_y} = $exit->y; 2722 $rmp->{origin_y} = $exit->y;
2723
2724 $exit->map->touch;
2409 } 2725 }
2410 2726
2411 $rmp->{random_seed} ||= $exit->random_seed; 2727 $rmp->{random_seed} ||= $exit->random_seed;
2412 2728
2413 my $data = cf::to_json $rmp; 2729 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2414 my $md5 = Digest::MD5::md5_hex $data; 2730 my $md5 = Digest::MD5::md5_hex $data;
2415 my $meta = "$RANDOMDIR/$md5.meta"; 2731 my $meta = "$RANDOMDIR/$md5.meta";
2416 2732
2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2733 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2418 aio_write $fh, 0, (length $data), $data, 0; 2734 aio_write $fh, 0, (length $data), $data, 0;
2419 undef $fh; 2735 undef $fh;
2420 aio_rename "$meta~", $meta; 2736 aio_rename "$meta~", $meta;
2421 2737
2738 my $slaying = "?random/$md5";
2739
2740 if ($exit->valid) {
2422 $exit->slaying ("?random/$md5"); 2741 $exit->slaying ("?random/$md5");
2423 $exit->msg (undef); 2742 $exit->msg (undef);
2743 }
2424 } 2744 }
2425} 2745}
2426 2746
2427sub cf::object::player::enter_exit { 2747sub cf::object::player::enter_exit {
2428 my ($self, $exit) = @_; 2748 my ($self, $exit) = @_;
2429 2749
2430 return unless $self->type == cf::PLAYER; 2750 return unless $self->type == cf::PLAYER;
2431 2751
2432 if ($exit->slaying eq "/!") {
2433 #TODO: this should de-fi-ni-te-ly not be a sync-job
2434 # the problem is that $exit might not survive long enough
2435 # so it needs to be done right now, right here
2436 cf::sync_job { prepare_random_map $exit };
2437 }
2438
2439 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2440 my $hp = $exit->stats->hp;
2441 my $sp = $exit->stats->sp;
2442
2443 $self->enter_link; 2752 $self->enter_link;
2444 2753
2445 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED);
2448
2449 (async { 2754 (async {
2450 $self->deactivate_recursive; # just to be sure 2755 $Coro::current->{desc} = "enter_exit";
2756
2451 unless (eval { 2757 unless (eval {
2758 $self->deactivate_recursive; # just to be sure
2759
2760 # random map handling
2761 {
2762 my $guard = cf::lock_acquire "exit_prepare:$exit";
2763
2764 prepare_random_map $exit
2765 if $exit->slaying eq "/!";
2766 }
2767
2768 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2769 my $x = $exit->stats->hp;
2770 my $y = $exit->stats->sp;
2771
2452 $self->goto ($slaying, $hp, $sp); 2772 $self->goto ($map, $x, $y);
2453 2773
2774 # if exit is damned, update players death & WoR home-position
2775 $self->contr->savebed ($map, $x, $y)
2776 if $exit->flag (cf::FLAG_DAMNED);
2777
2454 1; 2778 1
2455 }) { 2779 }) {
2456 $self->message ("Something went wrong deep within the crossfire server. " 2780 $self->message ("Something went wrong deep within the crossfire server. "
2457 . "I'll try to bring you back to the map you were before. " 2781 . "I'll try to bring you back to the map you were before. "
2458 . "Please report this to the dungeon master!", 2782 . "Please report this to the dungeon master!",
2459 cf::NDI_UNIQUE | cf::NDI_RED); 2783 cf::NDI_UNIQUE | cf::NDI_RED);
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2813the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2814the message unless the client supports the msg packet.
2491 2815
2492=cut 2816=cut
2493 2817
2818# non-persistent channels (usually the info channel)
2819our %CHANNEL = (
2820 "c/identify" => {
2821 id => "infobox",
2822 title => "Identify",
2823 reply => undef,
2824 tooltip => "Items recently identified",
2825 },
2826 "c/examine" => {
2827 id => "infobox",
2828 title => "Examine",
2829 reply => undef,
2830 tooltip => "Signs and other items you examined",
2831 },
2832 "c/book" => {
2833 id => "infobox",
2834 title => "Book",
2835 reply => undef,
2836 tooltip => "The contents of a note or book",
2837 },
2838 "c/lookat" => {
2839 id => "infobox",
2840 title => "Look",
2841 reply => undef,
2842 tooltip => "What you saw there",
2843 },
2844 "c/who" => {
2845 id => "infobox",
2846 title => "Players",
2847 reply => undef,
2848 tooltip => "Shows players who are currently online",
2849 },
2850 "c/body" => {
2851 id => "infobox",
2852 title => "Body Parts",
2853 reply => undef,
2854 tooltip => "Shows which body parts you posess and are available",
2855 },
2856 "c/uptime" => {
2857 id => "infobox",
2858 title => "Uptime",
2859 reply => undef,
2860 tooltip => "How long the server has been running since last restart",
2861 },
2862 "c/mapinfo" => {
2863 id => "infobox",
2864 title => "Map Info",
2865 reply => undef,
2866 tooltip => "Information related to the maps",
2867 },
2868 "c/party" => {
2869 id => "party",
2870 title => "Party",
2871 reply => "gsay ",
2872 tooltip => "Messages and chat related to your party",
2873 },
2874);
2875
2494sub cf::client::send_msg { 2876sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2877 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2878
2497 $msg = $self->pl->expand_cfpod ($msg); 2879 $msg = $self->pl->expand_cfpod ($msg);
2498 2880
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2881 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2882
2883 # check predefined channels, for the benefit of C
2884 if ($CHANNEL{$channel}) {
2885 $channel = $CHANNEL{$channel};
2886
2887 $self->ext_msg (channel_info => $channel)
2888 if $self->can_msg;
2889
2890 $channel = $channel->{id};
2891
2501 if (ref $channel) { 2892 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2893 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2894 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2895 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2896 $self->ext_msg (channel_info => $channel)
2897 if $self->can_msg;
2506 } 2898 }
2507 2899
2508 $channel = $channel->{id}; 2900 $channel = $channel->{id};
2509 } 2901 }
2510 2902
2551=cut 2943=cut
2552 2944
2553sub cf::client::ext_msg($$@) { 2945sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2946 my ($self, $type, @msg) = @_;
2555 2947
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2948 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2949 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2950 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2951 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2952 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2953 }
2564} 2954}
2565 2955
2572sub cf::client::ext_reply($$@) { 2962sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2963 my ($self, $id, @msg) = @_;
2574 2964
2575 if ($self->extcmd == 2) { 2965 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2966 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2967 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2968 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2969 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2970 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2971 }
2582} 2972}
2646 my ($type, $reply, @payload) = 3036 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 3037 "ARRAY" eq ref $msg
2648 ? @$msg 3038 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3039 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3040
3041 my @reply;
3042
2651 if (my $cb = $EXTICMD{$type}) { 3043 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3044 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3045 }
3046
3047 $ns->ext_reply ($reply, @reply)
3048 if $reply;
3049
2657 } else { 3050 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3051 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3052 }
2660 3053
2661 cf::override; 3054 cf::override;
2721=pod 3114=pod
2722 3115
2723The following functions and methods are available within a safe environment: 3116The following functions and methods are available within a safe environment:
2724 3117
2725 cf::object 3118 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 3119 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 3120 insert remove name archname title slaying race decrease split
2728 3121
2729 cf::object::player 3122 cf::object::player
2730 player 3123 player
2731 3124
2732 cf::player 3125 cf::player
2737 3130
2738=cut 3131=cut
2739 3132
2740for ( 3133for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3134 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 3135 insert remove inv nrof name archname title slaying race
3136 decrease split destroy change_exp)],
2743 ["cf::object::player" => qw(player)], 3137 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 3138 ["cf::player" => qw(peaceful)],
2745 ["cf::map" => qw(trigger)], 3139 ["cf::map" => qw(trigger)],
2746) { 3140) {
2747 no strict 'refs'; 3141 no strict 'refs';
2823# the server's init and main functions 3217# the server's init and main functions
2824 3218
2825sub load_facedata($) { 3219sub load_facedata($) {
2826 my ($path) = @_; 3220 my ($path) = @_;
2827 3221
3222 # HACK to clear player env face cache, we need some signal framework
3223 # for this (global event?)
3224 %ext::player_env::MUSIC_FACE_CACHE = ();
3225
2828 my $enc = JSON::XS->new->utf8->canonical; 3226 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3227
2830 warn "loading facedata from $path\n"; 3228 warn "loading facedata from $path\n";
2831 3229
2832 my $facedata; 3230 my $facedata;
2833 0 < aio_load $path, $facedata 3231 0 < aio_load $path, $facedata
2848 { 3246 {
2849 my $faces = $facedata->{faceinfo}; 3247 my $faces = $facedata->{faceinfo};
2850 3248
2851 while (my ($face, $info) = each %$faces) { 3249 while (my ($face, $info) = each %$faces) {
2852 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3250 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3251
2853 cf::face::set_visibility $idx, $info->{visibility}; 3252 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap}; 3253 cf::face::set_magicmap $idx, $info->{magicmap};
2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3254 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3255 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2857 3256
2858 cf::cede_to_tick; 3257 cf::cede_to_tick;
2859 } 3258 }
2860 3259
2861 while (my ($face, $info) = each %$faces) { 3260 while (my ($face, $info) = each %$faces) {
2862 next unless $info->{smooth}; 3261 next unless $info->{smooth};
3262
2863 my $idx = cf::face::find $face 3263 my $idx = cf::face::find $face
2864 or next; 3264 or next;
3265
2865 if (my $smooth = cf::face::find $info->{smooth}) { 3266 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth; 3267 cf::face::set_smooth $idx, $smooth;
2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3268 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2868 } else { 3269 } else {
2869 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3270 warn "smooth face '$info->{smooth}' not found for face '$face'";
2887 { 3288 {
2888 # TODO: for gcfclient pleasure, we should give resources 3289 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index. 3290 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource}; 3291 my $res = $facedata->{resource};
2891 3292
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) { 3293 while (my ($name, $info) = each %$res) {
3294 if (defined $info->{type}) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3295 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data; 3296 my $data;
2897 3297
2898 if ($info->{type} & 1) { 3298 if ($info->{type} & 1) {
2899 # prepend meta info 3299 # prepend meta info
2900 3300
2901 my $meta = $enc->encode ({ 3301 my $meta = $enc->encode ({
2902 name => $name, 3302 name => $name,
2903 %{ $info->{meta} || {} }, 3303 %{ $info->{meta} || {} },
2904 }); 3304 });
2905 3305
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3306 $data = pack "(w/a*)*", $meta, $info->{data};
3307 } else {
3308 $data = $info->{data};
3309 }
3310
3311 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3312 cf::face::set_type $idx, $info->{type};
2907 } else { 3313 } else {
2908 $data = $info->{data}; 3314 $RESOURCE{$name} = $info;
2909 } 3315 }
2910 3316
2911 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2912 cf::face::set_type $idx, $info->{type};
2913
2914 cf::cede_to_tick; 3317 cf::cede_to_tick;
2915 } 3318 }
2916
2917 if ($soundconf) {
2918 $soundconf = $enc->decode (delete $soundconf->{data});
2919
2920 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2921 my $sound = $soundconf->{compat}[$_]
2922 or next;
2923
2924 my $face = cf::face::find "sound/$sound->[1]";
2925 cf::sound::set $sound->[0] => $face;
2926 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2927 }
2928
2929 while (my ($k, $v) = each %{$soundconf->{event}}) {
2930 my $face = cf::face::find "sound/$v";
2931 cf::sound::set $k => $face;
2932 }
2933 }
2934 } 3319 }
3320
3321 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2935 3322
2936 1 3323 1
2937} 3324}
3325
3326cf::global->attach (on_resource_update => sub {
3327 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3328 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3329
3330 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3331 my $sound = $soundconf->{compat}[$_]
3332 or next;
3333
3334 my $face = cf::face::find "sound/$sound->[1]";
3335 cf::sound::set $sound->[0] => $face;
3336 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3337 }
3338
3339 while (my ($k, $v) = each %{$soundconf->{event}}) {
3340 my $face = cf::face::find "sound/$v";
3341 cf::sound::set $k => $face;
3342 }
3343 }
3344});
2938 3345
2939register_exticmd fx_want => sub { 3346register_exticmd fx_want => sub {
2940 my ($ns, $want) = @_; 3347 my ($ns, $want) = @_;
2941 3348
2942 while (my ($k, $v) = each %$want) { 3349 while (my ($k, $v) = each %$want) {
2943 $ns->fx_want ($k, $v); 3350 $ns->fx_want ($k, $v);
2944 } 3351 }
2945}; 3352};
2946 3353
3354sub load_resource_file($) {
3355 my $guard = lock_acquire "load_resource_file";
3356
3357 my $status = load_resource_file_ $_[0];
3358 get_slot 0.1, 100;
3359 cf::arch::commit_load;
3360
3361 $status
3362}
3363
2947sub reload_regions { 3364sub reload_regions {
3365 # HACK to clear player env face cache, we need some signal framework
3366 # for this (global event?)
3367 %ext::player_env::MUSIC_FACE_CACHE = ();
3368
2948 load_resource_file "$MAPDIR/regions" 3369 load_resource_file "$MAPDIR/regions"
2949 or die "unable to load regions file\n"; 3370 or die "unable to load regions file\n";
2950 3371
2951 for (cf::region::list) { 3372 for (cf::region::list) {
2952 $_->{match} = qr/$_->{match}/ 3373 $_->{match} = qr/$_->{match}/
2960} 3381}
2961 3382
2962sub reload_archetypes { 3383sub reload_archetypes {
2963 load_resource_file "$DATADIR/archetypes" 3384 load_resource_file "$DATADIR/archetypes"
2964 or die "unable to load archetypes\n"; 3385 or die "unable to load archetypes\n";
2965 #d# NEED to laod twice to resolve forward references
2966 # this really needs to be done in an extra post-pass
2967 # (which needs to be synchronous, so solve it differently)
2968 load_resource_file "$DATADIR/archetypes"
2969 or die "unable to load archetypes\n";
2970} 3386}
2971 3387
2972sub reload_treasures { 3388sub reload_treasures {
2973 load_resource_file "$DATADIR/treasures" 3389 load_resource_file "$DATADIR/treasures"
2974 or die "unable to load treasurelists\n"; 3390 or die "unable to load treasurelists\n";
2975} 3391}
2976 3392
2977sub reload_resources { 3393sub reload_resources {
2978 warn "reloading resource files...\n"; 3394 warn "reloading resource files...\n";
2979 3395
3396 reload_facedata;
3397 reload_archetypes;
2980 reload_regions; 3398 reload_regions;
2981 reload_facedata;
2982 #reload_archetypes;#d#
2983 reload_archetypes;
2984 reload_treasures; 3399 reload_treasures;
2985 3400
2986 warn "finished reloading resource files\n"; 3401 warn "finished reloading resource files\n";
2987} 3402}
2988 3403
2989sub init { 3404sub init {
3405 my $guard = freeze_mainloop;
3406
3407 evthread_start IO::AIO::poll_fileno;
3408
2990 reload_resources; 3409 reload_resources;
2991} 3410}
2992 3411
2993sub cfg_load { 3412sub reload_config {
2994 open my $fh, "<:utf8", "$CONFDIR/config" 3413 open my $fh, "<:utf8", "$CONFDIR/config"
2995 or return; 3414 or return;
2996 3415
2997 local $/; 3416 local $/;
2998 *CFG = YAML::Syck::Load <$fh>; 3417 *CFG = YAML::Load <$fh>;
2999 3418
3000 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3419 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3001 3420
3002 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3421 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3003 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3422 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3014sub main { 3433sub main {
3015 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3016 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3017 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3018 (async { 3437 (async {
3019 Event::one_event; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3439 EV::loop EV::LOOP_ONESHOT;
3020 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3021 }; 3441 };
3022 3442
3023 cfg_load; 3443 {
3444 my $guard = freeze_mainloop;
3445 reload_config;
3024 db_init; 3446 db_init;
3025 load_extensions; 3447 load_extensions;
3026 3448
3027 $TICK_WATCHER->start; 3449 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3450 }
3451
3028 Event::loop; 3452 EV::loop;
3029} 3453}
3030 3454
3031############################################################################# 3455#############################################################################
3032# initialisation and cleanup 3456# initialisation and cleanup
3033 3457
3034# install some emergency cleanup handlers 3458# install some emergency cleanup handlers
3035BEGIN { 3459BEGIN {
3460 our %SIGWATCHER = ();
3036 for my $signal (qw(INT HUP TERM)) { 3461 for my $signal (qw(INT HUP TERM)) {
3037 Event->signal ( 3462 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3038 reentrant => 0,
3039 data => WF_AUTOCANCEL,
3040 signal => $signal,
3041 prio => 0,
3042 cb => sub {
3043 cf::cleanup "SIG$signal"; 3463 cf::cleanup "SIG$signal";
3044 },
3045 ); 3464 };
3046 } 3465 }
3047} 3466}
3048 3467
3049sub write_runtime { 3468sub write_runtime_sync {
3050 my $runtime = "$LOCALDIR/runtime"; 3469 my $runtime = "$LOCALDIR/runtime";
3051 3470
3052 # first touch the runtime file to show we are still running: 3471 # first touch the runtime file to show we are still running:
3053 # the fsync below can take a very very long time. 3472 # the fsync below can take a very very long time.
3054 3473
3080 and return; 3499 and return;
3081 3500
3082 warn "runtime file written.\n"; 3501 warn "runtime file written.\n";
3083 3502
3084 1 3503 1
3504}
3505
3506our $uuid_lock;
3507our $uuid_skip;
3508
3509sub write_uuid_sync($) {
3510 $uuid_skip ||= $_[0];
3511
3512 return if $uuid_lock;
3513 local $uuid_lock = 1;
3514
3515 my $uuid = "$LOCALDIR/uuid";
3516
3517 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3518 or return;
3519
3520 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3085} 3547}
3086 3548
3087sub emergency_save() { 3549sub emergency_save() {
3088 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3089 3551
3095 # and maps saved/destroyed asynchronously. 3557 # and maps saved/destroyed asynchronously.
3096 warn "begin emergency player save\n"; 3558 warn "begin emergency player save\n";
3097 for my $login (keys %cf::PLAYER) { 3559 for my $login (keys %cf::PLAYER) {
3098 my $pl = $cf::PLAYER{$login} or next; 3560 my $pl = $cf::PLAYER{$login} or next;
3099 $pl->valid or next; 3561 $pl->valid or next;
3562 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3100 $pl->save; 3563 $pl->save;
3101 } 3564 }
3102 warn "end emergency player save\n"; 3565 warn "end emergency player save\n";
3103 3566
3104 warn "begin emergency map save\n"; 3567 warn "begin emergency map save\n";
3110 warn "end emergency map save\n"; 3573 warn "end emergency map save\n";
3111 3574
3112 warn "begin emergency database checkpoint\n"; 3575 warn "begin emergency database checkpoint\n";
3113 BDB::db_env_txn_checkpoint $DB_ENV; 3576 BDB::db_env_txn_checkpoint $DB_ENV;
3114 warn "end emergency database checkpoint\n"; 3577 warn "end emergency database checkpoint\n";
3578
3579 warn "begin write uuid\n";
3580 write_uuid_sync 1;
3581 warn "end write uuid\n";
3115 }; 3582 };
3116 3583
3117 warn "leave emergency perl save\n"; 3584 warn "leave emergency perl save\n";
3118} 3585}
3119 3586
3121 my ($make_core) = @_; 3588 my ($make_core) = @_;
3122 3589
3123 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3124 if $make_core; 3591 if $make_core;
3125} 3592}
3593
3594# a safer delete_package, copied from Symbol
3595sub clear_package($) {
3596 my $pkg = shift;
3597
3598 # expand to full symbol table name if needed
3599 unless ($pkg =~ /^main::.*::$/) {
3600 $pkg = "main$pkg" if $pkg =~ /^::/;
3601 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3602 $pkg .= '::' unless $pkg =~ /::$/;
3603 }
3604
3605 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3606 my $stem_symtab = *{$stem}{HASH};
3607
3608 defined $stem_symtab and exists $stem_symtab->{$leaf}
3609 or return;
3610
3611 # clear all symbols
3612 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3613 for my $name (keys %$leaf_symtab) {
3614 _gv_clear *{"$pkg$name"};
3615# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3616 }
3617 warn "cleared package #$pkg\n";#d#
3618}
3619
3620our $RELOAD; # how many times to reload
3126 3621
3127sub do_reload_perl() { 3622sub do_reload_perl() {
3128 # can/must only be called in main 3623 # can/must only be called in main
3129 if ($Coro::current != $Coro::main) { 3624 if ($Coro::current != $Coro::main) {
3130 warn "can only reload from main coroutine"; 3625 warn "can only reload from main coroutine";
3131 return; 3626 return;
3132 } 3627 }
3133 3628
3629 return if $RELOAD++;
3630
3631 while ($RELOAD) {
3134 warn "reloading..."; 3632 warn "reloading...";
3135 3633
3136 warn "entering sync_job"; 3634 warn "entering sync_job";
3137 3635
3138 cf::sync_job { 3636 cf::sync_job {
3139 cf::write_runtime; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3140 cf::emergency_save; 3638 cf::emergency_save;
3141 cf::write_runtime; # external watchdog should not bark 3639 cf::write_runtime_sync; # external watchdog should not bark
3142 3640
3143 warn "syncing database to disk"; 3641 warn "syncing database to disk";
3144 BDB::db_env_txn_checkpoint $DB_ENV; 3642 BDB::db_env_txn_checkpoint $DB_ENV;
3145 3643
3146 # if anything goes wrong in here, we should simply crash as we already saved 3644 # if anything goes wrong in here, we should simply crash as we already saved
3147 3645
3148 warn "cancelling all WF_AUTOCANCEL watchers";
3149 for (Event::all_watchers) {
3150 $_->cancel if $_->data & WF_AUTOCANCEL;
3151 }
3152
3153 warn "flushing outstanding aio requests"; 3646 warn "flushing outstanding aio requests";
3154 for (;;) {
3155 BDB::flush;
3156 IO::AIO::flush;
3157 Coro::cede;
3158 last unless IO::AIO::nreqs || BDB::nreqs; 3647 while (IO::AIO::nreqs || BDB::nreqs) {
3159 warn "iterate..."; 3648 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3160 }
3161
3162 ++$RELOAD;
3163
3164 warn "cancelling all extension coros";
3165 $_->cancel for values %EXT_CORO;
3166 %EXT_CORO = ();
3167
3168 warn "removing commands";
3169 %COMMAND = ();
3170
3171 warn "removing ext/exti commands";
3172 %EXTCMD = ();
3173 %EXTICMD = ();
3174
3175 warn "unloading/nuking all extensions";
3176 for my $pkg (@EXTS) {
3177 warn "... unloading $pkg";
3178
3179 if (my $cb = $pkg->can ("unload")) {
3180 eval {
3181 $cb->($pkg);
3182 1
3183 } or warn "$pkg unloaded, but with errors: $@";
3184 } 3649 }
3185 3650
3186 warn "... nuking $pkg"; 3651 warn "cancelling all extension coros";
3187 Symbol::delete_package $pkg; 3652 $_->cancel for values %EXT_CORO;
3188 } 3653 %EXT_CORO = ();
3189 3654
3190 warn "unloading all perl modules loaded from $LIBDIR"; 3655 warn "removing commands";
3191 while (my ($k, $v) = each %INC) { 3656 %COMMAND = ();
3192 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3193 3657
3658 warn "removing ext/exti commands";
3659 %EXTCMD = ();
3660 %EXTICMD = ();
3661
3662 warn "unloading/nuking all extensions";
3663 for my $pkg (@EXTS) {
3194 warn "... unloading $k"; 3664 warn "... unloading $pkg";
3195 delete $INC{$k};
3196 3665
3197 $k =~ s/\.pm$//;
3198 $k =~ s/\//::/g;
3199
3200 if (my $cb = $k->can ("unload_module")) { 3666 if (my $cb = $pkg->can ("unload")) {
3667 eval {
3201 $cb->(); 3668 $cb->($pkg);
3669 1
3670 } or warn "$pkg unloaded, but with errors: $@";
3671 }
3672
3673 warn "... clearing $pkg";
3674 clear_package $pkg;
3202 } 3675 }
3203 3676
3204 Symbol::delete_package $k; 3677 warn "unloading all perl modules loaded from $LIBDIR";
3678 while (my ($k, $v) = each %INC) {
3679 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3680
3681 warn "... unloading $k";
3682 delete $INC{$k};
3683
3684 $k =~ s/\.pm$//;
3685 $k =~ s/\//::/g;
3686
3687 if (my $cb = $k->can ("unload_module")) {
3688 $cb->();
3689 }
3690
3691 clear_package $k;
3205 } 3692 }
3206 3693
3207 warn "getting rid of safe::, as good as possible"; 3694 warn "getting rid of safe::, as good as possible";
3208 Symbol::delete_package "safe::$_" 3695 clear_package "safe::$_"
3209 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3696 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3210 3697
3211 warn "unloading cf.pm \"a bit\""; 3698 warn "unloading cf.pm \"a bit\"";
3212 delete $INC{"cf.pm"}; 3699 delete $INC{"cf.pm"};
3213 delete $INC{"cf/pod.pm"}; 3700 delete $INC{"cf/pod.pm"};
3214 3701
3215 # don't, removes xs symbols, too, 3702 # don't, removes xs symbols, too,
3216 # and global variables created in xs 3703 # and global variables created in xs
3217 #Symbol::delete_package __PACKAGE__; 3704 #clear_package __PACKAGE__;
3218 3705
3219 warn "unload completed, starting to reload now"; 3706 warn "unload completed, starting to reload now";
3220 3707
3221 warn "reloading cf.pm"; 3708 warn "reloading cf.pm";
3222 require cf; 3709 require cf;
3223 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3710 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3224 3711
3225 warn "loading config and database again"; 3712 warn "loading config and database again";
3226 cf::cfg_load; 3713 cf::reload_config;
3227 3714
3228 warn "loading extensions"; 3715 warn "loading extensions";
3229 cf::load_extensions; 3716 cf::load_extensions;
3230 3717
3231 warn "reattaching attachments to objects/players"; 3718 warn "reattaching attachments to objects/players";
3232 _global_reattach; # objects, sockets 3719 _global_reattach; # objects, sockets
3233 warn "reattaching attachments to maps"; 3720 warn "reattaching attachments to maps";
3234 reattach $_ for values %MAP; 3721 reattach $_ for values %MAP;
3235 warn "reattaching attachments to players"; 3722 warn "reattaching attachments to players";
3236 reattach $_ for values %PLAYER; 3723 reattach $_ for values %PLAYER;
3237 3724
3238 warn "leaving sync_job"; 3725 warn "leaving sync_job";
3239 3726
3240 1 3727 1
3241 } or do { 3728 } or do {
3242 warn $@; 3729 warn $@;
3243 warn "error while reloading, exiting."; 3730 cf::cleanup "error while reloading, exiting.";
3244 exit 1;
3245 }; 3731 };
3246 3732
3247 warn "reloaded"; 3733 warn "reloaded";
3734 --$RELOAD;
3735 }
3248}; 3736};
3249 3737
3250our $RELOAD_WATCHER; # used only during reload 3738our $RELOAD_WATCHER; # used only during reload
3251 3739
3252sub reload_perl() { 3740sub reload_perl() {
3253 # doing reload synchronously and two reloads happen back-to-back, 3741 # doing reload synchronously and two reloads happen back-to-back,
3254 # coro crashes during coro_state_free->destroy here. 3742 # coro crashes during coro_state_free->destroy here.
3255 3743
3256 $RELOAD_WATCHER ||= Event->timer ( 3744 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3257 reentrant => 0,
3258 after => 0,
3259 data => WF_AUTOCANCEL,
3260 cb => sub {
3261 do_reload_perl; 3745 do_reload_perl;
3262 undef $RELOAD_WATCHER; 3746 undef $RELOAD_WATCHER;
3263 },
3264 ); 3747 };
3265} 3748}
3266 3749
3267register_command "reload" => sub { 3750register_command "reload" => sub {
3268 my ($who, $arg) = @_; 3751 my ($who, $arg) = @_;
3269 3752
3270 if ($who->flag (FLAG_WIZ)) { 3753 if ($who->flag (FLAG_WIZ)) {
3271 $who->message ("reloading server."); 3754 $who->message ("reloading server.");
3755 async {
3756 $Coro::current->{desc} = "perl_reload";
3272 async { reload_perl }; 3757 reload_perl;
3758 };
3273 } 3759 }
3274}; 3760};
3275 3761
3276unshift @INC, $LIBDIR; 3762unshift @INC, $LIBDIR;
3277 3763
3279 3765
3280our @WAIT_FOR_TICK; 3766our @WAIT_FOR_TICK;
3281our @WAIT_FOR_TICK_BEGIN; 3767our @WAIT_FOR_TICK_BEGIN;
3282 3768
3283sub wait_for_tick { 3769sub wait_for_tick {
3284 return unless $TICK_WATCHER->is_active;
3285 return if $Coro::current == $Coro::main; 3770 return if tick_inhibit || $Coro::current == $Coro::main;
3286 3771
3287 my $signal = new Coro::Signal; 3772 my $signal = new Coro::Signal;
3288 push @WAIT_FOR_TICK, $signal; 3773 push @WAIT_FOR_TICK, $signal;
3289 $signal->wait; 3774 $signal->wait;
3290} 3775}
3291 3776
3292sub wait_for_tick_begin { 3777sub wait_for_tick_begin {
3293 return unless $TICK_WATCHER->is_active;
3294 return if $Coro::current == $Coro::main; 3778 return if tick_inhibit || $Coro::current == $Coro::main;
3295 3779
3296 my $signal = new Coro::Signal; 3780 my $signal = new Coro::Signal;
3297 push @WAIT_FOR_TICK_BEGIN, $signal; 3781 push @WAIT_FOR_TICK_BEGIN, $signal;
3298 $signal->wait; 3782 $signal->wait;
3299} 3783}
3300 3784
3301 my $min = 1e6;#d# 3785sub tick {
3302 my $avg = 10;
3303$TICK_WATCHER = Event->timer (
3304 reentrant => 0,
3305 parked => 1,
3306 prio => 0,
3307 at => $NEXT_TICK || $TICK,
3308 data => WF_AUTOCANCEL,
3309 cb => sub {
3310 if ($Coro::current != $Coro::main) { 3786 if ($Coro::current != $Coro::main) {
3311 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3787 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3312 unless ++$bug_warning > 10; 3788 unless ++$bug_warning > 10;
3313 return; 3789 return;
3314 } 3790 }
3315 3791
3316 $NOW = $tick_start = Event::time;
3317
3318 cf::server_tick; # one server iteration 3792 cf::server_tick; # one server iteration
3319 3793
3320 0 && sync_job {#d# 3794 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3321 for(1..10) { 3795 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3322 my $t = Event::time; 3796 Coro::async_pool {
3323 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3797 $Coro::current->{desc} = "runtime saver";
3324 or die; 3798 write_runtime_sync
3325 3799 or warn "ERROR: unable to write runtime file: $!";
3326 $map->width (50);
3327 $map->height (50);
3328 $map->alloc;
3329 $map->_load_objects ("/tmp/x.map", 1);
3330 my $t = Event::time - $t;
3331
3332 #next unless $t < 0.0013;#d#
3333 if ($t < $min) {
3334 $min = $t;
3335 }
3336 $avg = $avg * 0.99 + $t * 0.01;
3337 }
3338 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3339 exit 0;
3340 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3341 }; 3800 };
3801 }
3342 3802
3343 $RUNTIME += $TICK;
3344 $NEXT_TICK += $TICK;
3345
3346 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3347 $NEXT_RUNTIME_WRITE = $NOW + 10;
3348 Coro::async_pool {
3349 write_runtime
3350 or warn "ERROR: unable to write runtime file: $!";
3351 };
3352 }
3353
3354# my $AFTER = Event::time;
3355# warn $AFTER - $NOW;#d#
3356
3357 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3803 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3358 $sig->send; 3804 $sig->send;
3359 } 3805 }
3360 while (my $sig = shift @WAIT_FOR_TICK) { 3806 while (my $sig = shift @WAIT_FOR_TICK) {
3361 $sig->send; 3807 $sig->send;
3362 } 3808 }
3363 3809
3364 $NOW = Event::time; 3810 $LOAD = ($NOW - $TICK_START) / $TICK;
3365
3366 # if we are delayed by four ticks or more, skip them all
3367 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3368
3369 $TICK_WATCHER->at ($NEXT_TICK);
3370 $TICK_WATCHER->start;
3371
3372 $LOAD = ($NOW - $tick_start) / $TICK;
3373 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3811 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3374 3812
3375 _post_tick; 3813 if (0) {
3376 3814 if ($NEXT_TICK) {
3377 3815 my $jitter = $TICK_START - $NEXT_TICK;
3816 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3817 warn "jitter $JITTER\n";#d#
3818 }
3378 }, 3819 }
3379); 3820}
3380 3821
3381{ 3822{
3382 BDB::max_poll_time $TICK * 0.1; 3823 # configure BDB
3383 $BDB_POLL_WATCHER = Event->io ( 3824
3384 reentrant => 0,
3385 fd => BDB::poll_fileno,
3386 poll => 'r',
3387 prio => 0,
3388 data => WF_AUTOCANCEL,
3389 cb => \&BDB::poll_cb,
3390 );
3391 BDB::min_parallel 8; 3825 BDB::min_parallel 8;
3392 3826 BDB::max_poll_reqs $TICK * 0.1;
3393 BDB::set_sync_prepare { 3827 $AnyEvent::BDB::WATCHER->priority (1);
3394 my $status;
3395 my $current = $Coro::current;
3396 (
3397 sub {
3398 $status = $!;
3399 $current->ready; undef $current;
3400 },
3401 sub {
3402 Coro::schedule while defined $current;
3403 $! = $status;
3404 },
3405 )
3406 };
3407 3828
3408 unless ($DB_ENV) { 3829 unless ($DB_ENV) {
3409 $DB_ENV = BDB::db_env_create; 3830 $DB_ENV = BDB::db_env_create;
3831 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3832 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3833 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3834 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3835 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3410 3836
3411 cf::sync_job { 3837 cf::sync_job {
3412 eval { 3838 eval {
3413 BDB::db_env_open 3839 BDB::db_env_open
3414 $DB_ENV, 3840 $DB_ENV,
3416 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3842 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3417 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3843 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3418 0666; 3844 0666;
3419 3845
3420 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3846 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3421
3422 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3423 $DB_ENV->set_lk_detect;
3424 }; 3847 };
3425 3848
3426 cf::cleanup "db_env_open(db): $@" if $@; 3849 cf::cleanup "db_env_open(db): $@" if $@;
3427 }; 3850 };
3428 } 3851 }
3852
3853 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3854 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3855 };
3856 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3857 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3858 };
3859 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3860 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3861 };
3429} 3862}
3430 3863
3431{ 3864{
3865 # configure IO::AIO
3866
3432 IO::AIO::min_parallel 8; 3867 IO::AIO::min_parallel 8;
3433
3434 undef $Coro::AIO::WATCHER;
3435 IO::AIO::max_poll_time $TICK * 0.1; 3868 IO::AIO::max_poll_time $TICK * 0.1;
3436 $AIO_POLL_WATCHER = Event->io ( 3869 undef $AnyEvent::AIO::WATCHER;
3437 reentrant => 0,
3438 data => WF_AUTOCANCEL,
3439 fd => IO::AIO::poll_fileno,
3440 poll => 'r',
3441 prio => 6,
3442 cb => \&IO::AIO::poll_cb,
3443 );
3444} 3870}
3445 3871
3446my $_log_backtrace; 3872my $_log_backtrace;
3447 3873
3448sub _log_backtrace { 3874sub _log_backtrace {
3452 3878
3453 # limit the # of concurrent backtraces 3879 # limit the # of concurrent backtraces
3454 if ($_log_backtrace < 2) { 3880 if ($_log_backtrace < 2) {
3455 ++$_log_backtrace; 3881 ++$_log_backtrace;
3456 async { 3882 async {
3883 $Coro::current->{desc} = "abt $msg";
3884
3457 my @bt = fork_call { 3885 my @bt = fork_call {
3458 @addr = map { sprintf "%x", $_ } @addr; 3886 @addr = map { sprintf "%x", $_ } @addr;
3459 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3887 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3460 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3888 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3461 or die "addr2line: $!"; 3889 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines