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.335 by root, Mon Aug 20 22:21:48 2007 UTC vs.
Revision 1.444 by root, Mon Sep 8 11:27:25 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines