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.339 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.443 by root, Sun Aug 31 10:05:26 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
1194 1335
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1336 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1337 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197 1338
1198 $ext{source} = 1339 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n" 1340 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n" 1341 . "#line 1 \"$path\"\n{\n"
1201 . $source 1342 . $source
1202 . "\n};\n1"; 1343 . "\n};\n1";
1203 1344
1204 $todo{$base} = \%ext; 1345 $todo{$base} = \%ext;
1220 my $msg = $@ ? "$v->{path}: $@\n" 1361 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n"; 1362 : "$v->{base}: extension inactive.\n";
1222 1363
1223 if (exists $v->{meta}{mandatory}) { 1364 if (exists $v->{meta}{mandatory}) {
1224 warn $msg; 1365 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n"; 1366 cf::cleanup "mandatory extension failed to load, exiting.";
1226 exit 1;
1227 } 1367 }
1228 1368
1229 warn $msg; 1369 warn $msg;
1230 } 1370 }
1231 1371
1256use Coro::AIO; 1396use Coro::AIO;
1257 1397
1258=head3 cf::player 1398=head3 cf::player
1259 1399
1260=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}
1261 1415
1262=item cf::player::find $login 1416=item cf::player::find $login
1263 1417
1264Returns the given player object, loading it if necessary (might block). 1418Returns the given player object, loading it if necessary (might block).
1265 1419
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1455 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1456 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1457 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1458 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1459
1306 my $pl = load_pl path $login 1460 my $f = new_from_file cf::object::thawer path $login
1307 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;
1308 $cf::PLAYER{$login} = $pl 1468 $cf::PLAYER{$login} = $pl
1309 } 1469 }
1310 } 1470 }
1311} 1471}
1312 1472
1321 return if $pl->{deny_save}; 1481 return if $pl->{deny_save};
1322 1482
1323 aio_mkdir playerdir $pl, 0770; 1483 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1484 $pl->{last_save} = $cf::RUNTIME;
1325 1485
1486 cf::get_slot 0.01;
1487
1326 $pl->save_pl ($path); 1488 $pl->save_pl ($path);
1327 Coro::cede; 1489 cf::cede_to_tick;
1328} 1490}
1329 1491
1330sub new($) { 1492sub new($) {
1331 my ($login) = @_; 1493 my ($login) = @_;
1332 1494
1361 my ($pl) = @_; 1523 my ($pl) = @_;
1362 1524
1363 my $name = $pl->ob->name; 1525 my $name = $pl->ob->name;
1364 1526
1365 $pl->{deny_save} = 1; 1527 $pl->{deny_save} = 1;
1366 $pl->password ("*"); # this should lock out the player until we nuked the dir 1528 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1367 1529
1368 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1530 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1369 $pl->deactivate; 1531 $pl->deactivate;
1532 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1533 $pl->ob->check_score;
1370 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1534 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1371 $pl->ns->destroy if $pl->ns; 1535 $pl->ns->destroy if $pl->ns;
1372 1536
1373 my $path = playerdir $pl; 1537 my $path = playerdir $pl;
1374 my $temp = "$path~$cf::RUNTIME~deleting~"; 1538 my $temp = "$path~$cf::RUNTIME~deleting~";
1410 or return []; 1574 or return [];
1411 1575
1412 my @logins; 1576 my @logins;
1413 1577
1414 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") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1584 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1585 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1586 $buf !~ /^password -------------$/m or next; # official not-valid tag
1587 }
1418 1588
1419 utf8::decode $login; 1589 utf8::decode $login;
1420 push @logins, $login; 1590 push @logins, $login;
1421 } 1591 }
1422 1592
1456Expand crossfire pod fragments into protocol xml. 1626Expand crossfire pod fragments into protocol xml.
1457 1627
1458=cut 1628=cut
1459 1629
1460sub expand_cfpod { 1630sub expand_cfpod {
1461 ((my $self), (local $_)) = @_; 1631 my ($self, $pod) = @_;
1462 1632
1463 # escape & and < 1633 my @nest = [qr<\G$>, undef, ""];
1464 s/&/&amp;/g; 1634 my $xml;
1465 s/(?<![BIUGH])</&lt;/g;
1466 1635
1467 # this is buggy, it needs to properly take care of nested <'s 1636 for ($pod) {
1637 while () {
1638 if (/\G( (?: [^BCEGHITUZ&>\n\ ]+ | [BCEGHITUZ](?!<) | \ (?!>) )+ )/xgcs) {
1639 $xml .= $1;
1640 } elsif (/\G\n(?=\S)/xgcs) {
1641 $xml .= " ";
1642 } elsif (/\G\n/xgcs) {
1643 $xml .= "\n";
1644 } elsif (/\G ([BCEGHITUZ]) (< (?: <+\ | (?!<) ) )/xgcs) {
1645 my ($code, $delim) = ($1, scalar reverse $2);
1646 $delim =~ y/</>/; # delim now contains the stop sequence
1647 $delim = qr{\G\Q$delim};
1468 1648
1469 1 while 1649 my $cb;
1470 # replace B<>, I<>, U<> etc. 1650
1471 s/B<([^\>]*)>/<b>$1<\/b>/ 1651 if ($code eq "B") {
1472 || s/I<([^\>]*)>/<i>$1<\/i>/ 1652 $cb = sub { "<b>$_[0]</b>" };
1473 || s/U<([^\>]*)>/<u>$1<\/u>/ 1653 } elsif ($code eq "C") {
1474 # replace G<male|female> tags 1654 $cb = sub { "<tt>$_[0]</tt>" };
1475 || s{G<([^>|]*)\|([^>]*)>}{ 1655 } elsif ($code eq "E") {
1476 $self->gender ? $2 : $1 1656 $cb = sub { warn "E<$_[0]>\n";"&$_[0];" };
1477 }ge 1657 } elsif ($code eq "G") {
1478 # replace H<hint text> 1658 $cb = sub {
1479 || s{H<([^\>]*)>} 1659 my ($male, $female) = split /\|/, $_[0];
1480 { 1660 $self->gender ? $female : $male
1661 };
1662 } elsif ($code eq "H") {
1663 $cb = sub {
1664 (
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>", 1665 "<fg name=\"lightblue\">[$_[0] (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>", 1666 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "") 1667 "",
1484 [$self->{hintmode}] 1668 )[$self->{hintmode}];
1669 };
1670 } elsif ($code eq "I") {
1671 $cb = sub { "<i>$_[0]</i>" };
1672 } elsif ($code eq "T") {
1673 $cb = sub { "<big><b>$_[0]</b></big>" };
1674 } elsif ($code eq "U") {
1675 $cb = sub { "<u>$_[0]</u>" };
1676 } elsif ($code eq "Z") {
1677 $cb = sub { };
1678 } else {
1679 die "FATAL error in expand_cfpod";
1680 }
1681
1682 push @nest, [$delim, $cb, $xml];
1683 undef $xml;
1684
1685 } elsif ($_ =~ /$nest[-1][0]/gcs) {
1686 my $nest = pop @nest;
1687
1688 if ($nest->[1]) {
1689 $xml = $nest->[2] . $nest->[1]->($xml);
1690 } else {
1691 last;
1692 }
1693 } elsif (/\G</xgcs) {
1694 $xml .= "&lt;";
1695 } elsif (/\G&/xgcs) {
1696 $xml .= "&amp;";
1697 } elsif (/\G>/xgcs) {
1698 $xml .= ">";
1699 } else {
1700 if ($pod =~ /\G(.+)/xgcs) {
1701 warn "parse error (at $1)($nest[-1][0]) while expanding cfpod:\n$pod";
1702 last;
1703 } else {
1704 warn "parse error (unclosed interior sequence at end of cfpod) while expanding cfpod:\n$pod";
1705 return "<b>Sorry, the server encountered an internal error when formatting this message, please report this.</b>";
1706 }
1485 }ge; 1707 }
1708 }
1709 }
1486 1710
1487 # create single paragraphs (very hackish) 1711 $xml
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497} 1712}
1498 1713
1499sub hintmode { 1714sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1; 1715 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode} 1716 $_[0]{hintmode}
1574our $MAX_RESET = 3600; 1789our $MAX_RESET = 3600;
1575our $DEFAULT_RESET = 3000; 1790our $DEFAULT_RESET = 3000;
1576 1791
1577sub generate_random_map { 1792sub generate_random_map {
1578 my ($self, $rmp) = @_; 1793 my ($self, $rmp) = @_;
1794
1795 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1796
1579 # mit "rum" bekleckern, nicht 1797 # mit "rum" bekleckern, nicht
1580 $self->_create_random_map ( 1798 $self->_create_random_map (
1581 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1799 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1582 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1800 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1583 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1801 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1705 1923
1706# the temporary/swap location 1924# the temporary/swap location
1707sub save_path { 1925sub save_path {
1708 my ($self) = @_; 1926 my ($self) = @_;
1709 1927
1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1928 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1711 "$TMPDIR/$path.map" 1929 "$TMPDIR/$path.map"
1712} 1930}
1713 1931
1714# the unique path, undef == no special unique path 1932# the unique path, undef == no special unique path
1715sub uniq_path { 1933sub uniq_path {
1716 my ($self) = @_; 1934 my ($self) = @_;
1717 1935
1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1936 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1719 "$UNIQUEDIR/$path" 1937 "$UNIQUEDIR/$path"
1720} 1938}
1721 1939
1722# and all this just because we cannot iterate over 1940# and all this just because we cannot iterate over
1723# all maps in C++... 1941# all maps in C++...
1746 1964
1747sub load_header_from($) { 1965sub load_header_from($) {
1748 my ($self, $path) = @_; 1966 my ($self, $path) = @_;
1749 1967
1750 utf8::encode $path; 1968 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1969 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1970 or return;
1971
1972 $self->_load_header ($f)
1973 or return;
1974
1975 local $MAP_LOADING{$self->{path}} = $self;
1976 $f->resolve_delayed_derefs;
1756 1977
1757 $self->{load_path} = $path; 1978 $self->{load_path} = $path;
1758 1979
1759 1 1980 1
1760} 1981}
1814sub find { 2035sub find {
1815 my ($path, $origin) = @_; 2036 my ($path, $origin) = @_;
1816 2037
1817 $path = normalise $path, $origin && $origin->path; 2038 $path = normalise $path, $origin && $origin->path;
1818 2039
2040 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 2041 cf::lock_wait "map_find:$path";
1820 2042
1821 $cf::MAP{$path} || do { 2043 $cf::MAP{$path} || do {
2044 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1822 my $guard = cf::lock_acquire "map_find:$path"; 2045 my $guard2 = cf::lock_acquire "map_find:$path";
2046
1823 my $map = new_from_path cf::map $path 2047 my $map = new_from_path cf::map $path
1824 or return; 2048 or return;
1825 2049
1826 $map->{last_save} = $cf::RUNTIME; 2050 $map->{last_save} = $cf::RUNTIME;
1827 2051
1829 or return; 2053 or return;
1830 2054
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2055 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 2056 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 2057 #$cf::WAIT_FOR_TICK->wait;
2058 undef $guard2;
2059 undef $guard1;
1834 $map->reset; 2060 $map->reset;
1835 undef $guard;
1836 return find $path; 2061 return find $path;
1837 } 2062 }
1838 2063
1839 $cf::MAP{$path} = $map 2064 $cf::MAP{$path} = $map
1840 } 2065 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2074 local $self->{deny_reset} = 1; # loading can take a long time
1850 2075
1851 my $path = $self->{path}; 2076 my $path = $self->{path};
1852 2077
1853 { 2078 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2079 my $guard = cf::lock_acquire "map_data:$path";
1855 2080
2081 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2082 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2083
1858 $self->in_memory (cf::MAP_LOADING); 2084 $self->in_memory (cf::MAP_LOADING);
1859 2085
1860 $self->alloc; 2086 $self->alloc;
1861 2087
1862 $self->pre_load; 2088 $self->pre_load;
1863 Coro::cede; 2089 cf::cede_to_tick;
1864 2090
2091 my $f = new_from_file cf::object::thawer $self->{load_path};
2092 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2093 $self->_load_objects ($f)
1866 or return; 2094 or return;
1867 2095
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2096 $self->post_load_original
1869 if delete $self->{load_original}; 2097 if delete $self->{load_original};
1870 2098
1871 if (my $uniq = $self->uniq_path) { 2099 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2100 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2101 unless (aio_stat $uniq) {
2102 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2103 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2104 $self->_load_objects ($f);
2105 $f->resolve_delayed_derefs;
2106 }
1876 } 2107 }
1877 } 2108 }
1878 2109
1879 Coro::cede; 2110 $f->resolve_delayed_derefs;
2111
2112 cf::cede_to_tick;
1880 # now do the right thing for maps 2113 # now do the right thing for maps
1881 $self->link_multipart_objects; 2114 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2115 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2116 unless $self->difficulty;
1884 Coro::cede; 2117 cf::cede_to_tick;
1885 2118
1886 unless ($self->{deny_activate}) { 2119 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2120 $self->decay_objects;
1888 $self->fix_auto_apply; 2121 $self->fix_auto_apply;
1889 $self->update_buttons; 2122 $self->update_buttons;
1890 Coro::cede; 2123 cf::cede_to_tick;
1891 $self->set_darkness_map; 2124 $self->set_darkness_map;
1892 Coro::cede; 2125 cf::cede_to_tick;
1893 $self->activate; 2126 $self->activate;
1894 } 2127 }
1895 2128
1896 $self->{last_save} = $cf::RUNTIME; 2129 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2130 $self->last_access ($cf::RUNTIME);
1898 2131
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2132 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2133 }
1901 2134
1902 $self->post_load; 2135 $self->post_load;
1903} 2136}
1904 2137
1948 2181
1949sub do_load_sync { 2182sub do_load_sync {
1950 my ($map) = @_; 2183 my ($map) = @_;
1951 2184
1952 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync" 2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
1953 if $Coro::current != $Coro::main; 2186 if $Coro::current == $Coro::main;
1954 2187
1955 cf::sync_job { $map->load }; 2188 cf::sync_job { $map->load };
1956} 2189}
1957 2190
1958our %MAP_PREFETCH; 2191our %MAP_PREFETCH;
1962 my ($path, $origin, $load) = @_; 2195 my ($path, $origin, $load) = @_;
1963 2196
1964 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1965 2198
1966 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1967 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2201 }
1969 2202
1970 $MAP_PREFETCH{$path} |= $load; 2203 $MAP_PREFETCH{$path} |= $load;
1971 2204
1972 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1973 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2210 if (my $map = find $k) {
1976 $map->load if $v; 2211 $map->load if $v;
1977 } 2212 }
1987} 2222}
1988 2223
1989sub save { 2224sub save {
1990 my ($self) = @_; 2225 my ($self) = @_;
1991 2226
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2227 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2228
1994 $self->{last_save} = $cf::RUNTIME; 2229 $self->{last_save} = $cf::RUNTIME;
1995 2230
1996 return unless $self->dirty; 2231 return unless $self->dirty;
1997 2232
2003 return if $self->{deny_save}; 2238 return if $self->{deny_save};
2004 2239
2005 local $self->{last_access} = $self->last_access;#d# 2240 local $self->{last_access} = $self->last_access;#d#
2006 2241
2007 cf::async { 2242 cf::async {
2243 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2244 $_->contr->save for $self->players;
2009 }; 2245 };
2246
2247 cf::get_slot 0.02;
2010 2248
2011 if ($uniq) { 2249 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2250 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2251 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2014 } else { 2252 } else {
2020 my ($self) = @_; 2258 my ($self) = @_;
2021 2259
2022 # save first because save cedes 2260 # save first because save cedes
2023 $self->save; 2261 $self->save;
2024 2262
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2264
2027 return if $self->players; 2265 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2266 return if $self->in_memory != cf::MAP_ACTIVE;
2029 return if $self->{deny_save}; 2267 return if $self->{deny_save};
2030 2268
2269 $self->in_memory (cf::MAP_SWAPPED);
2270
2271 $self->deactivate;
2272 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2273 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2274}
2034 2275
2035sub reset_at { 2276sub reset_at {
2036 my ($self) = @_; 2277 my ($self) = @_;
2037 2278
2069 if $uniq; 2310 if $uniq;
2070 } 2311 }
2071 2312
2072 delete $cf::MAP{$self->path}; 2313 delete $cf::MAP{$self->path};
2073 2314
2315 $self->deactivate;
2316 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2317 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2318
2078 $self->unlink_save; 2319 $self->unlink_save;
2079 $self->destroy; 2320 $self->destroy;
2080} 2321}
2081 2322
2082my $nuke_counter = "aaaa"; 2323my $nuke_counter = "aaaa";
2083 2324
2084sub nuke { 2325sub nuke {
2085 my ($self) = @_; 2326 my ($self) = @_;
2086 2327
2328 {
2329 my $lock = cf::lock_acquire "map_data:$self->{path}";
2330
2087 delete $cf::MAP{$self->path}; 2331 delete $cf::MAP{$self->path};
2088 2332
2089 $self->unlink_save; 2333 $self->unlink_save;
2090 2334
2091 bless $self, "cf::map"; 2335 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2336 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2337 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2338 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2339 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2340
2097 $cf::MAP{$self->path} = $self; 2341 $cf::MAP{$self->path} = $self;
2342 }
2098 2343
2099 $self->reset; # polite request, might not happen 2344 $self->reset; # polite request, might not happen
2100} 2345}
2101 2346
2102=item $maps = cf::map::tmp_maps 2347=item $maps = cf::map::tmp_maps
2144 2389
2145sub unique_maps() { 2390sub unique_maps() {
2146 [ 2391 [
2147 map { 2392 map {
2148 utf8::decode $_; 2393 utf8::decode $_;
2149 /\.map$/ 2394 s/\.map$//; # TODO future compatibility hack
2395 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2396 ? ()
2150 ? normalise $_ 2397 : normalise $_
2151 : ()
2152 } @{ aio_readdir $UNIQUEDIR or [] } 2398 } @{ aio_readdir $UNIQUEDIR or [] }
2153 ] 2399 ]
2154} 2400}
2155 2401
2156package cf;
2157
2158=back 2402=back
2159 2403
2160=head3 cf::object 2404=head3 cf::object
2161 2405
2162=cut 2406=cut
2165 2409
2166=over 4 2410=over 4
2167 2411
2168=item $ob->inv_recursive 2412=item $ob->inv_recursive
2169 2413
2170Returns the inventory of the object _and_ their inventories, recursively. 2414Returns the inventory of the object I<and> their inventories, recursively,
2415but I<not> the object itself.
2171 2416
2172=cut 2417=cut
2173 2418
2174sub inv_recursive_; 2419sub inv_recursive_;
2175sub inv_recursive_ { 2420sub inv_recursive_ {
2178 2423
2179sub inv_recursive { 2424sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2425 inv_recursive_ inv $_[0]
2181} 2426}
2182 2427
2428=item $ref = $ob->ref
2429
2430Creates and returns a persistent reference to an object that can be stored as a string.
2431
2432=item $ob = cf::object::deref ($refstring)
2433
2434returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2435even if the object actually exists. May block.
2436
2437=cut
2438
2439sub deref {
2440 my ($ref) = @_;
2441
2442 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2443 my ($uuid, $name) = ($1, $2);
2444 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2445 or return;
2446 $pl->ob->uuid eq $uuid
2447 or return;
2448
2449 $pl->ob
2450 } else {
2451 warn "$ref: cannot resolve object reference\n";
2452 undef
2453 }
2454}
2455
2183package cf; 2456package cf;
2184 2457
2185=back 2458=back
2186 2459
2187=head3 cf::object::player 2460=head3 cf::object::player
2193Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2466Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2194can be C<undef>. Does the right thing when the player is currently in a 2467can be C<undef>. Does the right thing when the player is currently in a
2195dialogue with the given NPC character. 2468dialogue with the given NPC character.
2196 2469
2197=cut 2470=cut
2471
2472our $SAY_CHANNEL = {
2473 id => "say",
2474 title => "Map",
2475 reply => "say ",
2476 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2477};
2478
2479our $CHAT_CHANNEL = {
2480 id => "chat",
2481 title => "Chat",
2482 reply => "chat ",
2483 tooltip => "Player chat and shouts, global to the server.",
2484};
2198 2485
2199# rough implementation of a future "reply" method that works 2486# rough implementation of a future "reply" method that works
2200# with dialog boxes. 2487# with dialog boxes.
2201#TODO: the first argument must go, split into a $npc->reply_to ( method 2488#TODO: the first argument must go, split into a $npc->reply_to ( method
2202sub cf::object::player::reply($$$;$) { 2489sub cf::object::player::reply($$$;$) {
2214 my $dialog = $pl->{npc_dialog}; 2501 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2502 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216 2503
2217 } else { 2504 } else {
2218 $msg = $npc->name . " says: $msg" if $npc; 2505 $msg = $npc->name . " says: $msg" if $npc;
2219 $self->message ($msg, $flags); 2506 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2220 } 2507 }
2221 } 2508 }
2222} 2509}
2223 2510
2224=item $object->send_msg ($channel, $msg, $color, [extra...]) 2511=item $object->send_msg ($channel, $msg, $color, [extra...])
2332her, loading and preparing them map, calling the provided $check callback 2619her, loading and preparing them map, calling the provided $check callback
2333that has to return the map if sucecssful, and then unfreezes the player on 2620that has to return the map if sucecssful, and then unfreezes the player on
2334the new (success) or old (failed) map position. In either case, $done will 2621the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process. 2622be called at the end of this process.
2336 2623
2624Note that $check will be called with a potentially non-loaded map, so if
2625it needs a loaded map it has to call C<< ->load >>.
2626
2337=cut 2627=cut
2338 2628
2339our $GOTOGEN; 2629our $GOTOGEN;
2340 2630
2341sub cf::object::player::goto { 2631sub cf::object::player::goto {
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2635 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2636
2347 $self->enter_link; 2637 $self->enter_link;
2348 2638
2349 (async { 2639 (async {
2640 $Coro::current->{desc} = "player::goto $path $x $y";
2641
2642 # *tag paths override both path and x|y
2643 if ($path =~ /^\*(.*)$/) {
2644 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2645 my $ob = $obs[rand @obs];
2646
2647 # see if we actually can go there
2648 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2649 $ob = $obs[rand @obs];
2650 } else {
2651 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2652 }
2653 # else put us there anyways for now #d#
2654
2655 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2656 } else {
2657 ($path, $x, $y) = (undef, undef, undef);
2658 }
2659 }
2660
2350 my $map = eval { 2661 my $map = eval {
2351 my $map = cf::map::find $path; 2662 my $map = defined $path ? cf::map::find $path : undef;
2352 2663
2353 if ($map) { 2664 if ($map) {
2354 $map = $map->customise_for ($self); 2665 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2666 $map = $check->($map) if $check && $map;
2356 } else { 2667 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2668 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2669 }
2359 2670
2360 $map 2671 $map
2361 }; 2672 };
2362 2673
2398} 2709}
2399 2710
2400sub prepare_random_map { 2711sub prepare_random_map {
2401 my ($exit) = @_; 2712 my ($exit) = @_;
2402 2713
2403 my $guard = cf::lock_acquire "exit_prepare:$exit";
2404
2405 # all this does is basically replace the /! path by 2714 # all this does is basically replace the /! path by
2406 # a new random map path (?random/...) with a seed 2715 # a new random map path (?random/...) with a seed
2407 # that depends on the exit object 2716 # that depends on the exit object
2408 2717
2409 my $rmp = parse_random_map_params $exit->msg; 2718 my $rmp = parse_random_map_params $exit->msg;
2411 if ($exit->map) { 2720 if ($exit->map) {
2412 $rmp->{region} = $exit->region->name; 2721 $rmp->{region} = $exit->region->name;
2413 $rmp->{origin_map} = $exit->map->path; 2722 $rmp->{origin_map} = $exit->map->path;
2414 $rmp->{origin_x} = $exit->x; 2723 $rmp->{origin_x} = $exit->x;
2415 $rmp->{origin_y} = $exit->y; 2724 $rmp->{origin_y} = $exit->y;
2725
2726 $exit->map->touch;
2416 } 2727 }
2417 2728
2418 $rmp->{random_seed} ||= $exit->random_seed; 2729 $rmp->{random_seed} ||= $exit->random_seed;
2419 2730
2420 my $data = cf::to_json $rmp; 2731 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2421 my $md5 = Digest::MD5::md5_hex $data; 2732 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2733 my $meta = "$RANDOMDIR/$md5.meta";
2423 2734
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2735 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2736 aio_write $fh, 0, (length $data), $data, 0;
2426 undef $fh; 2737 undef $fh;
2427 aio_rename "$meta~", $meta; 2738 aio_rename "$meta~", $meta;
2428 2739
2740 my $slaying = "?random/$md5";
2741
2742 if ($exit->valid) {
2429 $exit->slaying ("?random/$md5"); 2743 $exit->slaying ("?random/$md5");
2430 $exit->msg (undef); 2744 $exit->msg (undef);
2745 }
2431 } 2746 }
2432} 2747}
2433 2748
2434sub cf::object::player::enter_exit { 2749sub cf::object::player::enter_exit {
2435 my ($self, $exit) = @_; 2750 my ($self, $exit) = @_;
2436 2751
2437 return unless $self->type == cf::PLAYER; 2752 return unless $self->type == cf::PLAYER;
2438 2753
2439 if ($exit->slaying eq "/!") {
2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
2443 cf::sync_job { prepare_random_map $exit };
2444 }
2445
2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2447 my $hp = $exit->stats->hp;
2448 my $sp = $exit->stats->sp;
2449
2450 $self->enter_link; 2754 $self->enter_link;
2451 2755
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2456 (async { 2756 (async {
2457 $self->deactivate_recursive; # just to be sure 2757 $Coro::current->{desc} = "enter_exit";
2758
2458 unless (eval { 2759 unless (eval {
2760 $self->deactivate_recursive; # just to be sure
2761
2762 # random map handling
2763 {
2764 my $guard = cf::lock_acquire "exit_prepare:$exit";
2765
2766 prepare_random_map $exit
2767 if $exit->slaying eq "/!";
2768 }
2769
2770 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2771 my $x = $exit->stats->hp;
2772 my $y = $exit->stats->sp;
2773
2459 $self->goto ($slaying, $hp, $sp); 2774 $self->goto ($map, $x, $y);
2460 2775
2776 # if exit is damned, update players death & WoR home-position
2777 $self->contr->savebed ($map, $x, $y)
2778 if $exit->flag (cf::FLAG_DAMNED);
2779
2461 1; 2780 1
2462 }) { 2781 }) {
2463 $self->message ("Something went wrong deep within the crossfire server. " 2782 $self->message ("Something went wrong deep within the crossfire server. "
2464 . "I'll try to bring you back to the map you were before. " 2783 . "I'll try to bring you back to the map you were before. "
2465 . "Please report this to the dungeon master!", 2784 . "Please report this to the dungeon master!",
2466 cf::NDI_UNIQUE | cf::NDI_RED); 2785 cf::NDI_UNIQUE | cf::NDI_RED);
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2815the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2816the message unless the client supports the msg packet.
2498 2817
2499=cut 2818=cut
2500 2819
2820# non-persistent channels (usually the info channel)
2821our %CHANNEL = (
2822 "c/identify" => {
2823 id => "infobox",
2824 title => "Identify",
2825 reply => undef,
2826 tooltip => "Items recently identified",
2827 },
2828 "c/examine" => {
2829 id => "infobox",
2830 title => "Examine",
2831 reply => undef,
2832 tooltip => "Signs and other items you examined",
2833 },
2834 "c/book" => {
2835 id => "infobox",
2836 title => "Book",
2837 reply => undef,
2838 tooltip => "The contents of a note or book",
2839 },
2840 "c/lookat" => {
2841 id => "infobox",
2842 title => "Look",
2843 reply => undef,
2844 tooltip => "What you saw there",
2845 },
2846 "c/who" => {
2847 id => "infobox",
2848 title => "Players",
2849 reply => undef,
2850 tooltip => "Shows players who are currently online",
2851 },
2852 "c/body" => {
2853 id => "infobox",
2854 title => "Body Parts",
2855 reply => undef,
2856 tooltip => "Shows which body parts you posess and are available",
2857 },
2858 "c/uptime" => {
2859 id => "infobox",
2860 title => "Uptime",
2861 reply => undef,
2862 tooltip => "How long the server has been running since last restart",
2863 },
2864 "c/mapinfo" => {
2865 id => "infobox",
2866 title => "Map Info",
2867 reply => undef,
2868 tooltip => "Information related to the maps",
2869 },
2870 "c/party" => {
2871 id => "party",
2872 title => "Party",
2873 reply => "gsay ",
2874 tooltip => "Messages and chat related to your party",
2875 },
2876);
2877
2501sub cf::client::send_msg { 2878sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2879 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2880
2504 $msg = $self->pl->expand_cfpod ($msg); 2881 $msg = $self->pl->expand_cfpod ($msg);
2505 2882
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2883 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2884
2885 # check predefined channels, for the benefit of C
2886 if ($CHANNEL{$channel}) {
2887 $channel = $CHANNEL{$channel};
2888
2889 $self->ext_msg (channel_info => $channel)
2890 if $self->can_msg;
2891
2892 $channel = $channel->{id};
2893
2508 if (ref $channel) { 2894 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2895 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2896 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2897 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2898 $self->ext_msg (channel_info => $channel)
2899 if $self->can_msg;
2513 } 2900 }
2514 2901
2515 $channel = $channel->{id}; 2902 $channel = $channel->{id};
2516 } 2903 }
2517 2904
2520 if ($self->can_msg) { 2907 if ($self->can_msg) {
2521 # default colour, mask it out 2908 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2909 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF; 2910 if $color & cf::NDI_DEF;
2524 2911
2525 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2912 my $pkt = "msg "
2913 . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2914 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2915 );
2916
2917 # try lzf for large packets
2918 $pkt = "lzf " . Compress::LZF::compress $pkt
2919 if 1024 <= length $pkt and $self->{can_lzf};
2920
2921 # split very large packets
2922 if (8192 < length $pkt and $self->{can_lzf}) {
2923 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2924 $pkt = "frag";
2925 }
2926
2927 $self->send_packet ($pkt);
2527 } else { 2928 } else {
2528 if ($color >= 0) { 2929 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones 2930 # replace some tags by gcfclient-compatible ones
2530 for ($msg) { 2931 for ($msg) {
2531 1 while 2932 1 while
2558=cut 2959=cut
2559 2960
2560sub cf::client::ext_msg($$@) { 2961sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2962 my ($self, $type, @msg) = @_;
2562 2963
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2964 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2965 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2966 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2967 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2968 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2969 }
2571} 2970}
2572 2971
2579sub cf::client::ext_reply($$@) { 2978sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2979 my ($self, $id, @msg) = @_;
2581 2980
2582 if ($self->extcmd == 2) { 2981 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2982 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2983 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2984 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2985 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2986 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2987 }
2589} 2988}
2731=pod 3130=pod
2732 3131
2733The following functions and methods are available within a safe environment: 3132The following functions and methods are available within a safe environment:
2734 3133
2735 cf::object 3134 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3135 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race 3136 insert remove name archname title slaying race decrease split
2738 3137
2739 cf::object::player 3138 cf::object::player
2740 player 3139 player
2741 3140
2742 cf::player 3141 cf::player
2747 3146
2748=cut 3147=cut
2749 3148
2750for ( 3149for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3150 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race)], 3151 insert remove inv nrof name archname title slaying race
3152 decrease split destroy change_exp)],
2753 ["cf::object::player" => qw(player)], 3153 ["cf::object::player" => qw(player)],
2754 ["cf::player" => qw(peaceful)], 3154 ["cf::player" => qw(peaceful)],
2755 ["cf::map" => qw(trigger)], 3155 ["cf::map" => qw(trigger)],
2756) { 3156) {
2757 no strict 'refs'; 3157 no strict 'refs';
2833# the server's init and main functions 3233# the server's init and main functions
2834 3234
2835sub load_facedata($) { 3235sub load_facedata($) {
2836 my ($path) = @_; 3236 my ($path) = @_;
2837 3237
3238 # HACK to clear player env face cache, we need some signal framework
3239 # for this (global event?)
3240 %ext::player_env::MUSIC_FACE_CACHE = ();
3241
2838 my $enc = JSON::XS->new->utf8->canonical; 3242 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2839 3243
2840 warn "loading facedata from $path\n"; 3244 warn "loading facedata from $path\n";
2841 3245
2842 my $facedata; 3246 my $facedata;
2843 0 < aio_load $path, $facedata 3247 0 < aio_load $path, $facedata
2858 { 3262 {
2859 my $faces = $facedata->{faceinfo}; 3263 my $faces = $facedata->{faceinfo};
2860 3264
2861 while (my ($face, $info) = each %$faces) { 3265 while (my ($face, $info) = each %$faces) {
2862 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3266 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3267
2863 cf::face::set_visibility $idx, $info->{visibility}; 3268 cf::face::set_visibility $idx, $info->{visibility};
2864 cf::face::set_magicmap $idx, $info->{magicmap}; 3269 cf::face::set_magicmap $idx, $info->{magicmap};
2865 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3270 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2866 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3271 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2867 3272
2868 cf::cede_to_tick; 3273 cf::cede_to_tick;
2869 } 3274 }
2870 3275
2871 while (my ($face, $info) = each %$faces) { 3276 while (my ($face, $info) = each %$faces) {
2872 next unless $info->{smooth}; 3277 next unless $info->{smooth};
3278
2873 my $idx = cf::face::find $face 3279 my $idx = cf::face::find $face
2874 or next; 3280 or next;
3281
2875 if (my $smooth = cf::face::find $info->{smooth}) { 3282 if (my $smooth = cf::face::find $info->{smooth}) {
2876 cf::face::set_smooth $idx, $smooth; 3283 cf::face::set_smooth $idx, $smooth;
2877 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3284 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2878 } else { 3285 } else {
2879 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3286 warn "smooth face '$info->{smooth}' not found for face '$face'";
2897 { 3304 {
2898 # TODO: for gcfclient pleasure, we should give resources 3305 # TODO: for gcfclient pleasure, we should give resources
2899 # that gcfclient doesn't grok a >10000 face index. 3306 # that gcfclient doesn't grok a >10000 face index.
2900 my $res = $facedata->{resource}; 3307 my $res = $facedata->{resource};
2901 3308
2902 my $soundconf = delete $res->{"res/sound.conf"};
2903
2904 while (my ($name, $info) = each %$res) { 3309 while (my ($name, $info) = each %$res) {
3310 if (defined $info->{type}) {
2905 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3311 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2906 my $data; 3312 my $data;
2907 3313
2908 if ($info->{type} & 1) { 3314 if ($info->{type} & 1) {
2909 # prepend meta info 3315 # prepend meta info
2910 3316
2911 my $meta = $enc->encode ({ 3317 my $meta = $enc->encode ({
2912 name => $name, 3318 name => $name,
2913 %{ $info->{meta} || {} }, 3319 %{ $info->{meta} || {} },
2914 }); 3320 });
2915 3321
2916 $data = pack "(w/a*)*", $meta, $info->{data}; 3322 $data = pack "(w/a*)*", $meta, $info->{data};
3323 } else {
3324 $data = $info->{data};
3325 }
3326
3327 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3328 cf::face::set_type $idx, $info->{type};
2917 } else { 3329 } else {
2918 $data = $info->{data}; 3330 $RESOURCE{$name} = $info;
2919 } 3331 }
2920 3332
2921 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2922 cf::face::set_type $idx, $info->{type};
2923
2924 cf::cede_to_tick; 3333 cf::cede_to_tick;
2925 } 3334 }
2926
2927 if ($soundconf) {
2928 $soundconf = $enc->decode (delete $soundconf->{data});
2929
2930 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2931 my $sound = $soundconf->{compat}[$_]
2932 or next;
2933
2934 my $face = cf::face::find "sound/$sound->[1]";
2935 cf::sound::set $sound->[0] => $face;
2936 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2937 }
2938
2939 while (my ($k, $v) = each %{$soundconf->{event}}) {
2940 my $face = cf::face::find "sound/$v";
2941 cf::sound::set $k => $face;
2942 }
2943 }
2944 } 3335 }
3336
3337 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2945 3338
2946 1 3339 1
2947} 3340}
3341
3342cf::global->attach (on_resource_update => sub {
3343 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3344 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3345
3346 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3347 my $sound = $soundconf->{compat}[$_]
3348 or next;
3349
3350 my $face = cf::face::find "sound/$sound->[1]";
3351 cf::sound::set $sound->[0] => $face;
3352 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3353 }
3354
3355 while (my ($k, $v) = each %{$soundconf->{event}}) {
3356 my $face = cf::face::find "sound/$v";
3357 cf::sound::set $k => $face;
3358 }
3359 }
3360});
2948 3361
2949register_exticmd fx_want => sub { 3362register_exticmd fx_want => sub {
2950 my ($ns, $want) = @_; 3363 my ($ns, $want) = @_;
2951 3364
2952 while (my ($k, $v) = each %$want) { 3365 while (my ($k, $v) = each %$want) {
2953 $ns->fx_want ($k, $v); 3366 $ns->fx_want ($k, $v);
2954 } 3367 }
2955}; 3368};
2956 3369
3370sub load_resource_file($) {
3371 my $guard = lock_acquire "load_resource_file";
3372
3373 my $status = load_resource_file_ $_[0];
3374 get_slot 0.1, 100;
3375 cf::arch::commit_load;
3376
3377 $status
3378}
3379
2957sub reload_regions { 3380sub reload_regions {
3381 # HACK to clear player env face cache, we need some signal framework
3382 # for this (global event?)
3383 %ext::player_env::MUSIC_FACE_CACHE = ();
3384
2958 load_resource_file "$MAPDIR/regions" 3385 load_resource_file "$MAPDIR/regions"
2959 or die "unable to load regions file\n"; 3386 or die "unable to load regions file\n";
2960 3387
2961 for (cf::region::list) { 3388 for (cf::region::list) {
2962 $_->{match} = qr/$_->{match}/ 3389 $_->{match} = qr/$_->{match}/
2970} 3397}
2971 3398
2972sub reload_archetypes { 3399sub reload_archetypes {
2973 load_resource_file "$DATADIR/archetypes" 3400 load_resource_file "$DATADIR/archetypes"
2974 or die "unable to load archetypes\n"; 3401 or die "unable to load archetypes\n";
2975 #d# NEED to laod twice to resolve forward references
2976 # this really needs to be done in an extra post-pass
2977 # (which needs to be synchronous, so solve it differently)
2978 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n";
2980} 3402}
2981 3403
2982sub reload_treasures { 3404sub reload_treasures {
2983 load_resource_file "$DATADIR/treasures" 3405 load_resource_file "$DATADIR/treasures"
2984 or die "unable to load treasurelists\n"; 3406 or die "unable to load treasurelists\n";
2985} 3407}
2986 3408
2987sub reload_resources { 3409sub reload_resources {
2988 warn "reloading resource files...\n"; 3410 warn "reloading resource files...\n";
2989 3411
3412 reload_facedata;
3413 reload_archetypes;
2990 reload_regions; 3414 reload_regions;
2991 reload_facedata;
2992 #reload_archetypes;#d#
2993 reload_archetypes;
2994 reload_treasures; 3415 reload_treasures;
2995 3416
2996 warn "finished reloading resource files\n"; 3417 warn "finished reloading resource files\n";
2997} 3418}
2998 3419
2999sub init { 3420sub init {
3421 my $guard = freeze_mainloop;
3422
3423 evthread_start IO::AIO::poll_fileno;
3424
3000 reload_resources; 3425 reload_resources;
3001} 3426}
3002 3427
3003sub cfg_load { 3428sub reload_config {
3004 open my $fh, "<:utf8", "$CONFDIR/config" 3429 open my $fh, "<:utf8", "$CONFDIR/config"
3005 or return; 3430 or return;
3006 3431
3007 local $/; 3432 local $/;
3008 *CFG = YAML::Syck::Load <$fh>; 3433 *CFG = YAML::Load <$fh>;
3009 3434
3010 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3435 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3011 3436
3012 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3437 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3013 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3438 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3024sub main { 3449sub main {
3025 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3026 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3027 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3028 (async { 3453 (async {
3029 Event::one_event; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3455 EV::loop EV::LOOP_ONESHOT;
3030 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3031 }; 3457 };
3032 3458
3033 cfg_load; 3459 {
3460 my $guard = freeze_mainloop;
3461 reload_config;
3034 db_init; 3462 db_init;
3035 load_extensions; 3463 load_extensions;
3036 3464
3037 $TICK_WATCHER->start; 3465 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3466 }
3467
3038 Event::loop; 3468 EV::loop;
3039} 3469}
3040 3470
3041############################################################################# 3471#############################################################################
3042# initialisation and cleanup 3472# initialisation and cleanup
3043 3473
3044# install some emergency cleanup handlers 3474# install some emergency cleanup handlers
3045BEGIN { 3475BEGIN {
3476 our %SIGWATCHER = ();
3046 for my $signal (qw(INT HUP TERM)) { 3477 for my $signal (qw(INT HUP TERM)) {
3047 Event->signal ( 3478 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3048 reentrant => 0,
3049 data => WF_AUTOCANCEL,
3050 signal => $signal,
3051 prio => 0,
3052 cb => sub {
3053 cf::cleanup "SIG$signal"; 3479 cf::cleanup "SIG$signal";
3054 },
3055 ); 3480 };
3056 } 3481 }
3057} 3482}
3058 3483
3059sub write_runtime { 3484sub write_runtime_sync {
3060 my $runtime = "$LOCALDIR/runtime"; 3485 my $runtime = "$LOCALDIR/runtime";
3061 3486
3062 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3063 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3064 3489
3090 and return; 3515 and return;
3091 3516
3092 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3093 3518
3094 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3537 $uuid_skip = 0;
3538
3539 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3540 and return;
3541
3542 # always fsync - this file is important
3543 aio_fsync $fh
3544 and return;
3545
3546 close $fh
3547 or return;
3548
3549 aio_rename "$uuid~", $uuid
3550 and return;
3551
3552 warn "uuid file written ($value).\n";
3553
3554 1
3555
3556}
3557
3558sub write_uuid($$) {
3559 my ($skip, $sync) = @_;
3560
3561 $sync ? write_uuid_sync $skip
3562 : async { write_uuid_sync $skip };
3095} 3563}
3096 3564
3097sub emergency_save() { 3565sub emergency_save() {
3098 my $freeze_guard = cf::freeze_mainloop; 3566 my $freeze_guard = cf::freeze_mainloop;
3099 3567
3105 # and maps saved/destroyed asynchronously. 3573 # and maps saved/destroyed asynchronously.
3106 warn "begin emergency player save\n"; 3574 warn "begin emergency player save\n";
3107 for my $login (keys %cf::PLAYER) { 3575 for my $login (keys %cf::PLAYER) {
3108 my $pl = $cf::PLAYER{$login} or next; 3576 my $pl = $cf::PLAYER{$login} or next;
3109 $pl->valid or next; 3577 $pl->valid or next;
3578 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3110 $pl->save; 3579 $pl->save;
3111 } 3580 }
3112 warn "end emergency player save\n"; 3581 warn "end emergency player save\n";
3113 3582
3114 warn "begin emergency map save\n"; 3583 warn "begin emergency map save\n";
3120 warn "end emergency map save\n"; 3589 warn "end emergency map save\n";
3121 3590
3122 warn "begin emergency database checkpoint\n"; 3591 warn "begin emergency database checkpoint\n";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3592 BDB::db_env_txn_checkpoint $DB_ENV;
3124 warn "end emergency database checkpoint\n"; 3593 warn "end emergency database checkpoint\n";
3594
3595 warn "begin write uuid\n";
3596 write_uuid_sync 1;
3597 warn "end write uuid\n";
3125 }; 3598 };
3126 3599
3127 warn "leave emergency perl save\n"; 3600 warn "leave emergency perl save\n";
3128} 3601}
3129 3602
3131 my ($make_core) = @_; 3604 my ($make_core) = @_;
3132 3605
3133 warn Carp::longmess "post_cleanup backtrace" 3606 warn Carp::longmess "post_cleanup backtrace"
3134 if $make_core; 3607 if $make_core;
3135} 3608}
3609
3610# a safer delete_package, copied from Symbol
3611sub clear_package($) {
3612 my $pkg = shift;
3613
3614 # expand to full symbol table name if needed
3615 unless ($pkg =~ /^main::.*::$/) {
3616 $pkg = "main$pkg" if $pkg =~ /^::/;
3617 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3618 $pkg .= '::' unless $pkg =~ /::$/;
3619 }
3620
3621 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3622 my $stem_symtab = *{$stem}{HASH};
3623
3624 defined $stem_symtab and exists $stem_symtab->{$leaf}
3625 or return;
3626
3627 # clear all symbols
3628 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3629 for my $name (keys %$leaf_symtab) {
3630 _gv_clear *{"$pkg$name"};
3631# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3632 }
3633 warn "cleared package #$pkg\n";#d#
3634}
3635
3636our $RELOAD; # how many times to reload
3136 3637
3137sub do_reload_perl() { 3638sub do_reload_perl() {
3138 # can/must only be called in main 3639 # can/must only be called in main
3139 if ($Coro::current != $Coro::main) { 3640 if ($Coro::current != $Coro::main) {
3140 warn "can only reload from main coroutine"; 3641 warn "can only reload from main coroutine";
3141 return; 3642 return;
3142 } 3643 }
3143 3644
3645 return if $RELOAD++;
3646
3647 while ($RELOAD) {
3144 warn "reloading..."; 3648 warn "reloading...";
3145 3649
3146 warn "entering sync_job"; 3650 warn "entering sync_job";
3147 3651
3148 cf::sync_job { 3652 cf::sync_job {
3149 cf::write_runtime; # external watchdog should not bark 3653 cf::write_runtime_sync; # external watchdog should not bark
3150 cf::emergency_save; 3654 cf::emergency_save;
3151 cf::write_runtime; # external watchdog should not bark 3655 cf::write_runtime_sync; # external watchdog should not bark
3152 3656
3153 warn "syncing database to disk"; 3657 warn "syncing database to disk";
3154 BDB::db_env_txn_checkpoint $DB_ENV; 3658 BDB::db_env_txn_checkpoint $DB_ENV;
3155 3659
3156 # if anything goes wrong in here, we should simply crash as we already saved 3660 # if anything goes wrong in here, we should simply crash as we already saved
3157 3661
3158 warn "cancelling all WF_AUTOCANCEL watchers";
3159 for (Event::all_watchers) {
3160 $_->cancel if $_->data & WF_AUTOCANCEL;
3161 }
3162
3163 warn "flushing outstanding aio requests"; 3662 warn "flushing outstanding aio requests";
3164 for (;;) {
3165 BDB::flush;
3166 IO::AIO::flush;
3167 Coro::cede;
3168 last unless IO::AIO::nreqs || BDB::nreqs; 3663 while (IO::AIO::nreqs || BDB::nreqs) {
3169 warn "iterate..."; 3664 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3170 }
3171
3172 ++$RELOAD;
3173
3174 warn "cancelling all extension coros";
3175 $_->cancel for values %EXT_CORO;
3176 %EXT_CORO = ();
3177
3178 warn "removing commands";
3179 %COMMAND = ();
3180
3181 warn "removing ext/exti commands";
3182 %EXTCMD = ();
3183 %EXTICMD = ();
3184
3185 warn "unloading/nuking all extensions";
3186 for my $pkg (@EXTS) {
3187 warn "... unloading $pkg";
3188
3189 if (my $cb = $pkg->can ("unload")) {
3190 eval {
3191 $cb->($pkg);
3192 1
3193 } or warn "$pkg unloaded, but with errors: $@";
3194 } 3665 }
3195 3666
3196 warn "... nuking $pkg"; 3667 warn "cancelling all extension coros";
3197 Symbol::delete_package $pkg; 3668 $_->cancel for values %EXT_CORO;
3198 } 3669 %EXT_CORO = ();
3199 3670
3200 warn "unloading all perl modules loaded from $LIBDIR"; 3671 warn "removing commands";
3201 while (my ($k, $v) = each %INC) { 3672 %COMMAND = ();
3202 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3203 3673
3674 warn "removing ext/exti commands";
3675 %EXTCMD = ();
3676 %EXTICMD = ();
3677
3678 warn "unloading/nuking all extensions";
3679 for my $pkg (@EXTS) {
3204 warn "... unloading $k"; 3680 warn "... unloading $pkg";
3205 delete $INC{$k};
3206 3681
3207 $k =~ s/\.pm$//;
3208 $k =~ s/\//::/g;
3209
3210 if (my $cb = $k->can ("unload_module")) { 3682 if (my $cb = $pkg->can ("unload")) {
3683 eval {
3211 $cb->(); 3684 $cb->($pkg);
3685 1
3686 } or warn "$pkg unloaded, but with errors: $@";
3687 }
3688
3689 warn "... clearing $pkg";
3690 clear_package $pkg;
3212 } 3691 }
3213 3692
3214 Symbol::delete_package $k; 3693 warn "unloading all perl modules loaded from $LIBDIR";
3694 while (my ($k, $v) = each %INC) {
3695 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3696
3697 warn "... unloading $k";
3698 delete $INC{$k};
3699
3700 $k =~ s/\.pm$//;
3701 $k =~ s/\//::/g;
3702
3703 if (my $cb = $k->can ("unload_module")) {
3704 $cb->();
3705 }
3706
3707 clear_package $k;
3215 } 3708 }
3216 3709
3217 warn "getting rid of safe::, as good as possible"; 3710 warn "getting rid of safe::, as good as possible";
3218 Symbol::delete_package "safe::$_" 3711 clear_package "safe::$_"
3219 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3712 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3220 3713
3221 warn "unloading cf.pm \"a bit\""; 3714 warn "unloading cf.pm \"a bit\"";
3222 delete $INC{"cf.pm"}; 3715 delete $INC{"cf.pm"};
3223 delete $INC{"cf/pod.pm"}; 3716 delete $INC{"cf/pod.pm"};
3224 3717
3225 # don't, removes xs symbols, too, 3718 # don't, removes xs symbols, too,
3226 # and global variables created in xs 3719 # and global variables created in xs
3227 #Symbol::delete_package __PACKAGE__; 3720 #clear_package __PACKAGE__;
3228 3721
3229 warn "unload completed, starting to reload now"; 3722 warn "unload completed, starting to reload now";
3230 3723
3231 warn "reloading cf.pm"; 3724 warn "reloading cf.pm";
3232 require cf; 3725 require cf;
3233 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3726 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3234 3727
3235 warn "loading config and database again"; 3728 warn "loading config and database again";
3236 cf::cfg_load; 3729 cf::reload_config;
3237 3730
3238 warn "loading extensions"; 3731 warn "loading extensions";
3239 cf::load_extensions; 3732 cf::load_extensions;
3240 3733
3241 warn "reattaching attachments to objects/players"; 3734 warn "reattaching attachments to objects/players";
3242 _global_reattach; # objects, sockets 3735 _global_reattach; # objects, sockets
3243 warn "reattaching attachments to maps"; 3736 warn "reattaching attachments to maps";
3244 reattach $_ for values %MAP; 3737 reattach $_ for values %MAP;
3245 warn "reattaching attachments to players"; 3738 warn "reattaching attachments to players";
3246 reattach $_ for values %PLAYER; 3739 reattach $_ for values %PLAYER;
3247 3740
3248 warn "leaving sync_job"; 3741 warn "leaving sync_job";
3249 3742
3250 1 3743 1
3251 } or do { 3744 } or do {
3252 warn $@; 3745 warn $@;
3253 warn "error while reloading, exiting."; 3746 cf::cleanup "error while reloading, exiting.";
3254 exit 1;
3255 }; 3747 };
3256 3748
3257 warn "reloaded"; 3749 warn "reloaded";
3750 --$RELOAD;
3751 }
3258}; 3752};
3259 3753
3260our $RELOAD_WATCHER; # used only during reload 3754our $RELOAD_WATCHER; # used only during reload
3261 3755
3262sub reload_perl() { 3756sub reload_perl() {
3263 # doing reload synchronously and two reloads happen back-to-back, 3757 # doing reload synchronously and two reloads happen back-to-back,
3264 # coro crashes during coro_state_free->destroy here. 3758 # coro crashes during coro_state_free->destroy here.
3265 3759
3266 $RELOAD_WATCHER ||= Event->timer ( 3760 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3267 reentrant => 0,
3268 after => 0,
3269 data => WF_AUTOCANCEL,
3270 cb => sub {
3271 do_reload_perl; 3761 do_reload_perl;
3272 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3273 },
3274 ); 3763 };
3275} 3764}
3276 3765
3277register_command "reload" => sub { 3766register_command "reload" => sub {
3278 my ($who, $arg) = @_; 3767 my ($who, $arg) = @_;
3279 3768
3280 if ($who->flag (FLAG_WIZ)) { 3769 if ($who->flag (FLAG_WIZ)) {
3281 $who->message ("reloading server."); 3770 $who->message ("reloading server.");
3771 async {
3772 $Coro::current->{desc} = "perl_reload";
3282 async { reload_perl }; 3773 reload_perl;
3774 };
3283 } 3775 }
3284}; 3776};
3285 3777
3286unshift @INC, $LIBDIR; 3778unshift @INC, $LIBDIR;
3287 3779
3289 3781
3290our @WAIT_FOR_TICK; 3782our @WAIT_FOR_TICK;
3291our @WAIT_FOR_TICK_BEGIN; 3783our @WAIT_FOR_TICK_BEGIN;
3292 3784
3293sub wait_for_tick { 3785sub wait_for_tick {
3294 return unless $TICK_WATCHER->is_active;
3295 return if $Coro::current == $Coro::main; 3786 return if tick_inhibit || $Coro::current == $Coro::main;
3296 3787
3297 my $signal = new Coro::Signal; 3788 my $signal = new Coro::Signal;
3298 push @WAIT_FOR_TICK, $signal; 3789 push @WAIT_FOR_TICK, $signal;
3299 $signal->wait; 3790 $signal->wait;
3300} 3791}
3301 3792
3302sub wait_for_tick_begin { 3793sub wait_for_tick_begin {
3303 return unless $TICK_WATCHER->is_active;
3304 return if $Coro::current == $Coro::main; 3794 return if tick_inhibit || $Coro::current == $Coro::main;
3305 3795
3306 my $signal = new Coro::Signal; 3796 my $signal = new Coro::Signal;
3307 push @WAIT_FOR_TICK_BEGIN, $signal; 3797 push @WAIT_FOR_TICK_BEGIN, $signal;
3308 $signal->wait; 3798 $signal->wait;
3309} 3799}
3310 3800
3311 my $min = 1e6;#d# 3801sub tick {
3312 my $avg = 10;
3313$TICK_WATCHER = Event->timer (
3314 reentrant => 0,
3315 parked => 1,
3316 prio => 0,
3317 at => $NEXT_TICK || $TICK,
3318 data => WF_AUTOCANCEL,
3319 cb => sub {
3320 if ($Coro::current != $Coro::main) { 3802 if ($Coro::current != $Coro::main) {
3321 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3803 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3322 unless ++$bug_warning > 10; 3804 unless ++$bug_warning > 10;
3323 return; 3805 return;
3324 } 3806 }
3325 3807
3326 $NOW = $tick_start = Event::time;
3327
3328 cf::server_tick; # one server iteration 3808 cf::server_tick; # one server iteration
3329 3809
3330 0 && sync_job {#d# 3810 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3331 for(1..10) { 3811 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3332 my $t = Event::time; 3812 Coro::async_pool {
3333 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3813 $Coro::current->{desc} = "runtime saver";
3334 or die; 3814 write_runtime_sync
3335 3815 or warn "ERROR: unable to write runtime file: $!";
3336 $map->width (50);
3337 $map->height (50);
3338 $map->alloc;
3339 $map->_load_objects ("/tmp/x.map", 1);
3340 my $t = Event::time - $t;
3341
3342 #next unless $t < 0.0013;#d#
3343 if ($t < $min) {
3344 $min = $t;
3345 }
3346 $avg = $avg * 0.99 + $t * 0.01;
3347 }
3348 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3349 exit 0;
3350 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3351 }; 3816 };
3817 }
3352 3818
3353 $RUNTIME += $TICK;
3354 $NEXT_TICK += $TICK;
3355
3356 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3357 $NEXT_RUNTIME_WRITE = $NOW + 10;
3358 Coro::async_pool {
3359 write_runtime
3360 or warn "ERROR: unable to write runtime file: $!";
3361 };
3362 }
3363
3364# my $AFTER = Event::time;
3365# warn $AFTER - $NOW;#d#
3366
3367 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3819 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3368 $sig->send; 3820 $sig->send;
3369 } 3821 }
3370 while (my $sig = shift @WAIT_FOR_TICK) { 3822 while (my $sig = shift @WAIT_FOR_TICK) {
3371 $sig->send; 3823 $sig->send;
3372 } 3824 }
3373 3825
3374 $NOW = Event::time; 3826 $LOAD = ($NOW - $TICK_START) / $TICK;
3375
3376 # if we are delayed by four ticks or more, skip them all
3377 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3378
3379 $TICK_WATCHER->at ($NEXT_TICK);
3380 $TICK_WATCHER->start;
3381
3382 $LOAD = ($NOW - $tick_start) / $TICK;
3383 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3827 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3384 3828
3385 _post_tick; 3829 if (0) {
3386 3830 if ($NEXT_TICK) {
3387 3831 my $jitter = $TICK_START - $NEXT_TICK;
3832 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3833 warn "jitter $JITTER\n";#d#
3834 }
3388 }, 3835 }
3389); 3836}
3390 3837
3391{ 3838{
3392 BDB::max_poll_time $TICK * 0.1; 3839 # configure BDB
3393 $BDB_POLL_WATCHER = Event->io ( 3840
3394 reentrant => 0,
3395 fd => BDB::poll_fileno,
3396 poll => 'r',
3397 prio => 0,
3398 data => WF_AUTOCANCEL,
3399 cb => \&BDB::poll_cb,
3400 );
3401 BDB::min_parallel 8; 3841 BDB::min_parallel 8;
3402 3842 BDB::max_poll_reqs $TICK * 0.1;
3403 BDB::set_sync_prepare { 3843 $AnyEvent::BDB::WATCHER->priority (1);
3404 my $status;
3405 my $current = $Coro::current;
3406 (
3407 sub {
3408 $status = $!;
3409 $current->ready; undef $current;
3410 },
3411 sub {
3412 Coro::schedule while defined $current;
3413 $! = $status;
3414 },
3415 )
3416 };
3417 3844
3418 unless ($DB_ENV) { 3845 unless ($DB_ENV) {
3419 $DB_ENV = BDB::db_env_create; 3846 $DB_ENV = BDB::db_env_create;
3847 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3848 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3849 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3850 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3851 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3420 3852
3421 cf::sync_job { 3853 cf::sync_job {
3422 eval { 3854 eval {
3423 BDB::db_env_open 3855 BDB::db_env_open
3424 $DB_ENV, 3856 $DB_ENV,
3426 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3858 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3427 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3859 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3428 0666; 3860 0666;
3429 3861
3430 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3862 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3431
3432 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3433 $DB_ENV->set_lk_detect;
3434 }; 3863 };
3435 3864
3436 cf::cleanup "db_env_open(db): $@" if $@; 3865 cf::cleanup "db_env_open(db): $@" if $@;
3437 }; 3866 };
3438 } 3867 }
3868
3869 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3870 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3871 };
3872 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3873 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3874 };
3875 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3876 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3877 };
3439} 3878}
3440 3879
3441{ 3880{
3881 # configure IO::AIO
3882
3442 IO::AIO::min_parallel 8; 3883 IO::AIO::min_parallel 8;
3443
3444 undef $Coro::AIO::WATCHER;
3445 IO::AIO::max_poll_time $TICK * 0.1; 3884 IO::AIO::max_poll_time $TICK * 0.1;
3446 $AIO_POLL_WATCHER = Event->io ( 3885 undef $AnyEvent::AIO::WATCHER;
3447 reentrant => 0,
3448 data => WF_AUTOCANCEL,
3449 fd => IO::AIO::poll_fileno,
3450 poll => 'r',
3451 prio => 6,
3452 cb => \&IO::AIO::poll_cb,
3453 );
3454} 3886}
3455 3887
3456my $_log_backtrace; 3888my $_log_backtrace;
3457 3889
3458sub _log_backtrace { 3890sub _log_backtrace {
3462 3894
3463 # limit the # of concurrent backtraces 3895 # limit the # of concurrent backtraces
3464 if ($_log_backtrace < 2) { 3896 if ($_log_backtrace < 2) {
3465 ++$_log_backtrace; 3897 ++$_log_backtrace;
3466 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3467 my @bt = fork_call { 3901 my @bt = fork_call {
3468 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3469 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3470 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3471 or die "addr2line: $!"; 3905 or die "addr2line: $!";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines