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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines