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.342 by root, Sun Aug 26 15:31:02 2007 UTC vs.
Revision 1.448 by root, Fri Sep 19 05:30:23 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
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 68
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71{
72 # very ugly, but ensure we acquire the storable lock
73
74 sub net_mstore {
75 my $guard = Coro::Storable::guard;
76 &Storable::net_mstore
77 }
78
79 sub mretrieve {
80 my $guard = Coro::Storable::guard;
81 &Storable::mretrieve
82 }
83
84 Compress::LZF::set_serializer "Coro::Storable", "cf::net_mstore", "cf::mretrieve";
85 Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
86}
49 87
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 88sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 89
52our %COMMAND = (); 90our %COMMAND = ();
53our %COMMAND_TIME = (); 91our %COMMAND_TIME = ();
59our %EXT_MAP = (); # pluggable maps 97our %EXT_MAP = (); # pluggable maps
60 98
61our $RELOAD; # number of reloads so far 99our $RELOAD; # number of reloads so far
62our @EVENT; 100our @EVENT;
63 101
64our $CONFDIR = confdir; 102our $CONFDIR = confdir;
65our $DATADIR = datadir; 103our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 104our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 105our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 106our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 107our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 108our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 109our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 110our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 111our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 112our $BDBDIR = "$LOCALDIR/db";
113our $PIDFILE = "$LOCALDIR/pid";
114our $RUNTIMEFILE = "$LOCALDIR/runtime";
115
116our %RESOURCE;
75 117
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 118our $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 119our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 120our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 121our $USE_FSYNC = 1; # use fsync to write maps - default off
83 122
123our $BDB_DEADLOCK_WATCHER;
124our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 125our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 126our $DB_ENV;
86 127
87our %CFG; 128our %CFG;
88 129
89our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 131our $RUNTIME;
132our $NOW;
91 133
92our %PLAYER; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 135our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
95 137
96# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 140
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
102 145
103binmode STDOUT; 146binmode STDOUT;
104binmode STDERR; 147binmode STDERR;
105 148
106# read virtual server time, if available 149# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 150unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 151 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 152 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 153 $RUNTIME = <$fh> + 0.;
111} 154}
112 155
113mkdir $_ 156mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 157 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 202
160The raw value load value from the last tick. 203The raw value load value from the last tick.
161 204
162=item %cf::CFG 205=item %cf::CFG
163 206
164Configuration for the server, loaded from C</etc/crossfire/config>, or 207Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 208from wherever your confdir points to.
166 209
167=item cf::wait_for_tick, cf::wait_for_tick_begin 210=item cf::wait_for_tick, cf::wait_for_tick_begin
168 211
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 212These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 230 $msg .= "\n"
188 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
189 232
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 233 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 234
192 utf8::encode $msg;
193 LOG llevError, $msg; 235 LOG llevError, $msg;
194 }; 236 };
195} 237}
238
239$Coro::State::DIEHOOK = sub {
240 return unless $^S eq 0; # "eq", not "=="
241
242 if ($Coro::current == $Coro::main) {#d#
243 warn "DIEHOOK called in main context, Coro bug?\n";#d#
244 return;#d#
245 }#d#
246
247 # kill coroutine otherwise
248 warn Carp::longmess $_[0];
249 Coro::terminate
250};
251
252$SIG{__DIE__} = sub { }; #d#?
196 253
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 254@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 255@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 256@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 257@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 264for my $pkg (qw(
208 cf::global cf::attachable 265 cf::global cf::attachable
209 cf::object cf::object::player 266 cf::object cf::object::player
210 cf::client cf::player 267 cf::client cf::player
211 cf::arch cf::living 268 cf::arch cf::living
269 cf::map cf::mapspace
212 cf::map cf::party cf::region 270 cf::party cf::region
213)) { 271)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 272 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 273}
217 274
218$Event::DIED = sub { 275$EV::DIED = sub {
219 warn "error in event callback: @_"; 276 warn "error in event callback: @_";
220}; 277};
221 278
222############################################################################# 279#############################################################################
223 280
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 303 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 304 $d
248 } || "[unable to dump $_[0]: '$@']"; 305 } || "[unable to dump $_[0]: '$@']";
249} 306}
250 307
251=item $ref = cf::from_json $json 308=item $ref = cf::decode_json $json
252 309
253Converts a JSON string into the corresponding perl data structure. 310Converts a JSON string into the corresponding perl data structure.
254 311
255=item $json = cf::to_json $ref 312=item $json = cf::encode_json $ref
256 313
257Converts a perl data structure into its JSON representation. 314Converts a perl data structure into its JSON representation.
258 315
259=cut 316=cut
260 317
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 318our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 319
263sub to_json ($) { $json_coder->encode ($_[0]) } 320sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 321sub decode_json($) { $json_coder->decode ($_[0]) }
265 322
266=item cf::lock_wait $string 323=item cf::lock_wait $string
267 324
268Wait until the given lock is available. See cf::lock_acquire. 325Wait until the given lock is available. See cf::lock_acquire.
269 326
272Wait until the given lock is available and then acquires it and returns 329Wait 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, 330a Coro::guard object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 331for example when the coroutine gets canceled), the lock is automatically
275returned. 332returned.
276 333
334Locks are *not* recursive, locking from the same coro twice results in a
335deadlocked coro.
336
277Lock names should begin with a unique identifier (for example, cf::map::find 337Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 338uses map_find and cf::map::load uses map_load).
279 339
280=item $locked = cf::lock_active $string 340=item $locked = cf::lock_active $string
281 341
282Return true if the lock is currently active, i.e. somebody has locked it. 342Return true if the lock is currently active, i.e. somebody has locked it.
283 343
284=cut 344=cut
285 345
286our %LOCK; 346our %LOCK;
347our %LOCKER;#d#
287 348
288sub lock_wait($) { 349sub lock_wait($) {
289 my ($key) = @_; 350 my ($key) = @_;
351
352 if ($LOCKER{$key} == $Coro::current) {#d#
353 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
354 return;#d#
355 }#d#
290 356
291 # wait for lock, if any 357 # wait for lock, if any
292 while ($LOCK{$key}) { 358 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current; 359 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule; 360 Coro::schedule;
300 366
301 # wait, to be sure we are not locked 367 # wait, to be sure we are not locked
302 lock_wait $key; 368 lock_wait $key;
303 369
304 $LOCK{$key} = []; 370 $LOCK{$key} = [];
371 $LOCKER{$key} = $Coro::current;#d#
305 372
306 Coro::guard { 373 Coro::guard {
374 delete $LOCKER{$key};#d#
307 # wake up all waiters, to be on the safe side 375 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} }; 376 $_->ready for @{ delete $LOCK{$key} };
309 } 377 }
310} 378}
311 379
314 382
315 ! ! $LOCK{$key} 383 ! ! $LOCK{$key}
316} 384}
317 385
318sub freeze_mainloop { 386sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 387 tick_inhibit_inc;
320 388
321 my $guard = Coro::guard { 389 Coro::guard \&tick_inhibit_dec;
322 $TICK_WATCHER->start; 390}
323 }; 391
324 $TICK_WATCHER->stop; 392=item cf::periodic $interval, $cb
325 $guard 393
394Like EV::periodic, but randomly selects a starting point so that the actions
395get spread over timer.
396
397=cut
398
399sub periodic($$) {
400 my ($interval, $cb) = @_;
401
402 my $start = rand List::Util::min 180, $interval;
403
404 EV::periodic $start, $interval, 0, $cb
326} 405}
327 406
328=item cf::get_slot $time[, $priority[, $name]] 407=item cf::get_slot $time[, $priority[, $name]]
329 408
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 409Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 420our @SLOT_QUEUE;
342our $SLOT_QUEUE; 421our $SLOT_QUEUE;
343 422
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 423$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 424$SLOT_QUEUE = Coro::async {
425 $Coro::current->desc ("timeslot manager");
426
346 my $signal = new Coro::Signal; 427 my $signal = new Coro::Signal;
347 428
348 while () { 429 while () {
349 next_job: 430 next_job:
350 my $avail = cf::till_tick; 431 my $avail = cf::till_tick;
358 } 439 }
359 } 440 }
360 } 441 }
361 442
362 if (@SLOT_QUEUE) { 443 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 444 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 445 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 446 $signal->wait;
366 } else { 447 } else {
367 Coro::schedule; 448 Coro::schedule;
368 } 449 }
369 } 450 }
370}; 451};
371 452
372sub get_slot($;$$) { 453sub get_slot($;$$) {
454 return if tick_inhibit || $Coro::current == $Coro::main;
455
373 my ($time, $pri, $name) = @_; 456 my ($time, $pri, $name) = @_;
374 457
375 $time = $TICK * .6 if $time > $TICK * .6; 458 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 459 my $sig = new Coro::Signal;
377 460
391 474
392BEGIN { *async = \&Coro::async_pool } 475BEGIN { *async = \&Coro::async_pool }
393 476
394=item cf::sync_job { BLOCK } 477=item cf::sync_job { BLOCK }
395 478
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 479The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 480is 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 481partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 482acceptable.
400 483
401If it must be done, put the blocking parts into C<sync_job>. This will run 484If 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 485the given BLOCK in another coroutine while waiting for the result. The
407 490
408sub sync_job(&) { 491sub sync_job(&) {
409 my ($job) = @_; 492 my ($job) = @_;
410 493
411 if ($Coro::current == $Coro::main) { 494 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 495 my $time = EV::time;
413 496
414 # this is the main coro, too bad, we have to block 497 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 498 # till the operation succeeds, freezing the server :/
416 499
417 # TODO: use suspend/resume instead 500 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 501
419 my $freeze_guard = freeze_mainloop; 502 my $freeze_guard = freeze_mainloop;
420 503
421 my $busy = 1; 504 my $busy = 1;
422 my @res; 505 my @res;
423 506
424 (async { 507 (async {
508 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 509 @res = eval { $job->() };
426 warn $@ if $@; 510 warn $@ if $@;
427 undef $busy; 511 undef $busy;
428 })->prio (Coro::PRIO_MAX); 512 })->prio (Coro::PRIO_MAX);
429 513
430 while ($busy) { 514 while ($busy) {
431 Coro::cede or Event::one_event; 515 if (Coro::nready) {
516 Coro::cede_notself;
517 } else {
518 EV::loop EV::LOOP_ONESHOT;
432 } 519 }
520 }
433 521
434 $time = Event::time - $time; 522 my $time = EV::time - $time;
435 523
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 524 $TICK_START += $time; # do not account sync jobs to server load
440 525
441 wantarray ? @res : $res[0] 526 wantarray ? @res : $res[0]
442 } else { 527 } else {
443 # we are in another coroutine, how wonderful, everything just works 528 # we are in another coroutine, how wonderful, everything just works
444 529
469=item fork_call { }, $args 554=item fork_call { }, $args
470 555
471Executes the given code block with the given arguments in a seperate 556Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 557process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 558Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 559never block itself or use any form of event handling.
475 560
476=cut 561=cut
477 562
478sub fork_call(&@) { 563sub fork_call(&@) {
479 my ($cb, @args) = @_; 564 my ($cb, @args) = @_;
480 565
481 # we seemingly have to make a local copy of the whole thing, 566 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 567 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 568 # TODO: investigate and fix (likely this will be rather laborious)
484 569
485 my @res = Coro::Util::fork_eval { 570 my @res = Coro::Util::fork_eval {
486 reset_signals; 571 reset_signals;
487 &$cb 572 &$cb
488 }, @args; 573 }, @args;
489 574
490 wantarray ? @res : $res[-1] 575 wantarray ? @res : $res[-1]
491} 576}
492 577
578=item $coin = coin_from_name $name
579
580=cut
581
582our %coin_alias = (
583 "silver" => "silvercoin",
584 "silvercoin" => "silvercoin",
585 "silvercoins" => "silvercoin",
586 "gold" => "goldcoin",
587 "goldcoin" => "goldcoin",
588 "goldcoins" => "goldcoin",
589 "platinum" => "platinacoin",
590 "platinumcoin" => "platinacoin",
591 "platinumcoins" => "platinacoin",
592 "platina" => "platinacoin",
593 "platinacoin" => "platinacoin",
594 "platinacoins" => "platinacoin",
595 "royalty" => "royalty",
596 "royalties" => "royalty",
597);
598
599sub coin_from_name($) {
600 $coin_alias{$_[0]}
601 ? cf::arch::find $coin_alias{$_[0]}
602 : undef
603}
604
493=item $value = cf::db_get $family => $key 605=item $value = cf::db_get $family => $key
494 606
495Returns a single value from the environment database. 607Returns a single value from the environment database.
496 608
497=item cf::db_put $family => $key => $value 609=item cf::db_put $family => $key => $value
498 610
499Stores the given C<$value> in the family. It can currently store binary 611Stores 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). 612data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 613
614=item $db = cf::db_table "name"
615
616Create and/or open a new database table. The string must not be "db" and must be unique
617within each server.
618
502=cut 619=cut
620
621sub db_table($) {
622 my ($name) = @_;
623 my $db = BDB::db_create $DB_ENV;
624
625 eval {
626 $db->set_flags (BDB::CHKSUM);
627
628 utf8::encode $name;
629 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
630 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
631 cf::cleanup "db_open(db): $!" if $!;
632 };
633 cf::cleanup "db_open(db): $@" if $@;
634
635 $db
636}
503 637
504our $DB; 638our $DB;
505 639
506sub db_init { 640sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 641 cf::sync_job {
511 eval { 642 $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 } 643 };
521} 644}
522 645
523sub db_get($$) { 646sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 647 my $key = "$_[0]/$_[1]";
525 648
575 if (1) { 698 if (1) {
576 $md5 = 699 $md5 =
577 join "\x00", 700 join "\x00",
578 $processversion, 701 $processversion,
579 map { 702 map {
580 Coro::cede; 703 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 704 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 705 } 0.. $#$src;
583 706
584 707
585 my $dbmd5 = db_get cache => "$id/md5"; 708 my $dbmd5 = db_get cache => "$id/md5";
623 746
624############################################################################# 747#############################################################################
625 748
626=head2 ATTACHABLE OBJECTS 749=head2 ATTACHABLE OBJECTS
627 750
628Many objects in crossfire are so-called attachable objects. That means you can 751Many objects in deliantra are so-called attachable objects. That means you can
629attach callbacks/event handlers (a collection of which is called an "attachment") 752attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 753to it. All such attachable objects support the following methods.
631 754
632In the following description, CLASS can be any of C<global>, C<object> 755In 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 756C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 757Deliantra).
635 758
636=over 4 759=over 4
637 760
638=item $attachable->attach ($attachment, key => $value...) 761=item $attachable->attach ($attachment, key => $value...)
639 762
683=item cf::CLASS::attachment $name, ... 806=item cf::CLASS::attachment $name, ...
684 807
685Register an attachment by C<$name> through which attachable objects of the 808Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 809given CLASS can refer to this attachment.
687 810
688Some classes such as crossfire maps and objects can specify attachments 811Some classes such as deliantra maps and objects can specify attachments
689that are attached at load/instantiate time, thus the need for a name. 812that are attached at load/instantiate time, thus the need for a name.
690 813
691These calls expect any number of the following handler/hook descriptions: 814These calls expect any number of the following handler/hook descriptions:
692 815
693=over 4 816=over 4
921 } 1044 }
922 1045
923 0 1046 0
924} 1047}
925 1048
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1049=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1050
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1051=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1052
930Generate an object-specific event with the given arguments. 1053Generate an object-specific event with the given arguments.
931 1054
937 1060
938=cut 1061=cut
939 1062
940############################################################################# 1063#############################################################################
941# object support 1064# object support
942#
943 1065
1066sub _object_equal($$);
1067sub _object_equal($$) {
1068 my ($a, $b) = @_;
1069
1070 return 0 unless (ref $a) eq (ref $b);
1071
1072 if ("HASH" eq ref $a) {
1073 my @ka = keys %$a;
1074 my @kb = keys %$b;
1075
1076 return 0 if @ka != @kb;
1077
1078 for (0 .. $#ka) {
1079 return 0 unless $ka[$_] eq $kb[$_];
1080 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1081 }
1082
1083 } elsif ("ARRAY" eq ref $a) {
1084
1085 return 0 if @$a != @$b;
1086
1087 for (0 .. $#$a) {
1088 return 0 unless _object_equal $a->[$_], $b->[$_];
1089 }
1090
1091 } elsif ($a ne $b) {
1092 return 0;
1093 }
1094
1095 1
1096}
1097
1098our $SLOW_MERGES;#d#
944sub _can_merge { 1099sub _can_merge {
945 my ($ob1, $ob2) = @_; 1100 my ($ob1, $ob2) = @_;
946 1101
947 local $Storable::canonical = 1; 1102 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1103
951 $fob1 eq $fob2 1104 # we do the slow way here
1105 return _object_equal $ob1, $ob2
952} 1106}
953 1107
954sub reattach { 1108sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1109 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1110 my ($obj) = @_;
957 1111
1112 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1113 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1114
960 my $registry = $obj->registry; 1115 my $registry = $obj->registry;
961 1116
962 @$registry = (); 1117 @$registry = ();
963 1118
978cf::attachable->attach ( 1133cf::attachable->attach (
979 prio => -1000000, 1134 prio => -1000000,
980 on_instantiate => sub { 1135 on_instantiate => sub {
981 my ($obj, $data) = @_; 1136 my ($obj, $data) = @_;
982 1137
983 $data = from_json $data; 1138 $data = decode_json $data;
984 1139
985 for (@$data) { 1140 for (@$data) {
986 my ($name, $args) = @$_; 1141 my ($name, $args) = @$_;
987 1142
988 $obj->attach ($name, %{$args || {} }); 1143 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1159sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1160 my ($filename, $rdata, $objs) = @_;
1006 1161
1007 sync_job { 1162 sync_job {
1008 if (length $$rdata) { 1163 if (length $$rdata) {
1164 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1165 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1166 $decname, length $$rdata, scalar @$objs;
1011 1167
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1168 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1169 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1170 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1171 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1172 aio_close $fh;
1017 1173
1018 if (@$objs) { 1174 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1177 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1178 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1179 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1180 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1181 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1182 }
1027 } else { 1183 } else {
1028 aio_unlink "$filename.pst"; 1184 aio_unlink "$filename.pst";
1029 } 1185 }
1034 } 1190 }
1035 } else { 1191 } else {
1036 aio_unlink $filename; 1192 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1193 aio_unlink "$filename.pst";
1038 } 1194 }
1039 } 1195 };
1040} 1196}
1041 1197
1042sub object_freezer_as_string { 1198sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1199 my ($rdata, $objs) = @_;
1044 1200
1056 or return; 1212 or return;
1057 1213
1058 unless (aio_stat "$filename.pst") { 1214 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1215 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1216 or return;
1217
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1218 my $st = eval { Coro::Storable::thaw $av };
1219 $av = $st->{objs};
1062 } 1220 }
1063 1221
1222 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1223 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1224 $decname, length $data, scalar @{$av || []};
1225
1066 return ($data, $av); 1226 ($data, $av)
1067} 1227}
1068 1228
1069=head2 COMMAND CALLBACKS 1229=head2 COMMAND CALLBACKS
1070 1230
1071=over 4 1231=over 4
1194 1354
1195 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1355 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1196 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1356 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1197 1357
1198 $ext{source} = 1358 $ext{source} =
1199 "package $pkg; use strict; use utf8;\n" 1359 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1200 . "#line 1 \"$path\"\n{\n" 1360 . "#line 1 \"$path\"\n{\n"
1201 . $source 1361 . $source
1202 . "\n};\n1"; 1362 . "\n};\n1";
1203 1363
1204 $todo{$base} = \%ext; 1364 $todo{$base} = \%ext;
1220 my $msg = $@ ? "$v->{path}: $@\n" 1380 my $msg = $@ ? "$v->{path}: $@\n"
1221 : "$v->{base}: extension inactive.\n"; 1381 : "$v->{base}: extension inactive.\n";
1222 1382
1223 if (exists $v->{meta}{mandatory}) { 1383 if (exists $v->{meta}{mandatory}) {
1224 warn $msg; 1384 warn $msg;
1225 warn "mandatory extension failed to load, exiting.\n"; 1385 cf::cleanup "mandatory extension failed to load, exiting.";
1226 exit 1;
1227 } 1386 }
1228 1387
1229 warn $msg; 1388 warn $msg;
1230 } 1389 }
1231 1390
1245 1404
1246=back 1405=back
1247 1406
1248=head2 CORE EXTENSIONS 1407=head2 CORE EXTENSIONS
1249 1408
1250Functions and methods that extend core crossfire objects. 1409Functions and methods that extend core deliantra objects.
1251 1410
1252=cut 1411=cut
1253 1412
1254package cf::player; 1413package cf::player;
1255 1414
1256use Coro::AIO; 1415use Coro::AIO;
1257 1416
1258=head3 cf::player 1417=head3 cf::player
1259 1418
1260=over 4 1419=over 4
1420
1421=item cf::player::num_playing
1422
1423Returns the official number of playing players, as per the Crossfire metaserver rules.
1424
1425=cut
1426
1427sub num_playing {
1428 scalar grep
1429 $_->ob->map
1430 && !$_->hidden
1431 && !$_->ob->flag (cf::FLAG_WIZ),
1432 cf::player::list
1433}
1261 1434
1262=item cf::player::find $login 1435=item cf::player::find $login
1263 1436
1264Returns the given player object, loading it if necessary (might block). 1437Returns the given player object, loading it if necessary (might block).
1265 1438
1301 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1474 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1302 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1475 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1303 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1476 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1304 aio_unlink +(playerdir $login) . "/$login.pl"; 1477 aio_unlink +(playerdir $login) . "/$login.pl";
1305 1478
1306 my $pl = load_pl path $login 1479 my $f = new_from_file cf::object::thawer path $login
1307 or return; 1480 or return;
1481
1482 my $pl = cf::player::load_pl $f
1483 or return;
1484
1485 local $cf::PLAYER_LOADING{$login} = $pl;
1486 $f->resolve_delayed_derefs;
1308 $cf::PLAYER{$login} = $pl 1487 $cf::PLAYER{$login} = $pl
1309 } 1488 }
1310 } 1489 }
1311} 1490}
1312 1491
1321 return if $pl->{deny_save}; 1500 return if $pl->{deny_save};
1322 1501
1323 aio_mkdir playerdir $pl, 0770; 1502 aio_mkdir playerdir $pl, 0770;
1324 $pl->{last_save} = $cf::RUNTIME; 1503 $pl->{last_save} = $cf::RUNTIME;
1325 1504
1505 cf::get_slot 0.01;
1506
1326 $pl->save_pl ($path); 1507 $pl->save_pl ($path);
1327 Coro::cede; 1508 cf::cede_to_tick;
1328} 1509}
1329 1510
1330sub new($) { 1511sub new($) {
1331 my ($login) = @_; 1512 my ($login) = @_;
1332 1513
1361 my ($pl) = @_; 1542 my ($pl) = @_;
1362 1543
1363 my $name = $pl->ob->name; 1544 my $name = $pl->ob->name;
1364 1545
1365 $pl->{deny_save} = 1; 1546 $pl->{deny_save} = 1;
1366 $pl->password ("*"); # this should lock out the player until we nuked the dir 1547 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1367 1548
1368 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1549 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1369 $pl->deactivate; 1550 $pl->deactivate;
1551 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1552 $pl->ob->check_score;
1370 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1553 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1371 $pl->ns->destroy if $pl->ns; 1554 $pl->ns->destroy if $pl->ns;
1372 1555
1373 my $path = playerdir $pl; 1556 my $path = playerdir $pl;
1374 my $temp = "$path~$cf::RUNTIME~deleting~"; 1557 my $temp = "$path~$cf::RUNTIME~deleting~";
1410 or return []; 1593 or return [];
1411 1594
1412 my @logins; 1595 my @logins;
1413 1596
1414 for my $login (@$dirs) { 1597 for my $login (@$dirs) {
1598 my $path = path $login;
1599
1600 # a .pst is a dead give-away for a valid player
1601 # if no pst file found, open and chekc for blocked users
1602 if (aio_stat "$path.pst") {
1415 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1603 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1416 aio_read $fh, 0, 512, my $buf, 0 or next; 1604 aio_read $fh, 0, 512, my $buf, 0 or next;
1417 $buf !~ /^password -------------$/m or next; # official not-valid tag 1605 $buf !~ /^password -------------$/m or next; # official not-valid tag
1606 }
1418 1607
1419 utf8::decode $login; 1608 utf8::decode $login;
1420 push @logins, $login; 1609 push @logins, $login;
1421 } 1610 }
1422 1611
1449 } 1638 }
1450 1639
1451 \@paths 1640 \@paths
1452} 1641}
1453 1642
1454=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1643=item $protocol_xml = $player->expand_cfpod ($cfpod)
1455 1644
1456Expand crossfire pod fragments into protocol xml. 1645Expand deliantra pod fragments into protocol xml.
1457
1458=cut
1459
1460sub expand_cfpod {
1461 ((my $self), (local $_)) = @_;
1462
1463 # escape & and <
1464 s/&/&amp;/g;
1465 s/(?<![BIUGH])</&lt;/g;
1466
1467 # this is buggy, it needs to properly take care of nested <'s
1468
1469 1 while
1470 # replace B<>, I<>, U<> etc.
1471 s/B<([^\>]*)>/<b>$1<\/b>/
1472 || s/I<([^\>]*)>/<i>$1<\/i>/
1473 || s/U<([^\>]*)>/<u>$1<\/u>/
1474 # replace G<male|female> tags
1475 || s{G<([^>|]*)\|([^>]*)>}{
1476 $self->gender ? $2 : $1
1477 }ge
1478 # replace H<hint text>
1479 || s{H<([^\>]*)>}
1480 {
1481 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1482 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1483 "")
1484 [$self->{hintmode}]
1485 }ge;
1486
1487 # create single paragraphs (very hackish)
1488 s/(?<=\S)\n(?=\w)/ /g;
1489
1490 # compress some whitespace
1491 s/\s+\n/\n/g; # ws line-ends
1492 s/\n\n+/\n/g; # double lines
1493 s/^\n+//; # beginning lines
1494 s/\n+$//; # ending lines
1495
1496 $_
1497}
1498
1499sub hintmode {
1500 $_[0]{hintmode} = $_[1] if @_ > 1;
1501 $_[0]{hintmode}
1502}
1503 1646
1504=item $player->ext_reply ($msgid, @msg) 1647=item $player->ext_reply ($msgid, @msg)
1505 1648
1506Sends an ext reply to the player. 1649Sends an ext reply to the player.
1507 1650
1574our $MAX_RESET = 3600; 1717our $MAX_RESET = 3600;
1575our $DEFAULT_RESET = 3000; 1718our $DEFAULT_RESET = 3000;
1576 1719
1577sub generate_random_map { 1720sub generate_random_map {
1578 my ($self, $rmp) = @_; 1721 my ($self, $rmp) = @_;
1722
1723 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1724
1579 # mit "rum" bekleckern, nicht 1725 # mit "rum" bekleckern, nicht
1580 $self->_create_random_map ( 1726 $self->_create_random_map (
1581 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1727 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1582 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1728 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1583 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1729 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1705 1851
1706# the temporary/swap location 1852# the temporary/swap location
1707sub save_path { 1853sub save_path {
1708 my ($self) = @_; 1854 my ($self) = @_;
1709 1855
1710 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1856 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1711 "$TMPDIR/$path.map" 1857 "$TMPDIR/$path.map"
1712} 1858}
1713 1859
1714# the unique path, undef == no special unique path 1860# the unique path, undef == no special unique path
1715sub uniq_path { 1861sub uniq_path {
1716 my ($self) = @_; 1862 my ($self) = @_;
1717 1863
1718 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1864 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1719 "$UNIQUEDIR/$path" 1865 "$UNIQUEDIR/$path"
1720} 1866}
1721 1867
1722# and all this just because we cannot iterate over 1868# and all this just because we cannot iterate over
1723# all maps in C++... 1869# all maps in C++...
1746 1892
1747sub load_header_from($) { 1893sub load_header_from($) {
1748 my ($self, $path) = @_; 1894 my ($self, $path) = @_;
1749 1895
1750 utf8::encode $path; 1896 utf8::encode $path;
1751 #aio_open $path, O_RDONLY, 0 1897 my $f = new_from_file cf::object::thawer $path
1752 # or return;
1753
1754 $self->_load_header ($path)
1755 or return; 1898 or return;
1899
1900 $self->_load_header ($f)
1901 or return;
1902
1903 local $MAP_LOADING{$self->{path}} = $self;
1904 $f->resolve_delayed_derefs;
1756 1905
1757 $self->{load_path} = $path; 1906 $self->{load_path} = $path;
1758 1907
1759 1 1908 1
1760} 1909}
1814sub find { 1963sub find {
1815 my ($path, $origin) = @_; 1964 my ($path, $origin) = @_;
1816 1965
1817 $path = normalise $path, $origin && $origin->path; 1966 $path = normalise $path, $origin && $origin->path;
1818 1967
1968 cf::lock_wait "map_data:$path";#d#remove
1819 cf::lock_wait "map_find:$path"; 1969 cf::lock_wait "map_find:$path";
1820 1970
1821 $cf::MAP{$path} || do { 1971 $cf::MAP{$path} || do {
1972 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1822 my $guard = cf::lock_acquire "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1974
1823 my $map = new_from_path cf::map $path 1975 my $map = new_from_path cf::map $path
1824 or return; 1976 or return;
1825 1977
1826 $map->{last_save} = $cf::RUNTIME; 1978 $map->{last_save} = $cf::RUNTIME;
1827 1979
1829 or return; 1981 or return;
1830 1982
1831 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1983 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1832 # doing this can freeze the server in a sync job, obviously 1984 # doing this can freeze the server in a sync job, obviously
1833 #$cf::WAIT_FOR_TICK->wait; 1985 #$cf::WAIT_FOR_TICK->wait;
1986 undef $guard2;
1987 undef $guard1;
1834 $map->reset; 1988 $map->reset;
1835 undef $guard;
1836 return find $path; 1989 return find $path;
1837 } 1990 }
1838 1991
1839 $cf::MAP{$path} = $map 1992 $cf::MAP{$path} = $map
1840 } 1993 }
1849 local $self->{deny_reset} = 1; # loading can take a long time 2002 local $self->{deny_reset} = 1; # loading can take a long time
1850 2003
1851 my $path = $self->{path}; 2004 my $path = $self->{path};
1852 2005
1853 { 2006 {
1854 my $guard = cf::lock_acquire "map_load:$path"; 2007 my $guard = cf::lock_acquire "map_data:$path";
1855 2008
2009 return unless $self->valid;
1856 return if $self->in_memory != cf::MAP_SWAPPED; 2010 return unless $self->in_memory == cf::MAP_SWAPPED;
1857 2011
1858 $self->in_memory (cf::MAP_LOADING); 2012 $self->in_memory (cf::MAP_LOADING);
1859 2013
1860 $self->alloc; 2014 $self->alloc;
1861 2015
1862 $self->pre_load; 2016 $self->pre_load;
1863 Coro::cede; 2017 cf::cede_to_tick;
1864 2018
2019 my $f = new_from_file cf::object::thawer $self->{load_path};
2020 $f->skip_block;
1865 $self->_load_objects ($self->{load_path}, 1) 2021 $self->_load_objects ($f)
1866 or return; 2022 or return;
1867 2023
1868 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2024 $self->post_load_original
1869 if delete $self->{load_original}; 2025 if delete $self->{load_original};
1870 2026
1871 if (my $uniq = $self->uniq_path) { 2027 if (my $uniq = $self->uniq_path) {
1872 utf8::encode $uniq; 2028 utf8::encode $uniq;
1873 if (aio_open $uniq, O_RDONLY, 0) { 2029 unless (aio_stat $uniq) {
2030 if (my $f = new_from_file cf::object::thawer $uniq) {
1874 $self->clear_unique_items; 2031 $self->clear_unique_items;
1875 $self->_load_objects ($uniq, 0); 2032 $self->_load_objects ($f);
2033 $f->resolve_delayed_derefs;
2034 }
1876 } 2035 }
1877 } 2036 }
1878 2037
1879 Coro::cede; 2038 $f->resolve_delayed_derefs;
2039
2040 cf::cede_to_tick;
1880 # now do the right thing for maps 2041 # now do the right thing for maps
1881 $self->link_multipart_objects; 2042 $self->link_multipart_objects;
1882 $self->difficulty ($self->estimate_difficulty) 2043 $self->difficulty ($self->estimate_difficulty)
1883 unless $self->difficulty; 2044 unless $self->difficulty;
1884 Coro::cede; 2045 cf::cede_to_tick;
1885 2046
1886 unless ($self->{deny_activate}) { 2047 unless ($self->{deny_activate}) {
1887 $self->decay_objects; 2048 $self->decay_objects;
1888 $self->fix_auto_apply; 2049 $self->fix_auto_apply;
1889 $self->update_buttons; 2050 $self->update_buttons;
1890 Coro::cede; 2051 cf::cede_to_tick;
1891 $self->set_darkness_map; 2052 $self->set_darkness_map;
1892 Coro::cede; 2053 cf::cede_to_tick;
1893 $self->activate; 2054 $self->activate;
1894 } 2055 }
1895 2056
1896 $self->{last_save} = $cf::RUNTIME; 2057 $self->{last_save} = $cf::RUNTIME;
1897 $self->last_access ($cf::RUNTIME); 2058 $self->last_access ($cf::RUNTIME);
1898 2059
1899 $self->in_memory (cf::MAP_IN_MEMORY); 2060 $self->in_memory (cf::MAP_ACTIVE);
1900 } 2061 }
1901 2062
1902 $self->post_load; 2063 $self->post_load;
1903} 2064}
1904 2065
1962 my ($path, $origin, $load) = @_; 2123 my ($path, $origin, $load) = @_;
1963 2124
1964 $path = normalise $path, $origin && $origin->{path}; 2125 $path = normalise $path, $origin && $origin->{path};
1965 2126
1966 if (my $map = $cf::MAP{$path}) { 2127 if (my $map = $cf::MAP{$path}) {
1967 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2128 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1968 } 2129 }
1969 2130
1970 $MAP_PREFETCH{$path} |= $load; 2131 $MAP_PREFETCH{$path} |= $load;
1971 2132
1972 $MAP_PREFETCHER ||= cf::async { 2133 $MAP_PREFETCHER ||= cf::async {
2134 $Coro::current->{desc} = "map prefetcher";
2135
1973 while (%MAP_PREFETCH) { 2136 while (%MAP_PREFETCH) {
1974 while (my ($k, $v) = each %MAP_PREFETCH) { 2137 while (my ($k, $v) = each %MAP_PREFETCH) {
1975 if (my $map = find $k) { 2138 if (my $map = find $k) {
1976 $map->load if $v; 2139 $map->load if $v;
1977 } 2140 }
1987} 2150}
1988 2151
1989sub save { 2152sub save {
1990 my ($self) = @_; 2153 my ($self) = @_;
1991 2154
1992 my $lock = cf::lock_acquire "map_data:" . $self->path; 2155 my $lock = cf::lock_acquire "map_data:$self->{path}";
1993 2156
1994 $self->{last_save} = $cf::RUNTIME; 2157 $self->{last_save} = $cf::RUNTIME;
1995 2158
1996 return unless $self->dirty; 2159 return unless $self->dirty;
1997 2160
2003 return if $self->{deny_save}; 2166 return if $self->{deny_save};
2004 2167
2005 local $self->{last_access} = $self->last_access;#d# 2168 local $self->{last_access} = $self->last_access;#d#
2006 2169
2007 cf::async { 2170 cf::async {
2171 $Coro::current->{desc} = "map player save";
2008 $_->contr->save for $self->players; 2172 $_->contr->save for $self->players;
2009 }; 2173 };
2174
2175 cf::get_slot 0.02;
2010 2176
2011 if ($uniq) { 2177 if ($uniq) {
2012 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2178 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2013 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2179 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2014 } else { 2180 } else {
2020 my ($self) = @_; 2186 my ($self) = @_;
2021 2187
2022 # save first because save cedes 2188 # save first because save cedes
2023 $self->save; 2189 $self->save;
2024 2190
2025 my $lock = cf::lock_acquire "map_data:" . $self->path; 2191 my $lock = cf::lock_acquire "map_data:$self->{path}";
2026 2192
2027 return if $self->players; 2193 return if $self->players;
2028 return if $self->in_memory != cf::MAP_IN_MEMORY; 2194 return if $self->in_memory != cf::MAP_ACTIVE;
2029 return if $self->{deny_save}; 2195 return if $self->{deny_save};
2030 2196
2197 $self->in_memory (cf::MAP_SWAPPED);
2198
2199 $self->deactivate;
2200 $_->clear_links_to ($self) for values %cf::MAP;
2031 $self->clear; 2201 $self->clear;
2032 $self->in_memory (cf::MAP_SWAPPED);
2033} 2202}
2034 2203
2035sub reset_at { 2204sub reset_at {
2036 my ($self) = @_; 2205 my ($self) = @_;
2037 2206
2069 if $uniq; 2238 if $uniq;
2070 } 2239 }
2071 2240
2072 delete $cf::MAP{$self->path}; 2241 delete $cf::MAP{$self->path};
2073 2242
2243 $self->deactivate;
2244 $_->clear_links_to ($self) for values %cf::MAP;
2074 $self->clear; 2245 $self->clear;
2075
2076 $_->clear_links_to ($self) for values %cf::MAP;
2077 2246
2078 $self->unlink_save; 2247 $self->unlink_save;
2079 $self->destroy; 2248 $self->destroy;
2080} 2249}
2081 2250
2082my $nuke_counter = "aaaa"; 2251my $nuke_counter = "aaaa";
2083 2252
2084sub nuke { 2253sub nuke {
2085 my ($self) = @_; 2254 my ($self) = @_;
2086 2255
2256 {
2257 my $lock = cf::lock_acquire "map_data:$self->{path}";
2258
2087 delete $cf::MAP{$self->path}; 2259 delete $cf::MAP{$self->path};
2088 2260
2089 $self->unlink_save; 2261 $self->unlink_save;
2090 2262
2091 bless $self, "cf::map"; 2263 bless $self, "cf::map";
2092 delete $self->{deny_reset}; 2264 delete $self->{deny_reset};
2093 $self->{deny_save} = 1; 2265 $self->{deny_save} = 1;
2094 $self->reset_timeout (1); 2266 $self->reset_timeout (1);
2095 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2267 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2096 2268
2097 $cf::MAP{$self->path} = $self; 2269 $cf::MAP{$self->path} = $self;
2270 }
2098 2271
2099 $self->reset; # polite request, might not happen 2272 $self->reset; # polite request, might not happen
2100} 2273}
2101 2274
2102=item $maps = cf::map::tmp_maps 2275=item $maps = cf::map::tmp_maps
2144 2317
2145sub unique_maps() { 2318sub unique_maps() {
2146 [ 2319 [
2147 map { 2320 map {
2148 utf8::decode $_; 2321 utf8::decode $_;
2149 /\.map$/ 2322 s/\.map$//; # TODO future compatibility hack
2323 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2324 ? ()
2150 ? normalise $_ 2325 : normalise $_
2151 : ()
2152 } @{ aio_readdir $UNIQUEDIR or [] } 2326 } @{ aio_readdir $UNIQUEDIR or [] }
2153 ] 2327 ]
2154} 2328}
2155 2329
2156package cf;
2157
2158=back 2330=back
2159 2331
2160=head3 cf::object 2332=head3 cf::object
2161 2333
2162=cut 2334=cut
2165 2337
2166=over 4 2338=over 4
2167 2339
2168=item $ob->inv_recursive 2340=item $ob->inv_recursive
2169 2341
2170Returns the inventory of the object _and_ their inventories, recursively. 2342Returns the inventory of the object I<and> their inventories, recursively,
2343but I<not> the object itself.
2171 2344
2172=cut 2345=cut
2173 2346
2174sub inv_recursive_; 2347sub inv_recursive_;
2175sub inv_recursive_ { 2348sub inv_recursive_ {
2178 2351
2179sub inv_recursive { 2352sub inv_recursive {
2180 inv_recursive_ inv $_[0] 2353 inv_recursive_ inv $_[0]
2181} 2354}
2182 2355
2356=item $ref = $ob->ref
2357
2358Creates and returns a persistent reference to an object that can be stored as a string.
2359
2360=item $ob = cf::object::deref ($refstring)
2361
2362returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2363even if the object actually exists. May block.
2364
2365=cut
2366
2367sub deref {
2368 my ($ref) = @_;
2369
2370 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2371 my ($uuid, $name) = ($1, $2);
2372 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2373 or return;
2374 $pl->ob->uuid eq $uuid
2375 or return;
2376
2377 $pl->ob
2378 } else {
2379 warn "$ref: cannot resolve object reference\n";
2380 undef
2381 }
2382}
2383
2183package cf; 2384package cf;
2184 2385
2185=back 2386=back
2186 2387
2187=head3 cf::object::player 2388=head3 cf::object::player
2193Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2394Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2194can be C<undef>. Does the right thing when the player is currently in a 2395can be C<undef>. Does the right thing when the player is currently in a
2195dialogue with the given NPC character. 2396dialogue with the given NPC character.
2196 2397
2197=cut 2398=cut
2399
2400our $SAY_CHANNEL = {
2401 id => "say",
2402 title => "Map",
2403 reply => "say ",
2404 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2405};
2406
2407our $CHAT_CHANNEL = {
2408 id => "chat",
2409 title => "Chat",
2410 reply => "chat ",
2411 tooltip => "Player chat and shouts, global to the server.",
2412};
2198 2413
2199# rough implementation of a future "reply" method that works 2414# rough implementation of a future "reply" method that works
2200# with dialog boxes. 2415# with dialog boxes.
2201#TODO: the first argument must go, split into a $npc->reply_to ( method 2416#TODO: the first argument must go, split into a $npc->reply_to ( method
2202sub cf::object::player::reply($$$;$) { 2417sub cf::object::player::reply($$$;$) {
2214 my $dialog = $pl->{npc_dialog}; 2429 my $dialog = $pl->{npc_dialog};
2215 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2430 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2216 2431
2217 } else { 2432 } else {
2218 $msg = $npc->name . " says: $msg" if $npc; 2433 $msg = $npc->name . " says: $msg" if $npc;
2219 $self->message ($msg, $flags); 2434 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2220 } 2435 }
2221 } 2436 }
2222} 2437}
2223 2438
2224=item $object->send_msg ($channel, $msg, $color, [extra...]) 2439=item $object->send_msg ($channel, $msg, $color, [extra...])
2249 2464
2250=item $player_object->enter_link 2465=item $player_object->enter_link
2251 2466
2252Freezes the player and moves him/her to a special map (C<{link}>). 2467Freezes the player and moves him/her to a special map (C<{link}>).
2253 2468
2254The player should be reasonably safe there for short amounts of time. You 2469The player should be reasonably safe there for short amounts of time (e.g.
2255I<MUST> call C<leave_link> as soon as possible, though. 2470for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2471though, as the palyer cannot control the character while it is on the link
2472map.
2256 2473
2257Will never block. 2474Will never block.
2258 2475
2259=item $player_object->leave_link ($map, $x, $y) 2476=item $player_object->leave_link ($map, $x, $y)
2260 2477
2318 2535
2319 $map->load; 2536 $map->load;
2320 $map->load_neighbours; 2537 $map->load_neighbours;
2321 2538
2322 return unless $self->contr->active; 2539 return unless $self->contr->active;
2540 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2323 $self->activate_recursive; 2541 $self->activate_recursive;
2324 2542
2325 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2543 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2326 $self->enter_map ($map, $x, $y); 2544 $self->enter_map ($map, $x, $y);
2327} 2545}
2332her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2333that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2334the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2335be called at the end of this process. 2553be called at the end of this process.
2336 2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2557
2337=cut 2558=cut
2338 2559
2339our $GOTOGEN; 2560our $GOTOGEN;
2340 2561
2341sub cf::object::player::goto { 2562sub cf::object::player::goto {
2345 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2566 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2346 2567
2347 $self->enter_link; 2568 $self->enter_link;
2348 2569
2349 (async { 2570 (async {
2571 $Coro::current->{desc} = "player::goto $path $x $y";
2572
2573 # *tag paths override both path and x|y
2574 if ($path =~ /^\*(.*)$/) {
2575 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2576 my $ob = $obs[rand @obs];
2577
2578 # see if we actually can go there
2579 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2580 $ob = $obs[rand @obs];
2581 } else {
2582 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2583 }
2584 # else put us there anyways for now #d#
2585
2586 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2587 } else {
2588 ($path, $x, $y) = (undef, undef, undef);
2589 }
2590 }
2591
2350 my $map = eval { 2592 my $map = eval {
2351 my $map = cf::map::find $path; 2593 my $map = defined $path ? cf::map::find $path : undef;
2352 2594
2353 if ($map) { 2595 if ($map) {
2354 $map = $map->customise_for ($self); 2596 $map = $map->customise_for ($self);
2355 $map = $check->($map) if $check && $map; 2597 $map = $check->($map) if $check && $map;
2356 } else { 2598 } else {
2357 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2599 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2358 } 2600 }
2359 2601
2360 $map 2602 $map
2361 }; 2603 };
2362 2604
2398} 2640}
2399 2641
2400sub prepare_random_map { 2642sub prepare_random_map {
2401 my ($exit) = @_; 2643 my ($exit) = @_;
2402 2644
2403 my $guard = cf::lock_acquire "exit_prepare:$exit";
2404
2405 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2406 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2407 # that depends on the exit object 2647 # that depends on the exit object
2408 2648
2409 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2411 if ($exit->map) { 2651 if ($exit->map) {
2412 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2413 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2414 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2415 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2416 } 2658 }
2417 2659
2418 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2419 2661
2420 my $data = cf::to_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2421 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2422 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2423 2665
2424 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2425 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2426 undef $fh; 2668 undef $fh;
2427 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2428 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2429 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2430 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2431 } 2677 }
2432} 2678}
2433 2679
2434sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2435 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2436 2682
2437 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2438 2684
2439 if ($exit->slaying eq "/!") {
2440 #TODO: this should de-fi-ni-te-ly not be a sync-job
2441 # the problem is that $exit might not survive long enough
2442 # so it needs to be done right now, right here
2443 cf::sync_job { prepare_random_map $exit };
2444 }
2445
2446 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2447 my $hp = $exit->stats->hp;
2448 my $sp = $exit->stats->sp;
2449
2450 $self->enter_link; 2685 $self->enter_link;
2451 2686
2452 # if exit is damned, update players death & WoR home-position
2453 $self->contr->savebed ($slaying, $hp, $sp)
2454 if $exit->flag (FLAG_DAMNED);
2455
2456 (async { 2687 (async {
2457 $self->deactivate_recursive; # just to be sure 2688 $Coro::current->{desc} = "enter_exit";
2689
2458 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2459 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2460 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2461 1; 2711 1
2462 }) { 2712 }) {
2463 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2464 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2465 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2466 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2467 2717
2468 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2496the message, with C<log> being the default. If C<$color> is negative, suppress 2746the message, with C<log> being the default. If C<$color> is negative, suppress
2497the message unless the client supports the msg packet. 2747the message unless the client supports the msg packet.
2498 2748
2499=cut 2749=cut
2500 2750
2751# non-persistent channels (usually the info channel)
2752our %CHANNEL = (
2753 "c/identify" => {
2754 id => "infobox",
2755 title => "Identify",
2756 reply => undef,
2757 tooltip => "Items recently identified",
2758 },
2759 "c/examine" => {
2760 id => "infobox",
2761 title => "Examine",
2762 reply => undef,
2763 tooltip => "Signs and other items you examined",
2764 },
2765 "c/book" => {
2766 id => "infobox",
2767 title => "Book",
2768 reply => undef,
2769 tooltip => "The contents of a note or book",
2770 },
2771 "c/lookat" => {
2772 id => "infobox",
2773 title => "Look",
2774 reply => undef,
2775 tooltip => "What you saw there",
2776 },
2777 "c/who" => {
2778 id => "infobox",
2779 title => "Players",
2780 reply => undef,
2781 tooltip => "Shows players who are currently online",
2782 },
2783 "c/body" => {
2784 id => "infobox",
2785 title => "Body Parts",
2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available",
2788 },
2789 "c/uptime" => {
2790 id => "infobox",
2791 title => "Uptime",
2792 reply => undef,
2793 tooltip => "How long the server has been running since last restart",
2794 },
2795 "c/mapinfo" => {
2796 id => "infobox",
2797 title => "Map Info",
2798 reply => undef,
2799 tooltip => "Information related to the maps",
2800 },
2801 "c/party" => {
2802 id => "party",
2803 title => "Party",
2804 reply => "gsay ",
2805 tooltip => "Messages and chat related to your party",
2806 },
2807);
2808
2501sub cf::client::send_msg { 2809sub cf::client::send_msg {
2502 my ($self, $channel, $msg, $color, @extra) = @_; 2810 my ($self, $channel, $msg, $color, @extra) = @_;
2503 2811
2504 $msg = $self->pl->expand_cfpod ($msg); 2812 $msg = $self->pl->expand_cfpod ($msg)
2813 unless $color & cf::NDI_VERBATIM;
2505 2814
2506 $color &= cf::NDI_CLIENT_MASK; # just in case... 2815 $color &= cf::NDI_CLIENT_MASK; # just in case...
2507 2816
2817 # check predefined channels, for the benefit of C
2818 if ($CHANNEL{$channel}) {
2819 $channel = $CHANNEL{$channel};
2820
2821 $self->ext_msg (channel_info => $channel)
2822 if $self->can_msg;
2823
2824 $channel = $channel->{id};
2825
2508 if (ref $channel) { 2826 } elsif (ref $channel) {
2509 # send meta info to client, if not yet sent 2827 # send meta info to client, if not yet sent
2510 unless (exists $self->{channel}{$channel->{id}}) { 2828 unless (exists $self->{channel}{$channel->{id}}) {
2511 $self->{channel}{$channel->{id}} = $channel; 2829 $self->{channel}{$channel->{id}} = $channel;
2512 $self->ext_msg (channel_info => $channel); 2830 $self->ext_msg (channel_info => $channel)
2831 if $self->can_msg;
2513 } 2832 }
2514 2833
2515 $channel = $channel->{id}; 2834 $channel = $channel->{id};
2516 } 2835 }
2517 2836
2520 if ($self->can_msg) { 2839 if ($self->can_msg) {
2521 # default colour, mask it out 2840 # default colour, mask it out
2522 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2841 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2523 if $color & cf::NDI_DEF; 2842 if $color & cf::NDI_DEF;
2524 2843
2525 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2844 my $pkt = "msg "
2845 . $self->{json_coder}->encode (
2526 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2846 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2847 );
2848
2849 # try lzf for large packets
2850 $pkt = "lzf " . Compress::LZF::compress $pkt
2851 if 1024 <= length $pkt and $self->{can_lzf};
2852
2853 # split very large packets
2854 if (8192 < length $pkt and $self->{can_lzf}) {
2855 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 $pkt = "frag";
2857 }
2858
2859 $self->send_packet ($pkt);
2527 } else { 2860 } else {
2528 if ($color >= 0) { 2861 if ($color >= 0) {
2529 # replace some tags by gcfclient-compatible ones 2862 # replace some tags by gcfclient-compatible ones
2530 for ($msg) { 2863 for ($msg) {
2531 1 while 2864 1 while
2558=cut 2891=cut
2559 2892
2560sub cf::client::ext_msg($$@) { 2893sub cf::client::ext_msg($$@) {
2561 my ($self, $type, @msg) = @_; 2894 my ($self, $type, @msg) = @_;
2562 2895
2563 my $extcmd = $self->extcmd;
2564
2565 if ($extcmd == 2) { 2896 if ($self->extcmd == 2) {
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2897 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2567 } elsif ($extcmd == 1) { # TODO: remove 2898 } elsif ($self->extcmd == 1) { # TODO: remove
2568 push @msg, msgtype => "event_$type"; 2899 push @msg, msgtype => "event_$type";
2569 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2900 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2570 } 2901 }
2571} 2902}
2572 2903
2579sub cf::client::ext_reply($$@) { 2910sub cf::client::ext_reply($$@) {
2580 my ($self, $id, @msg) = @_; 2911 my ($self, $id, @msg) = @_;
2581 2912
2582 if ($self->extcmd == 2) { 2913 if ($self->extcmd == 2) {
2583 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2914 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2584 } elsif ($self->ns->extcmd == 1) { 2915 } elsif ($self->extcmd == 1) {
2585 #TODO: version 1, remove 2916 #TODO: version 1, remove
2586 unshift @msg, msgtype => "reply", msgid => $id; 2917 unshift @msg, msgtype => "reply", msgid => $id;
2587 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2918 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2588 } 2919 }
2589} 2920}
2731=pod 3062=pod
2732 3063
2733The following functions and methods are available within a safe environment: 3064The following functions and methods are available within a safe environment:
2734 3065
2735 cf::object 3066 cf::object
2736 contr pay_amount pay_player map x y force_find force_add 3067 contr pay_amount pay_player map x y force_find force_add destroy
2737 insert remove name archname title slaying race decrease_ob_nr 3068 insert remove name archname title slaying race decrease split
2738 3069
2739 cf::object::player 3070 cf::object::player
2740 player 3071 player
2741 3072
2742 cf::player 3073 cf::player
2747 3078
2748=cut 3079=cut
2749 3080
2750for ( 3081for (
2751 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3082 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2752 insert remove inv name archname title slaying race 3083 insert remove inv nrof name archname title slaying race
2753 decrease_ob_nr)], 3084 decrease split destroy change_exp)],
2754 ["cf::object::player" => qw(player)], 3085 ["cf::object::player" => qw(player)],
2755 ["cf::player" => qw(peaceful)], 3086 ["cf::player" => qw(peaceful)],
2756 ["cf::map" => qw(trigger)], 3087 ["cf::map" => qw(trigger)],
2757) { 3088) {
2758 no strict 'refs'; 3089 no strict 'refs';
2834# the server's init and main functions 3165# the server's init and main functions
2835 3166
2836sub load_facedata($) { 3167sub load_facedata($) {
2837 my ($path) = @_; 3168 my ($path) = @_;
2838 3169
3170 # HACK to clear player env face cache, we need some signal framework
3171 # for this (global event?)
3172 %ext::player_env::MUSIC_FACE_CACHE = ();
3173
2839 my $enc = JSON::XS->new->utf8->canonical; 3174 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2840 3175
2841 warn "loading facedata from $path\n"; 3176 warn "loading facedata from $path\n";
2842 3177
2843 my $facedata; 3178 my $facedata;
2844 0 < aio_load $path, $facedata 3179 0 < aio_load $path, $facedata
2859 { 3194 {
2860 my $faces = $facedata->{faceinfo}; 3195 my $faces = $facedata->{faceinfo};
2861 3196
2862 while (my ($face, $info) = each %$faces) { 3197 while (my ($face, $info) = each %$faces) {
2863 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3198 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3199
2864 cf::face::set_visibility $idx, $info->{visibility}; 3200 cf::face::set_visibility $idx, $info->{visibility};
2865 cf::face::set_magicmap $idx, $info->{magicmap}; 3201 cf::face::set_magicmap $idx, $info->{magicmap};
2866 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3202 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2867 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3203 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2868 3204
2869 cf::cede_to_tick; 3205 cf::cede_to_tick;
2870 } 3206 }
2871 3207
2872 while (my ($face, $info) = each %$faces) { 3208 while (my ($face, $info) = each %$faces) {
2873 next unless $info->{smooth}; 3209 next unless $info->{smooth};
3210
2874 my $idx = cf::face::find $face 3211 my $idx = cf::face::find $face
2875 or next; 3212 or next;
3213
2876 if (my $smooth = cf::face::find $info->{smooth}) { 3214 if (my $smooth = cf::face::find $info->{smooth}) {
2877 cf::face::set_smooth $idx, $smooth; 3215 cf::face::set_smooth $idx, $smooth;
2878 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3216 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2879 } else { 3217 } else {
2880 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3218 warn "smooth face '$info->{smooth}' not found for face '$face'";
2898 { 3236 {
2899 # TODO: for gcfclient pleasure, we should give resources 3237 # TODO: for gcfclient pleasure, we should give resources
2900 # that gcfclient doesn't grok a >10000 face index. 3238 # that gcfclient doesn't grok a >10000 face index.
2901 my $res = $facedata->{resource}; 3239 my $res = $facedata->{resource};
2902 3240
2903 my $soundconf = delete $res->{"res/sound.conf"};
2904
2905 while (my ($name, $info) = each %$res) { 3241 while (my ($name, $info) = each %$res) {
3242 if (defined $info->{type}) {
2906 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3243 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2907 my $data; 3244 my $data;
2908 3245
2909 if ($info->{type} & 1) { 3246 if ($info->{type} & 1) {
2910 # prepend meta info 3247 # prepend meta info
2911 3248
2912 my $meta = $enc->encode ({ 3249 my $meta = $enc->encode ({
2913 name => $name, 3250 name => $name,
2914 %{ $info->{meta} || {} }, 3251 %{ $info->{meta} || {} },
2915 }); 3252 });
2916 3253
2917 $data = pack "(w/a*)*", $meta, $info->{data}; 3254 $data = pack "(w/a*)*", $meta, $info->{data};
3255 } else {
3256 $data = $info->{data};
3257 }
3258
3259 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3260 cf::face::set_type $idx, $info->{type};
2918 } else { 3261 } else {
2919 $data = $info->{data}; 3262 $RESOURCE{$name} = $info;
2920 } 3263 }
2921 3264
2922 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2923 cf::face::set_type $idx, $info->{type};
2924
2925 cf::cede_to_tick; 3265 cf::cede_to_tick;
2926 } 3266 }
2927
2928 if ($soundconf) {
2929 $soundconf = $enc->decode (delete $soundconf->{data});
2930
2931 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2932 my $sound = $soundconf->{compat}[$_]
2933 or next;
2934
2935 my $face = cf::face::find "sound/$sound->[1]";
2936 cf::sound::set $sound->[0] => $face;
2937 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2938 }
2939
2940 while (my ($k, $v) = each %{$soundconf->{event}}) {
2941 my $face = cf::face::find "sound/$v";
2942 cf::sound::set $k => $face;
2943 }
2944 }
2945 } 3267 }
3268
3269 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2946 3270
2947 1 3271 1
2948} 3272}
3273
3274cf::global->attach (on_resource_update => sub {
3275 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3276 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3277
3278 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3279 my $sound = $soundconf->{compat}[$_]
3280 or next;
3281
3282 my $face = cf::face::find "sound/$sound->[1]";
3283 cf::sound::set $sound->[0] => $face;
3284 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3285 }
3286
3287 while (my ($k, $v) = each %{$soundconf->{event}}) {
3288 my $face = cf::face::find "sound/$v";
3289 cf::sound::set $k => $face;
3290 }
3291 }
3292});
2949 3293
2950register_exticmd fx_want => sub { 3294register_exticmd fx_want => sub {
2951 my ($ns, $want) = @_; 3295 my ($ns, $want) = @_;
2952 3296
2953 while (my ($k, $v) = each %$want) { 3297 while (my ($k, $v) = each %$want) {
2954 $ns->fx_want ($k, $v); 3298 $ns->fx_want ($k, $v);
2955 } 3299 }
2956}; 3300};
2957 3301
3302sub load_resource_file($) {
3303 my $guard = lock_acquire "load_resource_file";
3304
3305 my $status = load_resource_file_ $_[0];
3306 get_slot 0.1, 100;
3307 cf::arch::commit_load;
3308
3309 $status
3310}
3311
2958sub reload_regions { 3312sub reload_regions {
3313 # HACK to clear player env face cache, we need some signal framework
3314 # for this (global event?)
3315 %ext::player_env::MUSIC_FACE_CACHE = ();
3316
2959 load_resource_file "$MAPDIR/regions" 3317 load_resource_file "$MAPDIR/regions"
2960 or die "unable to load regions file\n"; 3318 or die "unable to load regions file\n";
2961 3319
2962 for (cf::region::list) { 3320 for (cf::region::list) {
2963 $_->{match} = qr/$_->{match}/ 3321 $_->{match} = qr/$_->{match}/
2971} 3329}
2972 3330
2973sub reload_archetypes { 3331sub reload_archetypes {
2974 load_resource_file "$DATADIR/archetypes" 3332 load_resource_file "$DATADIR/archetypes"
2975 or die "unable to load archetypes\n"; 3333 or die "unable to load archetypes\n";
2976 #d# NEED to laod twice to resolve forward references
2977 # this really needs to be done in an extra post-pass
2978 # (which needs to be synchronous, so solve it differently)
2979 load_resource_file "$DATADIR/archetypes"
2980 or die "unable to load archetypes\n";
2981} 3334}
2982 3335
2983sub reload_treasures { 3336sub reload_treasures {
2984 load_resource_file "$DATADIR/treasures" 3337 load_resource_file "$DATADIR/treasures"
2985 or die "unable to load treasurelists\n"; 3338 or die "unable to load treasurelists\n";
2986} 3339}
2987 3340
2988sub reload_resources { 3341sub reload_resources {
2989 warn "reloading resource files...\n"; 3342 warn "reloading resource files...\n";
2990 3343
3344 reload_facedata;
3345 reload_archetypes;
2991 reload_regions; 3346 reload_regions;
2992 reload_facedata;
2993 #reload_archetypes;#d#
2994 reload_archetypes;
2995 reload_treasures; 3347 reload_treasures;
2996 3348
2997 warn "finished reloading resource files\n"; 3349 warn "finished reloading resource files\n";
2998} 3350}
2999 3351
3000sub init { 3352sub init {
3353 my $guard = freeze_mainloop;
3354
3355 evthread_start IO::AIO::poll_fileno;
3356
3001 reload_resources; 3357 reload_resources;
3002} 3358}
3003 3359
3004sub cfg_load { 3360sub reload_config {
3005 open my $fh, "<:utf8", "$CONFDIR/config" 3361 open my $fh, "<:utf8", "$CONFDIR/config"
3006 or return; 3362 or return;
3007 3363
3008 local $/; 3364 local $/;
3009 *CFG = YAML::Syck::Load <$fh>; 3365 *CFG = YAML::Load <$fh>;
3010 3366
3011 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3367 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3012 3368
3013 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3369 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3014 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3370 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3020 }; 3376 };
3021 warn $@ if $@; 3377 warn $@ if $@;
3022 } 3378 }
3023} 3379}
3024 3380
3381sub pidfile() {
3382 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3383 or die "$PIDFILE: $!";
3384 flock $fh, &Fcntl::LOCK_EX
3385 or die "$PIDFILE: flock: $!";
3386 $fh
3387}
3388
3389# make sure only one server instance is running at any one time
3390sub atomic {
3391 my $fh = pidfile;
3392
3393 my $pid = <$fh>;
3394 kill 9, $pid if $pid > 0;
3395
3396 seek $fh, 0, 0;
3397 print $fh $$;
3398}
3399
3025sub main { 3400sub main {
3401 atomic;
3402
3026 # we must not ever block the main coroutine 3403 # we must not ever block the main coroutine
3027 local $Coro::idle = sub { 3404 local $Coro::idle = sub {
3028 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3405 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3029 (async { 3406 (async {
3030 Event::one_event; 3407 $Coro::current->{desc} = "IDLE BUG HANDLER";
3408 EV::loop EV::LOOP_ONESHOT;
3031 })->prio (Coro::PRIO_MAX); 3409 })->prio (Coro::PRIO_MAX);
3032 }; 3410 };
3033 3411
3034 cfg_load; 3412 {
3413 my $guard = freeze_mainloop;
3414 reload_config;
3035 db_init; 3415 db_init;
3036 load_extensions; 3416 load_extensions;
3037 3417
3038 $TICK_WATCHER->start; 3418 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3419 }
3420
3421 utime time, time, $RUNTIMEFILE;
3422
3423 # no (long-running) fork's whatsoever before this point(!)
3424 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3425
3039 Event::loop; 3426 EV::loop;
3040} 3427}
3041 3428
3042############################################################################# 3429#############################################################################
3043# initialisation and cleanup 3430# initialisation and cleanup
3044 3431
3045# install some emergency cleanup handlers 3432# install some emergency cleanup handlers
3046BEGIN { 3433BEGIN {
3434 our %SIGWATCHER = ();
3047 for my $signal (qw(INT HUP TERM)) { 3435 for my $signal (qw(INT HUP TERM)) {
3048 Event->signal ( 3436 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3049 reentrant => 0,
3050 data => WF_AUTOCANCEL,
3051 signal => $signal,
3052 prio => 0,
3053 cb => sub {
3054 cf::cleanup "SIG$signal"; 3437 cf::cleanup "SIG$signal";
3055 },
3056 ); 3438 };
3057 } 3439 }
3058} 3440}
3059 3441
3060sub write_runtime { 3442sub write_runtime_sync {
3061 my $runtime = "$LOCALDIR/runtime";
3062
3063 # first touch the runtime file to show we are still running: 3443 # first touch the runtime file to show we are still running:
3064 # the fsync below can take a very very long time. 3444 # the fsync below can take a very very long time.
3065 3445
3066 IO::AIO::aio_utime $runtime, undef, undef; 3446 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3067 3447
3068 my $guard = cf::lock_acquire "write_runtime"; 3448 my $guard = cf::lock_acquire "write_runtime";
3069 3449
3070 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3450 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3071 or return; 3451 or return;
3072 3452
3073 my $value = $cf::RUNTIME + 90 + 10; 3453 my $value = $cf::RUNTIME + 90 + 10;
3074 # 10 is the runtime save interval, for a monotonic clock 3454 # 10 is the runtime save interval, for a monotonic clock
3075 # 60 allows for the watchdog to kill the server. 3455 # 60 allows for the watchdog to kill the server.
3085 aio_utime $fh, undef, undef; 3465 aio_utime $fh, undef, undef;
3086 3466
3087 close $fh 3467 close $fh
3088 or return; 3468 or return;
3089 3469
3090 aio_rename "$runtime~", $runtime 3470 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3091 and return; 3471 and return;
3092 3472
3093 warn "runtime file written.\n"; 3473 warn "runtime file written.\n";
3094 3474
3095 1 3475 1
3476}
3477
3478our $uuid_lock;
3479our $uuid_skip;
3480
3481sub write_uuid_sync($) {
3482 $uuid_skip ||= $_[0];
3483
3484 return if $uuid_lock;
3485 local $uuid_lock = 1;
3486
3487 my $uuid = "$LOCALDIR/uuid";
3488
3489 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3490 or return;
3491
3492 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3493 $uuid_skip = 0;
3494
3495 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3496 and return;
3497
3498 # always fsync - this file is important
3499 aio_fsync $fh
3500 and return;
3501
3502 close $fh
3503 or return;
3504
3505 aio_rename "$uuid~", $uuid
3506 and return;
3507
3508 warn "uuid file written ($value).\n";
3509
3510 1
3511
3512}
3513
3514sub write_uuid($$) {
3515 my ($skip, $sync) = @_;
3516
3517 $sync ? write_uuid_sync $skip
3518 : async { write_uuid_sync $skip };
3096} 3519}
3097 3520
3098sub emergency_save() { 3521sub emergency_save() {
3099 my $freeze_guard = cf::freeze_mainloop; 3522 my $freeze_guard = cf::freeze_mainloop;
3100 3523
3106 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3107 warn "begin emergency player save\n"; 3530 warn "begin emergency player save\n";
3108 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3109 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3110 $pl->valid or next; 3533 $pl->valid or next;
3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3111 $pl->save; 3535 $pl->save;
3112 } 3536 }
3113 warn "end emergency player save\n"; 3537 warn "end emergency player save\n";
3114 3538
3115 warn "begin emergency map save\n"; 3539 warn "begin emergency map save\n";
3121 warn "end emergency map save\n"; 3545 warn "end emergency map save\n";
3122 3546
3123 warn "begin emergency database checkpoint\n"; 3547 warn "begin emergency database checkpoint\n";
3124 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3125 warn "end emergency database checkpoint\n"; 3549 warn "end emergency database checkpoint\n";
3550
3551 warn "begin write uuid\n";
3552 write_uuid_sync 1;
3553 warn "end write uuid\n";
3126 }; 3554 };
3127 3555
3128 warn "leave emergency perl save\n"; 3556 warn "leave emergency perl save\n";
3129} 3557}
3130 3558
3131sub post_cleanup { 3559sub post_cleanup {
3132 my ($make_core) = @_; 3560 my ($make_core) = @_;
3133 3561
3134 warn Carp::longmess "post_cleanup backtrace" 3562 warn Carp::longmess "post_cleanup backtrace"
3135 if $make_core; 3563 if $make_core;
3564
3565 my $fh = pidfile;
3566 unlink $PIDFILE if <$fh> == $$;
3136} 3567}
3568
3569# a safer delete_package, copied from Symbol
3570sub clear_package($) {
3571 my $pkg = shift;
3572
3573 # expand to full symbol table name if needed
3574 unless ($pkg =~ /^main::.*::$/) {
3575 $pkg = "main$pkg" if $pkg =~ /^::/;
3576 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3577 $pkg .= '::' unless $pkg =~ /::$/;
3578 }
3579
3580 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3581 my $stem_symtab = *{$stem}{HASH};
3582
3583 defined $stem_symtab and exists $stem_symtab->{$leaf}
3584 or return;
3585
3586 # clear all symbols
3587 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3588 for my $name (keys %$leaf_symtab) {
3589 _gv_clear *{"$pkg$name"};
3590# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3591 }
3592 warn "cleared package #$pkg\n";#d#
3593}
3594
3595our $RELOAD; # how many times to reload
3137 3596
3138sub do_reload_perl() { 3597sub do_reload_perl() {
3139 # can/must only be called in main 3598 # can/must only be called in main
3140 if ($Coro::current != $Coro::main) { 3599 if ($Coro::current != $Coro::main) {
3141 warn "can only reload from main coroutine"; 3600 warn "can only reload from main coroutine";
3142 return; 3601 return;
3143 } 3602 }
3144 3603
3604 return if $RELOAD++;
3605
3606 while ($RELOAD) {
3145 warn "reloading..."; 3607 warn "reloading...";
3146 3608
3147 warn "entering sync_job"; 3609 warn "entering sync_job";
3148 3610
3149 cf::sync_job { 3611 cf::sync_job {
3150 cf::write_runtime; # external watchdog should not bark 3612 cf::write_runtime_sync; # external watchdog should not bark
3151 cf::emergency_save; 3613 cf::emergency_save;
3152 cf::write_runtime; # external watchdog should not bark 3614 cf::write_runtime_sync; # external watchdog should not bark
3153 3615
3154 warn "syncing database to disk"; 3616 warn "syncing database to disk";
3155 BDB::db_env_txn_checkpoint $DB_ENV; 3617 BDB::db_env_txn_checkpoint $DB_ENV;
3156 3618
3157 # if anything goes wrong in here, we should simply crash as we already saved 3619 # if anything goes wrong in here, we should simply crash as we already saved
3158 3620
3159 warn "cancelling all WF_AUTOCANCEL watchers";
3160 for (Event::all_watchers) {
3161 $_->cancel if $_->data & WF_AUTOCANCEL;
3162 }
3163
3164 warn "flushing outstanding aio requests"; 3621 warn "flushing outstanding aio requests";
3165 for (;;) {
3166 BDB::flush;
3167 IO::AIO::flush;
3168 Coro::cede;
3169 last unless IO::AIO::nreqs || BDB::nreqs; 3622 while (IO::AIO::nreqs || BDB::nreqs) {
3170 warn "iterate..."; 3623 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3171 }
3172
3173 ++$RELOAD;
3174
3175 warn "cancelling all extension coros";
3176 $_->cancel for values %EXT_CORO;
3177 %EXT_CORO = ();
3178
3179 warn "removing commands";
3180 %COMMAND = ();
3181
3182 warn "removing ext/exti commands";
3183 %EXTCMD = ();
3184 %EXTICMD = ();
3185
3186 warn "unloading/nuking all extensions";
3187 for my $pkg (@EXTS) {
3188 warn "... unloading $pkg";
3189
3190 if (my $cb = $pkg->can ("unload")) {
3191 eval {
3192 $cb->($pkg);
3193 1
3194 } or warn "$pkg unloaded, but with errors: $@";
3195 } 3624 }
3196 3625
3197 warn "... nuking $pkg"; 3626 warn "cancelling all extension coros";
3198 Symbol::delete_package $pkg; 3627 $_->cancel for values %EXT_CORO;
3199 } 3628 %EXT_CORO = ();
3200 3629
3201 warn "unloading all perl modules loaded from $LIBDIR"; 3630 warn "removing commands";
3202 while (my ($k, $v) = each %INC) { 3631 %COMMAND = ();
3203 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3204 3632
3633 warn "removing ext/exti commands";
3634 %EXTCMD = ();
3635 %EXTICMD = ();
3636
3637 warn "unloading/nuking all extensions";
3638 for my $pkg (@EXTS) {
3205 warn "... unloading $k"; 3639 warn "... unloading $pkg";
3206 delete $INC{$k};
3207 3640
3208 $k =~ s/\.pm$//;
3209 $k =~ s/\//::/g;
3210
3211 if (my $cb = $k->can ("unload_module")) { 3641 if (my $cb = $pkg->can ("unload")) {
3642 eval {
3212 $cb->(); 3643 $cb->($pkg);
3644 1
3645 } or warn "$pkg unloaded, but with errors: $@";
3646 }
3647
3648 warn "... clearing $pkg";
3649 clear_package $pkg;
3213 } 3650 }
3214 3651
3215 Symbol::delete_package $k; 3652 warn "unloading all perl modules loaded from $LIBDIR";
3653 while (my ($k, $v) = each %INC) {
3654 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3655
3656 warn "... unloading $k";
3657 delete $INC{$k};
3658
3659 $k =~ s/\.pm$//;
3660 $k =~ s/\//::/g;
3661
3662 if (my $cb = $k->can ("unload_module")) {
3663 $cb->();
3664 }
3665
3666 clear_package $k;
3216 } 3667 }
3217 3668
3218 warn "getting rid of safe::, as good as possible"; 3669 warn "getting rid of safe::, as good as possible";
3219 Symbol::delete_package "safe::$_" 3670 clear_package "safe::$_"
3220 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3671 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3221 3672
3222 warn "unloading cf.pm \"a bit\""; 3673 warn "unloading cf.pm \"a bit\"";
3223 delete $INC{"cf.pm"}; 3674 delete $INC{"cf.pm"};
3224 delete $INC{"cf/pod.pm"}; 3675 delete $INC{"cf/pod.pm"};
3225 3676
3226 # don't, removes xs symbols, too, 3677 # don't, removes xs symbols, too,
3227 # and global variables created in xs 3678 # and global variables created in xs
3228 #Symbol::delete_package __PACKAGE__; 3679 #clear_package __PACKAGE__;
3229 3680
3230 warn "unload completed, starting to reload now"; 3681 warn "unload completed, starting to reload now";
3231 3682
3232 warn "reloading cf.pm"; 3683 warn "reloading cf.pm";
3233 require cf; 3684 require cf;
3234 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3685 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3235 3686
3236 warn "loading config and database again"; 3687 warn "loading config and database again";
3237 cf::cfg_load; 3688 cf::reload_config;
3238 3689
3239 warn "loading extensions"; 3690 warn "loading extensions";
3240 cf::load_extensions; 3691 cf::load_extensions;
3241 3692
3242 warn "reattaching attachments to objects/players"; 3693 warn "reattaching attachments to objects/players";
3243 _global_reattach; # objects, sockets 3694 _global_reattach; # objects, sockets
3244 warn "reattaching attachments to maps"; 3695 warn "reattaching attachments to maps";
3245 reattach $_ for values %MAP; 3696 reattach $_ for values %MAP;
3246 warn "reattaching attachments to players"; 3697 warn "reattaching attachments to players";
3247 reattach $_ for values %PLAYER; 3698 reattach $_ for values %PLAYER;
3248 3699
3249 warn "leaving sync_job"; 3700 warn "leaving sync_job";
3250 3701
3251 1 3702 1
3252 } or do { 3703 } or do {
3253 warn $@; 3704 warn $@;
3254 warn "error while reloading, exiting."; 3705 cf::cleanup "error while reloading, exiting.";
3255 exit 1;
3256 }; 3706 };
3257 3707
3258 warn "reloaded"; 3708 warn "reloaded";
3709 --$RELOAD;
3710 }
3259}; 3711};
3260 3712
3261our $RELOAD_WATCHER; # used only during reload 3713our $RELOAD_WATCHER; # used only during reload
3262 3714
3263sub reload_perl() { 3715sub reload_perl() {
3264 # doing reload synchronously and two reloads happen back-to-back, 3716 # doing reload synchronously and two reloads happen back-to-back,
3265 # coro crashes during coro_state_free->destroy here. 3717 # coro crashes during coro_state_free->destroy here.
3266 3718
3267 $RELOAD_WATCHER ||= Event->timer ( 3719 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3268 reentrant => 0,
3269 after => 0,
3270 data => WF_AUTOCANCEL,
3271 cb => sub {
3272 do_reload_perl; 3720 do_reload_perl;
3273 undef $RELOAD_WATCHER; 3721 undef $RELOAD_WATCHER;
3274 },
3275 ); 3722 };
3276} 3723}
3277 3724
3278register_command "reload" => sub { 3725register_command "reload" => sub {
3279 my ($who, $arg) = @_; 3726 my ($who, $arg) = @_;
3280 3727
3281 if ($who->flag (FLAG_WIZ)) { 3728 if ($who->flag (FLAG_WIZ)) {
3282 $who->message ("reloading server."); 3729 $who->message ("reloading server.");
3730 async {
3731 $Coro::current->{desc} = "perl_reload";
3283 async { reload_perl }; 3732 reload_perl;
3733 };
3284 } 3734 }
3285}; 3735};
3286 3736
3287unshift @INC, $LIBDIR; 3737unshift @INC, $LIBDIR;
3288 3738
3290 3740
3291our @WAIT_FOR_TICK; 3741our @WAIT_FOR_TICK;
3292our @WAIT_FOR_TICK_BEGIN; 3742our @WAIT_FOR_TICK_BEGIN;
3293 3743
3294sub wait_for_tick { 3744sub wait_for_tick {
3295 return unless $TICK_WATCHER->is_active;
3296 return if $Coro::current == $Coro::main; 3745 return if tick_inhibit || $Coro::current == $Coro::main;
3297 3746
3298 my $signal = new Coro::Signal; 3747 my $signal = new Coro::Signal;
3299 push @WAIT_FOR_TICK, $signal; 3748 push @WAIT_FOR_TICK, $signal;
3300 $signal->wait; 3749 $signal->wait;
3301} 3750}
3302 3751
3303sub wait_for_tick_begin { 3752sub wait_for_tick_begin {
3304 return unless $TICK_WATCHER->is_active;
3305 return if $Coro::current == $Coro::main; 3753 return if tick_inhibit || $Coro::current == $Coro::main;
3306 3754
3307 my $signal = new Coro::Signal; 3755 my $signal = new Coro::Signal;
3308 push @WAIT_FOR_TICK_BEGIN, $signal; 3756 push @WAIT_FOR_TICK_BEGIN, $signal;
3309 $signal->wait; 3757 $signal->wait;
3310} 3758}
3311 3759
3312 my $min = 1e6;#d# 3760sub tick {
3313 my $avg = 10;
3314$TICK_WATCHER = Event->timer (
3315 reentrant => 0,
3316 parked => 1,
3317 prio => 0,
3318 at => $NEXT_TICK || $TICK,
3319 data => WF_AUTOCANCEL,
3320 cb => sub {
3321 if ($Coro::current != $Coro::main) { 3761 if ($Coro::current != $Coro::main) {
3322 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3762 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3323 unless ++$bug_warning > 10; 3763 unless ++$bug_warning > 10;
3324 return; 3764 return;
3325 } 3765 }
3326 3766
3327 $NOW = $tick_start = Event::time;
3328
3329 cf::server_tick; # one server iteration 3767 cf::server_tick; # one server iteration
3330 3768
3331 0 && sync_job {#d# 3769 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3332 for(1..10) { 3770 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3333 my $t = Event::time; 3771 Coro::async_pool {
3334 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3772 $Coro::current->{desc} = "runtime saver";
3335 or die; 3773 write_runtime_sync
3336 3774 or warn "ERROR: unable to write runtime file: $!";
3337 $map->width (50);
3338 $map->height (50);
3339 $map->alloc;
3340 $map->_load_objects ("/tmp/x.map", 1);
3341 my $t = Event::time - $t;
3342
3343 #next unless $t < 0.0013;#d#
3344 if ($t < $min) {
3345 $min = $t;
3346 }
3347 $avg = $avg * 0.99 + $t * 0.01;
3348 }
3349 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3350 exit 0;
3351 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3352 }; 3775 };
3776 }
3353 3777
3354 $RUNTIME += $TICK;
3355 $NEXT_TICK += $TICK;
3356
3357 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3358 $NEXT_RUNTIME_WRITE = $NOW + 10;
3359 Coro::async_pool {
3360 write_runtime
3361 or warn "ERROR: unable to write runtime file: $!";
3362 };
3363 }
3364
3365# my $AFTER = Event::time;
3366# warn $AFTER - $NOW;#d#
3367
3368 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3778 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3369 $sig->send; 3779 $sig->send;
3370 } 3780 }
3371 while (my $sig = shift @WAIT_FOR_TICK) { 3781 while (my $sig = shift @WAIT_FOR_TICK) {
3372 $sig->send; 3782 $sig->send;
3373 } 3783 }
3374 3784
3375 $NOW = Event::time; 3785 $LOAD = ($NOW - $TICK_START) / $TICK;
3376
3377 # if we are delayed by four ticks or more, skip them all
3378 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3379
3380 $TICK_WATCHER->at ($NEXT_TICK);
3381 $TICK_WATCHER->start;
3382
3383 $LOAD = ($NOW - $tick_start) / $TICK;
3384 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3786 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3385 3787
3386 _post_tick; 3788 if (0) {
3387 3789 if ($NEXT_TICK) {
3388 3790 my $jitter = $TICK_START - $NEXT_TICK;
3791 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3792 warn "jitter $JITTER\n";#d#
3793 }
3389 }, 3794 }
3390); 3795}
3391 3796
3392{ 3797{
3393 BDB::max_poll_time $TICK * 0.1; 3798 # configure BDB
3394 $BDB_POLL_WATCHER = Event->io ( 3799
3395 reentrant => 0,
3396 fd => BDB::poll_fileno,
3397 poll => 'r',
3398 prio => 0,
3399 data => WF_AUTOCANCEL,
3400 cb => \&BDB::poll_cb,
3401 );
3402 BDB::min_parallel 8; 3800 BDB::min_parallel 8;
3403 3801 BDB::max_poll_reqs $TICK * 0.1;
3404 BDB::set_sync_prepare { 3802 $AnyEvent::BDB::WATCHER->priority (1);
3405 my $status;
3406 my $current = $Coro::current;
3407 (
3408 sub {
3409 $status = $!;
3410 $current->ready; undef $current;
3411 },
3412 sub {
3413 Coro::schedule while defined $current;
3414 $! = $status;
3415 },
3416 )
3417 };
3418 3803
3419 unless ($DB_ENV) { 3804 unless ($DB_ENV) {
3420 $DB_ENV = BDB::db_env_create; 3805 $DB_ENV = BDB::db_env_create;
3806 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3807 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3808 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3809 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3810 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3421 3811
3422 cf::sync_job { 3812 cf::sync_job {
3423 eval { 3813 eval {
3424 BDB::db_env_open 3814 BDB::db_env_open
3425 $DB_ENV, 3815 $DB_ENV,
3427 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3817 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3428 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3818 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3429 0666; 3819 0666;
3430 3820
3431 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3821 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3432
3433 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3434 $DB_ENV->set_lk_detect;
3435 }; 3822 };
3436 3823
3437 cf::cleanup "db_env_open(db): $@" if $@; 3824 cf::cleanup "db_env_open(db): $@" if $@;
3438 }; 3825 };
3439 } 3826 }
3827
3828 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3829 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3830 };
3831 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3832 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3833 };
3834 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3835 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3836 };
3440} 3837}
3441 3838
3442{ 3839{
3840 # configure IO::AIO
3841
3443 IO::AIO::min_parallel 8; 3842 IO::AIO::min_parallel 8;
3444
3445 undef $Coro::AIO::WATCHER;
3446 IO::AIO::max_poll_time $TICK * 0.1; 3843 IO::AIO::max_poll_time $TICK * 0.1;
3447 $AIO_POLL_WATCHER = Event->io ( 3844 undef $AnyEvent::AIO::WATCHER;
3448 reentrant => 0,
3449 data => WF_AUTOCANCEL,
3450 fd => IO::AIO::poll_fileno,
3451 poll => 'r',
3452 prio => 6,
3453 cb => \&IO::AIO::poll_cb,
3454 );
3455} 3845}
3456 3846
3457my $_log_backtrace; 3847my $_log_backtrace;
3458 3848
3459sub _log_backtrace { 3849sub _log_backtrace {
3462 $msg =~ s/\n//; 3852 $msg =~ s/\n//;
3463 3853
3464 # limit the # of concurrent backtraces 3854 # limit the # of concurrent backtraces
3465 if ($_log_backtrace < 2) { 3855 if ($_log_backtrace < 2) {
3466 ++$_log_backtrace; 3856 ++$_log_backtrace;
3857 my $perl_bt = Carp::longmess $msg;
3467 async { 3858 async {
3859 $Coro::current->{desc} = "abt $msg";
3860
3468 my @bt = fork_call { 3861 my @bt = fork_call {
3469 @addr = map { sprintf "%x", $_ } @addr; 3862 @addr = map { sprintf "%x", $_ } @addr;
3470 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3863 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3471 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3864 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3472 or die "addr2line: $!"; 3865 or die "addr2line: $!";
3480 } 3873 }
3481 3874
3482 @funcs 3875 @funcs
3483 }; 3876 };
3484 3877
3485 LOG llevInfo, "[ABT] $msg\n"; 3878 LOG llevInfo, "[ABT] $perl_bt\n";
3879 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3486 LOG llevInfo, "[ABT] $_\n" for @bt; 3880 LOG llevInfo, "[ABT] $_\n" for @bt;
3487 --$_log_backtrace; 3881 --$_log_backtrace;
3488 }; 3882 };
3489 } else { 3883 } else {
3490 LOG llevInfo, "[ABT] $msg\n"; 3884 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines