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.368 by root, Wed Sep 12 11:18:25 2007 UTC vs.
Revision 1.459 by root, Sat Dec 13 21:46:12 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
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.32 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::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 76
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 78
52our %COMMAND = (); 79our %COMMAND = ();
53our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
56our %EXTCMD = (); 83our %EXTCMD = ();
57our %EXTICMD = (); 84our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
60 87
61our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 89our @EVENT;
63 90
64our $CONFDIR = confdir; 91our $CONFDIR = confdir;
65our $DATADIR = datadir; 92our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
105our %RESOURCE;
75 106
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $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 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 109our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
83 111
84our $BDB_POLL_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 115our $DB_ENV;
88 116
89our %CFG; 117our %CFG;
90 118
91our $UPTIME; $UPTIME ||= time; 119our $UPTIME; $UPTIME ||= time;
92our $RUNTIME; 120our $RUNTIME;
121our $NOW;
93 122
94our (%PLAYER, %PLAYER_LOADING); # all users 123our (%PLAYER, %PLAYER_LOADING); # all users
95our (%MAP, %MAP_LOADING ); # all maps 124our (%MAP, %MAP_LOADING ); # all maps
96our $LINK_MAP; # the special {link} map, which is always available 125our $LINK_MAP; # the special {link} map, which is always available
97 126
98# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
99our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
100 129
101our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
102our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
103our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
104 138
105binmode STDOUT; 139binmode STDOUT;
106binmode STDERR; 140binmode STDERR;
107 141
108# read virtual server time, if available 142# read virtual server time, if available
109unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
110 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
111 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
112 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
113} 147}
114 148
115mkdir $_ 149mkdir $_
116 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
161 195
162The raw value load value from the last tick. 196The raw value load value from the last tick.
163 197
164=item %cf::CFG 198=item %cf::CFG
165 199
166Configuration for the server, loaded from C</etc/crossfire/config>, or 200Configuration for the server, loaded from C</etc/deliantra-server/config>, or
167from wherever your confdir points to. 201from wherever your confdir points to.
168 202
169=item cf::wait_for_tick, cf::wait_for_tick_begin 203=item cf::wait_for_tick, cf::wait_for_tick_begin
170 204
171These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 205These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
192 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 226 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
193 227
194 LOG llevError, $msg; 228 LOG llevError, $msg;
195 }; 229 };
196} 230}
231
232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
241 warn Carp::longmess $_[0];
242 Coro::terminate
243};
244
245$SIG{__DIE__} = sub { }; #d#?
197 246
198@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
199@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
200@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
201@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
208for my $pkg (qw( 257for my $pkg (qw(
209 cf::global cf::attachable 258 cf::global cf::attachable
210 cf::object cf::object::player 259 cf::object cf::object::player
211 cf::client cf::player 260 cf::client cf::player
212 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
213 cf::map cf::party cf::region 263 cf::party cf::region
214)) { 264)) {
215 no strict 'refs';
216 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
217} 266}
218 267
219$Event::DIED = sub { 268$EV::DIED = sub {
220 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
221}; 270};
222 271
223############################################################################# 272#############################################################################
224 273
247 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 296 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
248 $d 297 $d
249 } || "[unable to dump $_[0]: '$@']"; 298 } || "[unable to dump $_[0]: '$@']";
250} 299}
251 300
252=item $ref = cf::from_json $json 301=item $ref = cf::decode_json $json
253 302
254Converts a JSON string into the corresponding perl data structure. 303Converts a JSON string into the corresponding perl data structure.
255 304
256=item $json = cf::to_json $ref 305=item $json = cf::encode_json $ref
257 306
258Converts a perl data structure into its JSON representation. 307Converts a perl data structure into its JSON representation.
259 308
260=cut 309=cut
261 310
262our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
263 312
264sub to_json ($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
265sub from_json ($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
266 329
267=item cf::lock_wait $string 330=item cf::lock_wait $string
268 331
269Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
270 333
271=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
272 335
273Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
274a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
275for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
276returned. 339returned.
277 340
278Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
279deadlocked coro. 342deadlocked coro.
285 348
286Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
287 350
288=cut 351=cut
289 352
290our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
291our %LOCKER;#d#
292 354
293sub lock_wait($) { 355sub lock_wait($) {
294 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
295
296 if ($LOCKER{$key} == $Coro::current) {#d#
297 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
298 return;#d#
299 }#d#
300
301 # wait for lock, if any
302 while ($LOCK{$key}) {
303 push @{ $LOCK{$key} }, $Coro::current;
304 Coro::schedule;
305 }
306} 357}
307 358
308sub lock_acquire($) { 359sub lock_acquire($) {
309 my ($key) = @_; 360 $LOCKS->guard ($_[0])
310
311 # wait, to be sure we are not locked
312 lock_wait $key;
313
314 $LOCK{$key} = [];
315 $LOCKER{$key} = $Coro::current;#d#
316
317 Coro::guard {
318 delete $LOCKER{$key};#d#
319 # wake up all waiters, to be on the safe side
320 $_->ready for @{ delete $LOCK{$key} };
321 }
322} 361}
323 362
324sub lock_active($) { 363sub lock_active($) {
325 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
326
327 ! ! $LOCK{$key}
328} 365}
329 366
330sub freeze_mainloop { 367sub freeze_mainloop {
331 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
332 369
333 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
334 $TICK_WATCHER->start; 371}
335 }; 372
336 $TICK_WATCHER->stop; 373=item cf::periodic $interval, $cb
337 $guard 374
375Like EV::periodic, but randomly selects a starting point so that the actions
376get spread over timer.
377
378=cut
379
380sub periodic($$) {
381 my ($interval, $cb) = @_;
382
383 my $start = rand List::Util::min 180, $interval;
384
385 EV::periodic $start, $interval, 0, $cb
338} 386}
339 387
340=item cf::get_slot $time[, $priority[, $name]] 388=item cf::get_slot $time[, $priority[, $name]]
341 389
342Allocate $time seconds of blocking CPU time at priority C<$priority>: 390Allocate $time seconds of blocking CPU time at priority C<$priority>:
353our @SLOT_QUEUE; 401our @SLOT_QUEUE;
354our $SLOT_QUEUE; 402our $SLOT_QUEUE;
355 403
356$SLOT_QUEUE->cancel if $SLOT_QUEUE; 404$SLOT_QUEUE->cancel if $SLOT_QUEUE;
357$SLOT_QUEUE = Coro::async { 405$SLOT_QUEUE = Coro::async {
406 $Coro::current->desc ("timeslot manager");
407
358 my $signal = new Coro::Signal; 408 my $signal = new Coro::Signal;
359 409
360 while () { 410 while () {
361 next_job: 411 next_job:
362 my $avail = cf::till_tick; 412 my $avail = cf::till_tick;
370 } 420 }
371 } 421 }
372 } 422 }
373 423
374 if (@SLOT_QUEUE) { 424 if (@SLOT_QUEUE) {
375 # we do not use wait_For_tick() as it returns immediately when tick is inactive 425 # we do not use wait_for_tick() as it returns immediately when tick is inactive
376 push @cf::WAIT_FOR_TICK, $signal; 426 push @cf::WAIT_FOR_TICK, $signal;
377 $signal->wait; 427 $signal->wait;
378 } else { 428 } else {
379 Coro::schedule; 429 Coro::schedule;
380 } 430 }
381 } 431 }
382}; 432};
383 433
384sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
385 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
386 438
387 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
388 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
389 441
403 455
404BEGIN { *async = \&Coro::async_pool } 456BEGIN { *async = \&Coro::async_pool }
405 457
406=item cf::sync_job { BLOCK } 458=item cf::sync_job { BLOCK }
407 459
408The design of Crossfire TRT requires that the main coroutine ($Coro::main) 460The design of Deliantra requires that the main coroutine ($Coro::main)
409is always able to handle events or runnable, as Crossfire TRT is only 461is always able to handle events or runnable, as Deliantra is only
410partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 462partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
411acceptable. 463acceptable.
412 464
413If it must be done, put the blocking parts into C<sync_job>. This will run 465If it must be done, put the blocking parts into C<sync_job>. This will run
414the given BLOCK in another coroutine while waiting for the result. The 466the given BLOCK in another coroutine while waiting for the result. The
419 471
420sub sync_job(&) { 472sub sync_job(&) {
421 my ($job) = @_; 473 my ($job) = @_;
422 474
423 if ($Coro::current == $Coro::main) { 475 if ($Coro::current == $Coro::main) {
424 my $time = Event::time; 476 my $time = EV::time;
425 477
426 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
427 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
428 480
429 # TODO: use suspend/resume instead 481 LOG llevError, Carp::longmess "sync job";#d#
430 # (but this is cancel-safe) 482
431 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
432 484
433 my $busy = 1; 485 my $busy = 1;
434 my @res; 486 my @res;
435 487
436 (async { 488 (async {
489 $Coro::current->desc ("sync job coro");
437 @res = eval { $job->() }; 490 @res = eval { $job->() };
438 warn $@ if $@; 491 warn $@ if $@;
439 undef $busy; 492 undef $busy;
440 })->prio (Coro::PRIO_MAX); 493 })->prio (Coro::PRIO_MAX);
441 494
442 while ($busy) { 495 while ($busy) {
443 Coro::cede or Event::one_event; 496 if (Coro::nready) {
497 Coro::cede_notself;
498 } else {
499 EV::loop EV::LOOP_ONESHOT;
444 } 500 }
501 }
445 502
446 $time = Event::time - $time; 503 my $time = EV::time - $time;
447 504
448 LOG llevError | logBacktrace, Carp::longmess "long sync job"
449 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
450
451 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
452 506
453 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
454 } else { 508 } else {
455 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
456 510
481=item fork_call { }, $args 535=item fork_call { }, $args
482 536
483Executes the given code block with the given arguments in a seperate 537Executes the given code block with the given arguments in a seperate
484process, returning the results. Everything must be serialisable with 538process, returning the results. Everything must be serialisable with
485Coro::Storable. May, of course, block. Note that the executed sub may 539Coro::Storable. May, of course, block. Note that the executed sub may
486never block itself or use any form of Event handling. 540never block itself or use any form of event handling.
487 541
488=cut 542=cut
489 543
490sub fork_call(&@) { 544sub fork_call(&@) {
491 my ($cb, @args) = @_; 545 my ($cb, @args) = @_;
498 reset_signals; 552 reset_signals;
499 &$cb 553 &$cb
500 }, @args; 554 }, @args;
501 555
502 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
503} 584}
504 585
505=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
506 587
507Returns a single value from the environment database. 588Returns a single value from the environment database.
646 727
647############################################################################# 728#############################################################################
648 729
649=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
650 731
651Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
652attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
653to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
654 735
655In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
656C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
657Crossfire TRT). 738Deliantra).
658 739
659=over 4 740=over 4
660 741
661=item $attachable->attach ($attachment, key => $value...) 742=item $attachable->attach ($attachment, key => $value...)
662 743
706=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
707 788
708Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
709given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
710 791
711Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
712that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
713 794
714These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
715 796
716=over 4 797=over 4
944 } 1025 }
945 1026
946 0 1027 0
947} 1028}
948 1029
949=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1030=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
950 1031
951=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
952 1033
953Generate an object-specific event with the given arguments. 1034Generate an object-specific event with the given arguments.
954 1035
960 1041
961=cut 1042=cut
962 1043
963############################################################################# 1044#############################################################################
964# object support 1045# object support
965#
966 1046
1047sub _object_equal($$);
1048sub _object_equal($$) {
1049 my ($a, $b) = @_;
1050
1051 return 0 unless (ref $a) eq (ref $b);
1052
1053 if ("HASH" eq ref $a) {
1054 my @ka = keys %$a;
1055 my @kb = keys %$b;
1056
1057 return 0 if @ka != @kb;
1058
1059 for (0 .. $#ka) {
1060 return 0 unless $ka[$_] eq $kb[$_];
1061 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1062 }
1063
1064 } elsif ("ARRAY" eq ref $a) {
1065
1066 return 0 if @$a != @$b;
1067
1068 for (0 .. $#$a) {
1069 return 0 unless _object_equal $a->[$_], $b->[$_];
1070 }
1071
1072 } elsif ($a ne $b) {
1073 return 0;
1074 }
1075
1076 1
1077}
1078
1079our $SLOW_MERGES;#d#
967sub _can_merge { 1080sub _can_merge {
968 my ($ob1, $ob2) = @_; 1081 my ($ob1, $ob2) = @_;
969 1082
970 local $Storable::canonical = 1; 1083 ++$SLOW_MERGES;#d#
971 my $fob1 = Storable::freeze $ob1;
972 my $fob2 = Storable::freeze $ob2;
973 1084
974 $fob1 eq $fob2 1085 # we do the slow way here
1086 return _object_equal $ob1, $ob2
975} 1087}
976 1088
977sub reattach { 1089sub reattach {
978 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
979 my ($obj) = @_; 1091 my ($obj) = @_;
980 1092
1093 # no longer needed after getting rid of delete_package?
981 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
982 1095
983 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
984 1097
985 @$registry = (); 1098 @$registry = ();
986 1099
1001cf::attachable->attach ( 1114cf::attachable->attach (
1002 prio => -1000000, 1115 prio => -1000000,
1003 on_instantiate => sub { 1116 on_instantiate => sub {
1004 my ($obj, $data) = @_; 1117 my ($obj, $data) = @_;
1005 1118
1006 $data = from_json $data; 1119 $data = decode_json $data;
1007 1120
1008 for (@$data) { 1121 for (@$data) {
1009 my ($name, $args) = @$_; 1122 my ($name, $args) = @$_;
1010 1123
1011 $obj->attach ($name, %{$args || {} }); 1124 $obj->attach ($name, %{$args || {} });
1024 }, 1137 },
1025); 1138);
1026 1139
1027sub object_freezer_save { 1140sub object_freezer_save {
1028 my ($filename, $rdata, $objs) = @_; 1141 my ($filename, $rdata, $objs) = @_;
1029
1030 my $guard = cf::lock_acquire "io";
1031 1142
1032 sync_job { 1143 sync_job {
1033 if (length $$rdata) { 1144 if (length $$rdata) {
1034 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1035 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1036 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1037 1148
1038 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1039 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1040 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1041 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1042 close $fh; 1153 aio_close $fh;
1043 1154
1044 if (@$objs) { 1155 if (@$objs) {
1045 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1046 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1047 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1048 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1049 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1050 close $fh; 1161 aio_close $fh;
1051 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1052 } 1163 }
1053 } else { 1164 } else {
1054 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1055 } 1166 }
1056 1167
1057 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1058 } else { 1172 } else {
1059 warn "FATAL: $filename~: $!\n"; 1173 warn "FATAL: $filename~: $!\n";
1060 } 1174 }
1061 } else { 1175 } else {
1062 aio_unlink $filename; 1176 aio_unlink $filename;
1063 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1064 } 1178 }
1065 }; 1179 };
1066
1067 undef $guard;
1068} 1180}
1069 1181
1070sub object_freezer_as_string { 1182sub object_freezer_as_string {
1071 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1072 1184
1077 1189
1078sub object_thawer_load { 1190sub object_thawer_load {
1079 my ($filename) = @_; 1191 my ($filename) = @_;
1080 1192
1081 my ($data, $av); 1193 my ($data, $av);
1082
1083 my $guard = cf::lock_acquire "io";
1084 1194
1085 (aio_load $filename, $data) >= 0 1195 (aio_load $filename, $data) >= 0
1086 or return; 1196 or return;
1087 1197
1088 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1089 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1090 or return; 1200 or return;
1091 1201
1092 undef $guard;
1093 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1094 } 1204 }
1095 1205
1096 utf8::decode (my $decname = $filename); 1206 utf8::decode (my $decname = $filename);
1097 warn sprintf "loading %s (%d,%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1098 $decname, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1159 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1160 1270
1161 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1162} 1272}
1163 1273
1274use File::Glob ();
1275
1164cf::player->attach ( 1276cf::player->attach (
1165 on_command => sub { 1277 on_command => sub {
1166 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1167 1279
1168 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1200 1312
1201 cf::override; 1313 cf::override;
1202 }, 1314 },
1203); 1315);
1204 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1205sub load_extensions { 1330sub load_extensions {
1206 cf::sync_job { 1331 cf::sync_job {
1207 my %todo; 1332 my %todo;
1208 1333
1209 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1228 1353
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1356
1232 $ext{source} = 1357 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1235 . $source 1360 . $source
1236 . "\n};\n1"; 1361 . "\n};\n1";
1237 1362
1238 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1256 1381
1257 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1383 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1385 }
1262 1386
1263 warn $msg; 1387 warn $msg;
1264 } 1388 }
1265 1389
1279 1403
1280=back 1404=back
1281 1405
1282=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1283 1407
1284Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1285 1409
1286=cut 1410=cut
1287 1411
1288package cf::player; 1412package cf::player;
1289 1413
1332 1456
1333sub exists($) { 1457sub exists($) {
1334 my ($login) = @_; 1458 my ($login) = @_;
1335 1459
1336 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1337 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1338} 1462}
1339 1463
1340sub find($) { 1464sub find($) {
1341 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1342 my $login = $_[0]; 1466 my $login = $_[0];
1352 aio_unlink +(playerdir $login) . "/$login.pl"; 1476 aio_unlink +(playerdir $login) . "/$login.pl";
1353 1477
1354 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1355 or return; 1479 or return;
1356 1480
1357 $f->next;
1358 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1359 or return; 1482 or return;
1483
1360 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1361 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1362 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1363 } 1487 }
1364 } 1488 }
1374 1498
1375 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1376 1500
1377 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1378 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1379 1505
1380 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1381 cf::cede_to_tick; 1507 cf::cede_to_tick;
1382} 1508}
1383 1509
1415 my ($pl) = @_; 1541 my ($pl) = @_;
1416 1542
1417 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1418 1544
1419 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1420 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1421 1547
1422 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1423 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1424 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1425 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1426 1554
1427 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1428 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1467 1595
1468 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1469 my $path = path $login; 1597 my $path = path $login;
1470 1598
1471 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1472 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1473 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1474 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1475 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1476 } 1605 }
1477 1606
1508 } 1637 }
1509 1638
1510 \@paths 1639 \@paths
1511} 1640}
1512 1641
1513=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1514 1643
1515Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1516
1517=cut
1518
1519sub expand_cfpod {
1520 ((my $self), (local $_)) = @_;
1521
1522 # escape & and <
1523 s/&/&amp;/g;
1524 s/(?<![BIUGHT])</&lt;/g;
1525
1526 # this is buggy, it needs to properly take care of nested <'s
1527
1528 1 while
1529 # replace B<>, I<>, U<> etc.
1530 s/B<([^\>]*)>/<b>$1<\/b>/
1531 || s/I<([^\>]*)>/<i>$1<\/i>/
1532 || s/U<([^\>]*)>/<u>$1<\/u>/
1533 || s/T<([^\>]*)>/<big><b>$1<\/b><\/big>/
1534 # replace G<male|female> tags
1535 || s{G<([^>|]*)\|([^>]*)>}{
1536 $self->gender ? $2 : $1
1537 }ge
1538 # replace H<hint text>
1539 || s{H<([^\>]*)>}
1540 {
1541 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1542 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1543 "")
1544 [$self->{hintmode}]
1545 }ge;
1546
1547 # create single paragraphs (very hackish)
1548 s/(?<=\S)\n(?=\w)/ /g;
1549
1550 # compress some whitespace
1551 s/\s+\n/\n/g; # ws line-ends
1552 s/\n\n+/\n/g; # double lines
1553 s/^\n+//; # beginning lines
1554 s/\n+$//; # ending lines
1555
1556 $_
1557}
1558
1559sub hintmode {
1560 $_[0]{hintmode} = $_[1] if @_ > 1;
1561 $_[0]{hintmode}
1562}
1563 1645
1564=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1565 1647
1566Sends an ext reply to the player. 1648Sends an ext reply to the player.
1567 1649
1634our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1635our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1636 1718
1637sub generate_random_map { 1719sub generate_random_map {
1638 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1639 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1640 $self->_create_random_map ( 1725 $self->_create_random_map (
1641 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1642 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1643 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1765 1850
1766# the temporary/swap location 1851# the temporary/swap location
1767sub save_path { 1852sub save_path {
1768 my ($self) = @_; 1853 my ($self) = @_;
1769 1854
1770 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1771 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1772} 1857}
1773 1858
1774# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1775sub uniq_path { 1860sub uniq_path {
1776 my ($self) = @_; 1861 my ($self) = @_;
1777 1862
1778 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1779 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1780} 1865}
1781 1866
1782# and all this just because we cannot iterate over 1867# and all this just because we cannot iterate over
1783# all maps in C++... 1868# all maps in C++...
1877sub find { 1962sub find {
1878 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1879 1964
1880 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1881 1966
1882 cf::lock_wait "map_data:$path";#d#remove 1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1883 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1884 1969
1885 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
1886 my $guard1 = cf::lock_acquire "map_find:$path";
1887 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1888
1889 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
1890 or return; 1972 or return;
1891 1973
1892 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1893 1975
1895 or return; 1977 or return;
1896 1978
1897 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1979 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1898 # doing this can freeze the server in a sync job, obviously 1980 # doing this can freeze the server in a sync job, obviously
1899 #$cf::WAIT_FOR_TICK->wait; 1981 #$cf::WAIT_FOR_TICK->wait;
1982 undef $guard2;
1900 undef $guard1; 1983 undef $guard1;
1901 undef $guard2;
1902 $map->reset; 1984 $map->reset;
1903 return find $path; 1985 return find $path;
1904 } 1986 }
1905 1987
1906 $cf::MAP{$path} = $map 1988 $cf::MAP{$path} = $map
1933 my $f = new_from_file cf::object::thawer $self->{load_path}; 2015 my $f = new_from_file cf::object::thawer $self->{load_path};
1934 $f->skip_block; 2016 $f->skip_block;
1935 $self->_load_objects ($f) 2017 $self->_load_objects ($f)
1936 or return; 2018 or return;
1937 2019
1938 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2020 $self->post_load_original
1939 if delete $self->{load_original}; 2021 if delete $self->{load_original};
1940 2022
1941 if (my $uniq = $self->uniq_path) { 2023 if (my $uniq = $self->uniq_path) {
1942 utf8::encode $uniq; 2024 utf8::encode $uniq;
1943 unless (aio_stat $uniq) { 2025 unless (aio_stat $uniq) {
1969 } 2051 }
1970 2052
1971 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
1972 $self->last_access ($cf::RUNTIME); 2054 $self->last_access ($cf::RUNTIME);
1973 2055
1974 $self->in_memory (cf::MAP_IN_MEMORY); 2056 $self->in_memory (cf::MAP_ACTIVE);
1975 } 2057 }
1976 2058
1977 $self->post_load; 2059 $self->post_load;
1978} 2060}
1979 2061
2037 my ($path, $origin, $load) = @_; 2119 my ($path, $origin, $load) = @_;
2038 2120
2039 $path = normalise $path, $origin && $origin->{path}; 2121 $path = normalise $path, $origin && $origin->{path};
2040 2122
2041 if (my $map = $cf::MAP{$path}) { 2123 if (my $map = $cf::MAP{$path}) {
2042 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2043 } 2125 }
2044 2126
2045 $MAP_PREFETCH{$path} |= $load; 2127 $MAP_PREFETCH{$path} |= $load;
2046 2128
2047 $MAP_PREFETCHER ||= cf::async { 2129 $MAP_PREFETCHER ||= cf::async {
2130 $Coro::current->{desc} = "map prefetcher";
2131
2048 while (%MAP_PREFETCH) { 2132 while (%MAP_PREFETCH) {
2049 while (my ($k, $v) = each %MAP_PREFETCH) { 2133 while (my ($k, $v) = each %MAP_PREFETCH) {
2050 if (my $map = find $k) { 2134 if (my $map = find $k) {
2051 $map->load if $v; 2135 $map->load if $v;
2052 } 2136 }
2078 return if $self->{deny_save}; 2162 return if $self->{deny_save};
2079 2163
2080 local $self->{last_access} = $self->last_access;#d# 2164 local $self->{last_access} = $self->last_access;#d#
2081 2165
2082 cf::async { 2166 cf::async {
2167 $Coro::current->{desc} = "map player save";
2083 $_->contr->save for $self->players; 2168 $_->contr->save for $self->players;
2084 }; 2169 };
2170
2171 cf::get_slot 0.02;
2085 2172
2086 if ($uniq) { 2173 if ($uniq) {
2087 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2174 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2088 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2175 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2089 } else { 2176 } else {
2098 $self->save; 2185 $self->save;
2099 2186
2100 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2101 2188
2102 return if $self->players; 2189 return if $self->players;
2103 return if $self->in_memory != cf::MAP_IN_MEMORY; 2190 return if $self->in_memory != cf::MAP_ACTIVE;
2104 return if $self->{deny_save}; 2191 return if $self->{deny_save};
2105 2192
2106 $self->in_memory (cf::MAP_SWAPPED); 2193 $self->in_memory (cf::MAP_SWAPPED);
2107 2194
2108 $self->deactivate; 2195 $self->deactivate;
2226 2313
2227sub unique_maps() { 2314sub unique_maps() {
2228 [ 2315 [
2229 map { 2316 map {
2230 utf8::decode $_; 2317 utf8::decode $_;
2231 /\.map$/ 2318 s/\.map$//; # TODO future compatibility hack
2319 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2320 ? ()
2232 ? normalise $_ 2321 : normalise $_
2233 : ()
2234 } @{ aio_readdir $UNIQUEDIR or [] } 2322 } @{ aio_readdir $UNIQUEDIR or [] }
2235 ] 2323 ]
2236} 2324}
2237 2325
2238package cf;
2239
2240=back 2326=back
2241 2327
2242=head3 cf::object 2328=head3 cf::object
2243 2329
2244=cut 2330=cut
2247 2333
2248=over 4 2334=over 4
2249 2335
2250=item $ob->inv_recursive 2336=item $ob->inv_recursive
2251 2337
2252Returns the inventory of the object _and_ their inventories, recursively. 2338Returns the inventory of the object I<and> their inventories, recursively,
2339but I<not> the object itself.
2253 2340
2254=cut 2341=cut
2255 2342
2256sub inv_recursive_; 2343sub inv_recursive_;
2257sub inv_recursive_ { 2344sub inv_recursive_ {
2262 inv_recursive_ inv $_[0] 2349 inv_recursive_ inv $_[0]
2263} 2350}
2264 2351
2265=item $ref = $ob->ref 2352=item $ref = $ob->ref
2266 2353
2267creates and returns a persistent reference to an objetc that can be stored as a string. 2354Creates and returns a persistent reference to an object that can be stored as a string.
2268 2355
2269=item $ob = cf::object::deref ($refstring) 2356=item $ob = cf::object::deref ($refstring)
2270 2357
2271returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2358returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2272even if the object actually exists. May block. 2359even if the object actually exists. May block.
2274=cut 2361=cut
2275 2362
2276sub deref { 2363sub deref {
2277 my ($ref) = @_; 2364 my ($ref) = @_;
2278 2365
2279 # temporary compatibility#TODO#remove
2280 $ref =~ s{^<}{player/<};
2281
2282 if ($ref =~ m{^player\/(<1\.\d+>)/(.*)$}) { 2366 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2283 my ($uuid, $name) = ($1, $2); 2367 my ($uuid, $name) = ($1, $2);
2284 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name 2368 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2285 or return; 2369 or return;
2286 $pl->ob->uuid eq $uuid 2370 $pl->ob->uuid eq $uuid
2287 or return; 2371 or return;
2307can be C<undef>. Does the right thing when the player is currently in a 2391can be C<undef>. Does the right thing when the player is currently in a
2308dialogue with the given NPC character. 2392dialogue with the given NPC character.
2309 2393
2310=cut 2394=cut
2311 2395
2396our $SAY_CHANNEL = {
2397 id => "say",
2398 title => "Map",
2399 reply => "say ",
2400 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2401};
2402
2403our $CHAT_CHANNEL = {
2404 id => "chat",
2405 title => "Chat",
2406 reply => "chat ",
2407 tooltip => "Player chat and shouts, global to the server.",
2408};
2409
2312# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2313# with dialog boxes. 2411# with dialog boxes.
2314#TODO: the first argument must go, split into a $npc->reply_to ( method 2412#TODO: the first argument must go, split into a $npc->reply_to ( method
2315sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
2316 my ($self, $npc, $msg, $flags) = @_; 2414 my ($self, $npc, $msg, $flags) = @_;
2327 my $dialog = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2328 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2426 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2329 2427
2330 } else { 2428 } else {
2331 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2332 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2333 } 2431 }
2334 } 2432 }
2335} 2433}
2336 2434
2337=item $object->send_msg ($channel, $msg, $color, [extra...]) 2435=item $object->send_msg ($channel, $msg, $color, [extra...])
2362 2460
2363=item $player_object->enter_link 2461=item $player_object->enter_link
2364 2462
2365Freezes the player and moves him/her to a special map (C<{link}>). 2463Freezes the player and moves him/her to a special map (C<{link}>).
2366 2464
2367The player should be reasonably safe there for short amounts of time. You 2465The player should be reasonably safe there for short amounts of time (e.g.
2368I<MUST> call C<leave_link> as soon as possible, though. 2466for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2467though, as the palyer cannot control the character while it is on the link
2468map.
2369 2469
2370Will never block. 2470Will never block.
2371 2471
2372=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2373 2473
2431 2531
2432 $map->load; 2532 $map->load;
2433 $map->load_neighbours; 2533 $map->load_neighbours;
2434 2534
2435 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2436 $self->activate_recursive; 2537 $self->activate_recursive;
2437 2538
2438 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2439 $self->enter_map ($map, $x, $y); 2540 $self->enter_map ($map, $x, $y);
2440} 2541}
2445her, loading and preparing them map, calling the provided $check callback 2546her, loading and preparing them map, calling the provided $check callback
2446that has to return the map if sucecssful, and then unfreezes the player on 2547that has to return the map if sucecssful, and then unfreezes the player on
2447the new (success) or old (failed) map position. In either case, $done will 2548the new (success) or old (failed) map position. In either case, $done will
2448be called at the end of this process. 2549be called at the end of this process.
2449 2550
2551Note that $check will be called with a potentially non-loaded map, so if
2552it needs a loaded map it has to call C<< ->load >>.
2553
2450=cut 2554=cut
2451 2555
2452our $GOTOGEN; 2556our $GOTOGEN;
2453 2557
2454sub cf::object::player::goto { 2558sub cf::object::player::goto {
2458 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2562 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2459 2563
2460 $self->enter_link; 2564 $self->enter_link;
2461 2565
2462 (async { 2566 (async {
2567 $Coro::current->{desc} = "player::goto $path $x $y";
2568
2463 # *tag paths override both path and x|y 2569 # *tag paths override both path and x|y
2464 if ($path =~ /^\*(.*)$/) { 2570 if ($path =~ /^\*(.*)$/) {
2465 if (my @obs = grep $_->map, ext::map_tags::find $1) { 2571 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2466 my $ob = $obs[rand @obs]; 2572 my $ob = $obs[rand @obs];
2467 2573
2468 # see if we actually can go there 2574 # see if we actually can go there
2469 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) { 2575 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2470 $ob = $obs[rand @obs]; 2576 $ob = $obs[rand @obs];
2577 } else {
2578 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2471 } 2579 }
2472 # else put him there anyways for now #d# 2580 # else put us there anyways for now #d#
2473 2581
2474 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y); 2582 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2583 } else {
2584 ($path, $x, $y) = (undef, undef, undef);
2475 } 2585 }
2476 } 2586 }
2477 2587
2478 my $map = eval { 2588 my $map = eval {
2479 my $map = cf::map::find $path; 2589 my $map = defined $path ? cf::map::find $path : undef;
2480 2590
2481 if ($map) { 2591 if ($map) {
2482 $map = $map->customise_for ($self); 2592 $map = $map->customise_for ($self);
2483 $map = $check->($map) if $check && $map; 2593 $map = $check->($map) if $check && $map;
2484 } else { 2594 } else {
2485 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2595 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2486 } 2596 }
2487 2597
2488 $map 2598 $map
2489 }; 2599 };
2490 2600
2526} 2636}
2527 2637
2528sub prepare_random_map { 2638sub prepare_random_map {
2529 my ($exit) = @_; 2639 my ($exit) = @_;
2530 2640
2531 my $guard = cf::lock_acquire "exit_prepare:$exit";
2532
2533 # all this does is basically replace the /! path by 2641 # all this does is basically replace the /! path by
2534 # a new random map path (?random/...) with a seed 2642 # a new random map path (?random/...) with a seed
2535 # that depends on the exit object 2643 # that depends on the exit object
2536 2644
2537 my $rmp = parse_random_map_params $exit->msg; 2645 my $rmp = parse_random_map_params $exit->msg;
2539 if ($exit->map) { 2647 if ($exit->map) {
2540 $rmp->{region} = $exit->region->name; 2648 $rmp->{region} = $exit->region->name;
2541 $rmp->{origin_map} = $exit->map->path; 2649 $rmp->{origin_map} = $exit->map->path;
2542 $rmp->{origin_x} = $exit->x; 2650 $rmp->{origin_x} = $exit->x;
2543 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2652
2653 $exit->map->touch;
2544 } 2654 }
2545 2655
2546 $rmp->{random_seed} ||= $exit->random_seed; 2656 $rmp->{random_seed} ||= $exit->random_seed;
2547 2657
2548 my $data = cf::to_json $rmp; 2658 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2549 my $md5 = Digest::MD5::md5_hex $data; 2659 my $md5 = Digest::MD5::md5_hex $data;
2550 my $meta = "$RANDOMDIR/$md5.meta"; 2660 my $meta = "$RANDOMDIR/$md5.meta";
2551 2661
2552 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2662 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2553 aio_write $fh, 0, (length $data), $data, 0; 2663 aio_write $fh, 0, (length $data), $data, 0;
2554 undef $fh; 2664 undef $fh;
2555 aio_rename "$meta~", $meta; 2665 aio_rename "$meta~", $meta;
2556 2666
2667 my $slaying = "?random/$md5";
2668
2669 if ($exit->valid) {
2557 $exit->slaying ("?random/$md5"); 2670 $exit->slaying ("?random/$md5");
2558 $exit->msg (undef); 2671 $exit->msg (undef);
2672 }
2559 } 2673 }
2560} 2674}
2561 2675
2562sub cf::object::player::enter_exit { 2676sub cf::object::player::enter_exit {
2563 my ($self, $exit) = @_; 2677 my ($self, $exit) = @_;
2564 2678
2565 return unless $self->type == cf::PLAYER; 2679 return unless $self->type == cf::PLAYER;
2566 2680
2567 if ($exit->slaying eq "/!") {
2568 #TODO: this should de-fi-ni-te-ly not be a sync-job
2569 # the problem is that $exit might not survive long enough
2570 # so it needs to be done right now, right here
2571 cf::sync_job { prepare_random_map $exit };
2572 }
2573
2574 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2575 my $hp = $exit->stats->hp;
2576 my $sp = $exit->stats->sp;
2577
2578 $self->enter_link; 2681 $self->enter_link;
2579 2682
2580 # if exit is damned, update players death & WoR home-position
2581 $self->contr->savebed ($slaying, $hp, $sp)
2582 if $exit->flag (FLAG_DAMNED);
2583
2584 (async { 2683 (async {
2585 $self->deactivate_recursive; # just to be sure 2684 $Coro::current->{desc} = "enter_exit";
2685
2586 unless (eval { 2686 unless (eval {
2687 $self->deactivate_recursive; # just to be sure
2688
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2698 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp;
2700
2587 $self->goto ($slaying, $hp, $sp); 2701 $self->goto ($map, $x, $y);
2588 2702
2703 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y)
2705 if $exit->flag (cf::FLAG_DAMNED);
2706
2589 1; 2707 1
2590 }) { 2708 }) {
2591 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2592 . "I'll try to bring you back to the map you were before. " 2710 . "I'll try to bring you back to the map you were before. "
2593 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2594 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2595 2713
2596 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
2624the message, with C<log> being the default. If C<$color> is negative, suppress 2742the message, with C<log> being the default. If C<$color> is negative, suppress
2625the message unless the client supports the msg packet. 2743the message unless the client supports the msg packet.
2626 2744
2627=cut 2745=cut
2628 2746
2747# non-persistent channels (usually the info channel)
2629our %CHANNEL = ( 2748our %CHANNEL = (
2630 "c/identify" => { 2749 "c/identify" => {
2631 id => "identify", 2750 id => "infobox",
2632 title => "Identify", 2751 title => "Identify",
2633 reply => undef, 2752 reply => undef,
2634 tooltip => "Items recently identified", 2753 tooltip => "Items recently identified",
2635 }, 2754 },
2636 "c/examine" => { 2755 "c/examine" => {
2637 id => "examine", 2756 id => "infobox",
2638 title => "Examine", 2757 title => "Examine",
2639 reply => undef, 2758 reply => undef,
2640 tooltip => "Signs and other items you examined", 2759 tooltip => "Signs and other items you examined",
2641 }, 2760 },
2761 "c/book" => {
2762 id => "infobox",
2763 title => "Book",
2764 reply => undef,
2765 tooltip => "The contents of a note or book",
2766 },
2767 "c/lookat" => {
2768 id => "infobox",
2769 title => "Look",
2770 reply => undef,
2771 tooltip => "What you saw there",
2772 },
2773 "c/who" => {
2774 id => "infobox",
2775 title => "Players",
2776 reply => undef,
2777 tooltip => "Shows players who are currently online",
2778 },
2779 "c/body" => {
2780 id => "infobox",
2781 title => "Body Parts",
2782 reply => undef,
2783 tooltip => "Shows which body parts you posess and are available",
2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2791 "c/uptime" => {
2792 id => "infobox",
2793 title => "Uptime",
2794 reply => undef,
2795 tooltip => "How long the server has been running since last restart",
2796 },
2797 "c/mapinfo" => {
2798 id => "infobox",
2799 title => "Map Info",
2800 reply => undef,
2801 tooltip => "Information related to the maps",
2802 },
2803 "c/party" => {
2804 id => "party",
2805 title => "Party",
2806 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party",
2808 },
2642); 2809);
2643 2810
2644sub cf::client::send_msg { 2811sub cf::client::send_msg {
2645 my ($self, $channel, $msg, $color, @extra) = @_; 2812 my ($self, $channel, $msg, $color, @extra) = @_;
2646 2813
2647 $msg = $self->pl->expand_cfpod ($msg); 2814 $msg = $self->pl->expand_cfpod ($msg)
2815 unless $color & cf::NDI_VERBATIM;
2648 2816
2649 $color &= cf::NDI_CLIENT_MASK; # just in case... 2817 $color &= cf::NDI_CLIENT_MASK; # just in case...
2650 2818
2651 # check predefined channels, for the benefit of C 2819 # check predefined channels, for the benefit of C
2652 $channel = $CHANNEL{$channel} if $CHANNEL{$channel}; 2820 if ($CHANNEL{$channel}) {
2821 $channel = $CHANNEL{$channel};
2653 2822
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825
2826 $channel = $channel->{id};
2827
2654 if (ref $channel) { 2828 } elsif (ref $channel) {
2655 # send meta info to client, if not yet sent 2829 # send meta info to client, if not yet sent
2656 unless (exists $self->{channel}{$channel->{id}}) { 2830 unless (exists $self->{channel}{$channel->{id}}) {
2657 $self->{channel}{$channel->{id}} = $channel; 2831 $self->{channel}{$channel->{id}} = $channel;
2658 $self->ext_msg (channel_info => $channel) 2832 $self->ext_msg (channel_info => $channel)
2659 if $self->can_msg; 2833 if $self->can_msg;
2667 if ($self->can_msg) { 2841 if ($self->can_msg) {
2668 # default colour, mask it out 2842 # default colour, mask it out
2669 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2670 if $color & cf::NDI_DEF; 2844 if $color & cf::NDI_DEF;
2671 2845
2672 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2846 my $pkt = "msg "
2847 . $self->{json_coder}->encode (
2673 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 );
2850
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt);
2674 } else { 2862 } else {
2675 if ($color >= 0) { 2863 if ($color >= 0) {
2676 # replace some tags by gcfclient-compatible ones 2864 # replace some tags by gcfclient-compatible ones
2677 for ($msg) { 2865 for ($msg) {
2678 1 while 2866 1 while
2876=pod 3064=pod
2877 3065
2878The following functions and methods are available within a safe environment: 3066The following functions and methods are available within a safe environment:
2879 3067
2880 cf::object 3068 cf::object
2881 contr pay_amount pay_player map x y force_find force_add 3069 contr pay_amount pay_player map x y force_find force_add destroy
2882 insert remove name archname title slaying race decrease_ob_nr 3070 insert remove name archname title slaying race decrease split
2883 3071
2884 cf::object::player 3072 cf::object::player
2885 player 3073 player
2886 3074
2887 cf::player 3075 cf::player
2892 3080
2893=cut 3081=cut
2894 3082
2895for ( 3083for (
2896 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2897 insert remove inv name archname title slaying race 3085 insert remove inv nrof name archname title slaying race
2898 decrease_ob_nr)], 3086 decrease split destroy change_exp)],
2899 ["cf::object::player" => qw(player)], 3087 ["cf::object::player" => qw(player)],
2900 ["cf::player" => qw(peaceful)], 3088 ["cf::player" => qw(peaceful)],
2901 ["cf::map" => qw(trigger)], 3089 ["cf::map" => qw(trigger)],
2902) { 3090) {
2903 no strict 'refs'; 3091 no strict 'refs';
3008 { 3196 {
3009 my $faces = $facedata->{faceinfo}; 3197 my $faces = $facedata->{faceinfo};
3010 3198
3011 while (my ($face, $info) = each %$faces) { 3199 while (my ($face, $info) = each %$faces) {
3012 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3200 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3201
3013 cf::face::set_visibility $idx, $info->{visibility}; 3202 cf::face::set_visibility $idx, $info->{visibility};
3014 cf::face::set_magicmap $idx, $info->{magicmap}; 3203 cf::face::set_magicmap $idx, $info->{magicmap};
3015 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3204 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3016 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3205 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3017 3206
3018 cf::cede_to_tick; 3207 cf::cede_to_tick;
3019 } 3208 }
3020 3209
3021 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
3022 next unless $info->{smooth}; 3211 next unless $info->{smooth};
3212
3023 my $idx = cf::face::find $face 3213 my $idx = cf::face::find $face
3024 or next; 3214 or next;
3215
3025 if (my $smooth = cf::face::find $info->{smooth}) { 3216 if (my $smooth = cf::face::find $info->{smooth}) {
3026 cf::face::set_smooth $idx, $smooth; 3217 cf::face::set_smooth $idx, $smooth;
3027 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3218 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3028 } else { 3219 } else {
3029 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3220 warn "smooth face '$info->{smooth}' not found for face '$face'";
3047 { 3238 {
3048 # TODO: for gcfclient pleasure, we should give resources 3239 # TODO: for gcfclient pleasure, we should give resources
3049 # that gcfclient doesn't grok a >10000 face index. 3240 # that gcfclient doesn't grok a >10000 face index.
3050 my $res = $facedata->{resource}; 3241 my $res = $facedata->{resource};
3051 3242
3052 my $soundconf = delete $res->{"res/sound.conf"};
3053
3054 while (my ($name, $info) = each %$res) { 3243 while (my ($name, $info) = each %$res) {
3244 if (defined $info->{type}) {
3055 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3245 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3056 my $data; 3246 my $data;
3057 3247
3058 if ($info->{type} & 1) { 3248 if ($info->{type} & 1) {
3059 # prepend meta info 3249 # prepend meta info
3060 3250
3061 my $meta = $enc->encode ({ 3251 my $meta = $enc->encode ({
3062 name => $name, 3252 name => $name,
3063 %{ $info->{meta} || {} }, 3253 %{ $info->{meta} || {} },
3064 }); 3254 });
3065 3255
3066 $data = pack "(w/a*)*", $meta, $info->{data}; 3256 $data = pack "(w/a*)*", $meta, $info->{data};
3257 } else {
3258 $data = $info->{data};
3259 }
3260
3261 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3262 cf::face::set_type $idx, $info->{type};
3067 } else { 3263 } else {
3068 $data = $info->{data}; 3264 $RESOURCE{$name} = $info;
3069 } 3265 }
3070 3266
3071 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3072 cf::face::set_type $idx, $info->{type};
3073
3074 cf::cede_to_tick; 3267 cf::cede_to_tick;
3075 } 3268 }
3076
3077 if ($soundconf) {
3078 $soundconf = $enc->decode (delete $soundconf->{data});
3079
3080 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3081 my $sound = $soundconf->{compat}[$_]
3082 or next;
3083
3084 my $face = cf::face::find "sound/$sound->[1]";
3085 cf::sound::set $sound->[0] => $face;
3086 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3087 }
3088
3089 while (my ($k, $v) = each %{$soundconf->{event}}) {
3090 my $face = cf::face::find "sound/$v";
3091 cf::sound::set $k => $face;
3092 }
3093 }
3094 } 3269 }
3270
3271 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3095 3272
3096 1 3273 1
3097} 3274}
3275
3276cf::global->attach (on_resource_update => sub {
3277 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3278 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3279
3280 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3281 my $sound = $soundconf->{compat}[$_]
3282 or next;
3283
3284 my $face = cf::face::find "sound/$sound->[1]";
3285 cf::sound::set $sound->[0] => $face;
3286 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3287 }
3288
3289 while (my ($k, $v) = each %{$soundconf->{event}}) {
3290 my $face = cf::face::find "sound/$v";
3291 cf::sound::set $k => $face;
3292 }
3293 }
3294});
3098 3295
3099register_exticmd fx_want => sub { 3296register_exticmd fx_want => sub {
3100 my ($ns, $want) = @_; 3297 my ($ns, $want) = @_;
3101 3298
3102 while (my ($k, $v) = each %$want) { 3299 while (my ($k, $v) = each %$want) {
3103 $ns->fx_want ($k, $v); 3300 $ns->fx_want ($k, $v);
3104 } 3301 }
3105}; 3302};
3303
3304sub load_resource_file($) {
3305 my $guard = lock_acquire "load_resource_file";
3306
3307 my $status = load_resource_file_ $_[0];
3308 get_slot 0.1, 100;
3309 cf::arch::commit_load;
3310
3311 $status
3312}
3106 3313
3107sub reload_regions { 3314sub reload_regions {
3108 # HACK to clear player env face cache, we need some signal framework 3315 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?) 3316 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = (); 3317 %ext::player_env::MUSIC_FACE_CACHE = ();
3124} 3331}
3125 3332
3126sub reload_archetypes { 3333sub reload_archetypes {
3127 load_resource_file "$DATADIR/archetypes" 3334 load_resource_file "$DATADIR/archetypes"
3128 or die "unable to load archetypes\n"; 3335 or die "unable to load archetypes\n";
3129 #d# NEED to laod twice to resolve forward references
3130 # this really needs to be done in an extra post-pass
3131 # (which needs to be synchronous, so solve it differently)
3132 load_resource_file "$DATADIR/archetypes"
3133 or die "unable to load archetypes\n";
3134} 3336}
3135 3337
3136sub reload_treasures { 3338sub reload_treasures {
3137 load_resource_file "$DATADIR/treasures" 3339 load_resource_file "$DATADIR/treasures"
3138 or die "unable to load treasurelists\n"; 3340 or die "unable to load treasurelists\n";
3139} 3341}
3140 3342
3141sub reload_resources { 3343sub reload_resources {
3142 warn "reloading resource files...\n"; 3344 warn "reloading resource files...\n";
3143 3345
3346 reload_facedata;
3347 reload_archetypes;
3144 reload_regions; 3348 reload_regions;
3145 reload_facedata;
3146 #reload_archetypes;#d#
3147 reload_archetypes;
3148 reload_treasures; 3349 reload_treasures;
3149 3350
3150 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
3151}
3152
3153sub init {
3154 reload_resources;
3155} 3352}
3156 3353
3157sub reload_config { 3354sub reload_config {
3158 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
3159 or return; 3356 or return;
3160 3357
3161 local $/; 3358 local $/;
3162 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
3163 3360
3164 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3165 3362
3166 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3167 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3173 }; 3370 };
3174 warn $@ if $@; 3371 warn $@ if $@;
3175 } 3372 }
3176} 3373}
3177 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
3178sub main { 3394sub main {
3395 cf::init_globals; # initialise logging
3396
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409
3179 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
3180 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
3181 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3182 (async { 3413 (async {
3183 Event::one_event; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3415 EV::loop EV::LOOP_ONESHOT;
3184 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
3185 }; 3417 };
3186 3418
3419 evthread_start IO::AIO::poll_fileno;
3420
3421 cf::sync_job {
3422 reload_resources;
3187 reload_config; 3423 reload_config;
3188 db_init; 3424 db_init;
3425
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid;
3429 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills;
3432
3433 cf::init_beforeplay;
3434
3435 atomic;
3436
3189 load_extensions; 3437 load_extensions;
3190 3438
3191 $TICK_WATCHER->start; 3439 utime time, time, $RUNTIMEFILE;
3440
3441 # no (long-running) fork's whatsoever before this point(!)
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443
3444 (pop @POST_INIT)->(0) while @POST_INIT;
3445 };
3446
3192 Event::loop; 3447 EV::loop;
3193} 3448}
3194 3449
3195############################################################################# 3450#############################################################################
3196# initialisation and cleanup 3451# initialisation and cleanup
3197 3452
3198# install some emergency cleanup handlers 3453# install some emergency cleanup handlers
3199BEGIN { 3454BEGIN {
3455 our %SIGWATCHER = ();
3200 for my $signal (qw(INT HUP TERM)) { 3456 for my $signal (qw(INT HUP TERM)) {
3201 Event->signal ( 3457 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3202 reentrant => 0,
3203 data => WF_AUTOCANCEL,
3204 signal => $signal,
3205 prio => 0,
3206 cb => sub {
3207 cf::cleanup "SIG$signal"; 3458 cf::cleanup "SIG$signal";
3208 },
3209 ); 3459 };
3210 } 3460 }
3211} 3461}
3212 3462
3213sub write_runtime { 3463sub write_runtime_sync {
3214 my $runtime = "$LOCALDIR/runtime";
3215
3216 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3217 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3218 3466
3219 IO::AIO::aio_utime $runtime, undef, undef; 3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3220 3468
3221 my $guard = cf::lock_acquire "write_runtime"; 3469 my $guard = cf::lock_acquire "write_runtime";
3222 3470
3223 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3224 or return; 3472 or return;
3225 3473
3226 my $value = $cf::RUNTIME + 90 + 10; 3474 my $value = $cf::RUNTIME + 90 + 10;
3227 # 10 is the runtime save interval, for a monotonic clock 3475 # 10 is the runtime save interval, for a monotonic clock
3228 # 60 allows for the watchdog to kill the server. 3476 # 60 allows for the watchdog to kill the server.
3238 aio_utime $fh, undef, undef; 3486 aio_utime $fh, undef, undef;
3239 3487
3240 close $fh 3488 close $fh
3241 or return; 3489 or return;
3242 3490
3243 aio_rename "$runtime~", $runtime 3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3244 and return; 3492 and return;
3245 3493
3246 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
3247 3495
3248 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_seq uuid_cur;
3514
3515 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n";
3517 return;
3518 }
3519
3520 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3249} 3547}
3250 3548
3251sub emergency_save() { 3549sub emergency_save() {
3252 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3253 3551
3254 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
3255 3553
3256 cf::sync_job { 3554 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559
3257 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
3258 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
3259 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
3260 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
3261 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
3262 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
3263 $pl->valid or next; 3566 $pl->valid or next;
3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3264 $pl->save; 3568 $pl->save;
3265 } 3569 }
3266 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
3267 3571
3268 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
3269 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
3270 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
3271 $map->valid or next; 3575 $map->valid or next;
3272 $map->save; 3576 $map->save;
3273 } 3577 }
3274 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
3275 3579
3276 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
3277 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3278 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3583
3584 warn "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n";
3279 }; 3587 };
3280 3588
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3281 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
3282} 3595}
3283 3596
3284sub post_cleanup { 3597sub post_cleanup {
3285 my ($make_core) = @_; 3598 my ($make_core) = @_;
3286 3599
3287 warn Carp::longmess "post_cleanup backtrace" 3600 warn Carp::longmess "post_cleanup backtrace"
3288 if $make_core; 3601 if $make_core;
3602
3603 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$;
3605}
3606
3607# a safer delete_package, copied from Symbol
3608sub clear_package($) {
3609 my $pkg = shift;
3610
3611 # expand to full symbol table name if needed
3612 unless ($pkg =~ /^main::.*::$/) {
3613 $pkg = "main$pkg" if $pkg =~ /^::/;
3614 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3615 $pkg .= '::' unless $pkg =~ /::$/;
3616 }
3617
3618 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3619 my $stem_symtab = *{$stem}{HASH};
3620
3621 defined $stem_symtab and exists $stem_symtab->{$leaf}
3622 or return;
3623
3624 # clear all symbols
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 }
3630 warn "cleared package $pkg\n";#d#
3289} 3631}
3290 3632
3291sub do_reload_perl() { 3633sub do_reload_perl() {
3292 # can/must only be called in main 3634 # can/must only be called in main
3293 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
3294 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
3295 return; 3637 return;
3296 } 3638 }
3297 3639
3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3643
3644 while ($RELOAD) {
3298 warn "reloading..."; 3645 warn "reloading...";
3299 3646
3300 warn "entering sync_job"; 3647 warn "entering sync_job";
3301 3648
3302 cf::sync_job { 3649 cf::sync_job {
3303 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
3304 cf::emergency_save; 3651 cf::emergency_save;
3305 cf::write_runtime; # external watchdog should not bark 3652 cf::write_runtime_sync; # external watchdog should not bark
3306 3653
3307 warn "syncing database to disk"; 3654 warn "syncing database to disk";
3308 BDB::db_env_txn_checkpoint $DB_ENV; 3655 BDB::db_env_txn_checkpoint $DB_ENV;
3309 3656
3310 # if anything goes wrong in here, we should simply crash as we already saved 3657 # if anything goes wrong in here, we should simply crash as we already saved
3311 3658
3312 warn "cancelling all WF_AUTOCANCEL watchers";
3313 for (Event::all_watchers) {
3314 $_->cancel if $_->data & WF_AUTOCANCEL;
3315 }
3316
3317 warn "flushing outstanding aio requests"; 3659 warn "flushing outstanding aio requests";
3318 for (;;) {
3319 BDB::flush;
3320 IO::AIO::flush;
3321 Coro::cede;
3322 last unless IO::AIO::nreqs || BDB::nreqs; 3660 while (IO::AIO::nreqs || BDB::nreqs) {
3323 warn "iterate..."; 3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3324 }
3325
3326 ++$RELOAD;
3327
3328 warn "cancelling all extension coros";
3329 $_->cancel for values %EXT_CORO;
3330 %EXT_CORO = ();
3331
3332 warn "removing commands";
3333 %COMMAND = ();
3334
3335 warn "removing ext/exti commands";
3336 %EXTCMD = ();
3337 %EXTICMD = ();
3338
3339 warn "unloading/nuking all extensions";
3340 for my $pkg (@EXTS) {
3341 warn "... unloading $pkg";
3342
3343 if (my $cb = $pkg->can ("unload")) {
3344 eval {
3345 $cb->($pkg);
3346 1
3347 } or warn "$pkg unloaded, but with errors: $@";
3348 } 3662 }
3349 3663
3350 warn "... nuking $pkg"; 3664 warn "cancelling all extension coros";
3351 Symbol::delete_package $pkg; 3665 $_->cancel for values %EXT_CORO;
3352 } 3666 %EXT_CORO = ();
3353 3667
3354 warn "unloading all perl modules loaded from $LIBDIR"; 3668 warn "removing commands";
3355 while (my ($k, $v) = each %INC) { 3669 %COMMAND = ();
3356 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3357 3670
3671 warn "removing ext/exti commands";
3672 %EXTCMD = ();
3673 %EXTICMD = ();
3674
3675 warn "unloading/nuking all extensions";
3676 for my $pkg (@EXTS) {
3358 warn "... unloading $k"; 3677 warn "... unloading $pkg";
3359 delete $INC{$k};
3360 3678
3361 $k =~ s/\.pm$//;
3362 $k =~ s/\//::/g;
3363
3364 if (my $cb = $k->can ("unload_module")) { 3679 if (my $cb = $pkg->can ("unload")) {
3680 eval {
3365 $cb->(); 3681 $cb->($pkg);
3682 1
3683 } or warn "$pkg unloaded, but with errors: $@";
3684 }
3685
3686 warn "... clearing $pkg";
3687 clear_package $pkg;
3366 } 3688 }
3367 3689
3368 Symbol::delete_package $k; 3690 warn "unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693
3694 warn "... unloading $k";
3695 delete $INC{$k};
3696
3697 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g;
3699
3700 if (my $cb = $k->can ("unload_module")) {
3701 $cb->();
3702 }
3703
3704 clear_package $k;
3369 } 3705 }
3370 3706
3371 warn "getting rid of safe::, as good as possible"; 3707 warn "getting rid of safe::, as good as possible";
3372 Symbol::delete_package "safe::$_" 3708 clear_package "safe::$_"
3373 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3374 3710
3375 warn "unloading cf.pm \"a bit\""; 3711 warn "unloading cf.pm \"a bit\"";
3376 delete $INC{"cf.pm"}; 3712 delete $INC{"cf.pm"};
3377 delete $INC{"cf/pod.pm"}; 3713 delete $INC{"cf/pod.pm"};
3378 3714
3379 # don't, removes xs symbols, too, 3715 # don't, removes xs symbols, too,
3380 # and global variables created in xs 3716 # and global variables created in xs
3381 #Symbol::delete_package __PACKAGE__; 3717 #clear_package __PACKAGE__;
3382 3718
3383 warn "unload completed, starting to reload now"; 3719 warn "unload completed, starting to reload now";
3384 3720
3385 warn "reloading cf.pm"; 3721 warn "reloading cf.pm";
3386 require cf; 3722 require cf;
3387 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3388 3724
3389 warn "loading config and database again"; 3725 warn "loading config and database again";
3390 cf::reload_config; 3726 cf::reload_config;
3391 3727
3392 warn "loading extensions"; 3728 warn "loading extensions";
3393 cf::load_extensions; 3729 cf::load_extensions;
3394 3730
3731 if ($REATTACH_ON_RELOAD) {
3395 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3396 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3397 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3398 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3399 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3400 reattach $_ for values %PLAYER; 3737 reattach $_ for values %PLAYER;
3738 }
3401 3739
3740 warn "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742
3402 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3403 3744
3404 1 3745 1
3405 } or do { 3746 } or do {
3406 warn $@; 3747 warn $@;
3407 warn "error while reloading, exiting."; 3748 cf::cleanup "error while reloading, exiting.";
3408 exit 1;
3409 }; 3749 };
3410 3750
3411 warn "reloaded"; 3751 warn "reloaded";
3752 --$RELOAD;
3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3412}; 3757};
3413 3758
3414our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3415 3760
3416sub reload_perl() { 3761sub reload_perl() {
3417 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3418 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3419 3764
3420 $RELOAD_WATCHER ||= Event->timer ( 3765 $RELOAD_WATCHER ||= cf::async {
3421 reentrant => 0, 3766 Coro::AIO::aio_wait cache_extensions;
3422 after => 0, 3767
3423 data => WF_AUTOCANCEL, 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3424 cb => sub {
3425 do_reload_perl; 3769 do_reload_perl;
3426 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3427 }, 3771 };
3428 ); 3772 };
3429} 3773}
3430 3774
3431register_command "reload" => sub { 3775register_command "reload" => sub {
3432 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;
3433 3777
3434 if ($who->flag (FLAG_WIZ)) { 3778 if ($who->flag (FLAG_WIZ)) {
3435 $who->message ("reloading server."); 3779 $who->message ("reloading server.");
3780 async {
3781 $Coro::current->{desc} = "perl_reload";
3436 async { reload_perl }; 3782 reload_perl;
3783 };
3437 } 3784 }
3438}; 3785};
3439 3786
3440unshift @INC, $LIBDIR; 3787unshift @INC, $LIBDIR;
3441 3788
3443 3790
3444our @WAIT_FOR_TICK; 3791our @WAIT_FOR_TICK;
3445our @WAIT_FOR_TICK_BEGIN; 3792our @WAIT_FOR_TICK_BEGIN;
3446 3793
3447sub wait_for_tick { 3794sub wait_for_tick {
3448 return unless $TICK_WATCHER->is_active;
3449 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
3450 3796
3451 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
3452 push @WAIT_FOR_TICK, $signal; 3798 push @WAIT_FOR_TICK, $signal;
3453 $signal->wait; 3799 $signal->wait;
3454} 3800}
3455 3801
3456sub wait_for_tick_begin { 3802sub wait_for_tick_begin {
3457 return unless $TICK_WATCHER->is_active;
3458 return if $Coro::current == $Coro::main; 3803 return if tick_inhibit || $Coro::current == $Coro::main;
3459 3804
3460 my $signal = new Coro::Signal; 3805 my $signal = new Coro::Signal;
3461 push @WAIT_FOR_TICK_BEGIN, $signal; 3806 push @WAIT_FOR_TICK_BEGIN, $signal;
3462 $signal->wait; 3807 $signal->wait;
3463} 3808}
3464 3809
3465our $stat_fh; 3810sub tick {
3466sysopen $stat_fh, "/tmp/cfstats", Fcntl::O_APPEND | Fcntl::O_CREAT | Fcntl::O_WRONLY, 0600;#d#
3467
3468$TICK_WATCHER = Event->timer (
3469 reentrant => 0,
3470 parked => 1,
3471 prio => 0,
3472 at => $NEXT_TICK || $TICK,
3473 data => WF_AUTOCANCEL,
3474 cb => sub {
3475 if ($Coro::current != $Coro::main) { 3811 if ($Coro::current != $Coro::main) {
3476 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3812 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3477 unless ++$bug_warning > 10; 3813 unless ++$bug_warning > 10;
3478 return; 3814 return;
3479 } 3815 }
3480 3816
3481 my @pl = cf::player::list; my $stats = sprintf "%.2f %d %d %d", $RUNTIME, (scalar @pl), cf::object::actives_size, cf::object::objects_size; #d#
3482
3483 $NOW = $tick_start = Event::time;
3484
3485 cf::server_tick; # one server iteration 3817 cf::server_tick; # one server iteration
3486 3818
3487 $RUNTIME += $TICK;
3488 $NEXT_TICK += $TICK;
3489
3490 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3819 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3491 $NEXT_RUNTIME_WRITE = $NOW + 10; 3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3492 Coro::async_pool { 3821 Coro::async_pool {
3822 $Coro::current->{desc} = "runtime saver";
3493 write_runtime 3823 write_runtime_sync
3494 or warn "ERROR: unable to write runtime file: $!"; 3824 or warn "ERROR: unable to write runtime file: $!";
3495 };
3496 } 3825 };
3826 }
3497 3827
3498# my $AFTER = Event::time;
3499# warn $AFTER - $NOW;#d#
3500
3501 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3502 $sig->send; 3829 $sig->send;
3503 } 3830 }
3504 while (my $sig = shift @WAIT_FOR_TICK) { 3831 while (my $sig = shift @WAIT_FOR_TICK) {
3505 $sig->send; 3832 $sig->send;
3506 } 3833 }
3507 3834
3508 $NOW = Event::time; 3835 $LOAD = ($NOW - $TICK_START) / $TICK;
3509
3510 # if we are delayed by four ticks or more, skip them all
3511 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3512
3513 $TICK_WATCHER->at ($NEXT_TICK);
3514 $TICK_WATCHER->start;
3515
3516 $LOAD = ($NOW - $tick_start) / $TICK;
3517 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3518 3837
3519 _post_tick; 3838 if (0) {
3520 3839 if ($NEXT_TICK) {
3521 # gather some statistics#d# 3840 my $jitter = $TICK_START - $NEXT_TICK;
3522 $stats .= sprintf " %d\n", 10000 * ($NOW - $tick_start);#d# 3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3523 IO::AIO::aio_write $stat_fh, undef, undef, $stats, 0;#d# 3842 warn "jitter $JITTER\n";#d#
3843 }
3524 }, 3844 }
3525); 3845}
3526 3846
3527{ 3847{
3848 # configure BDB
3849
3528 BDB::min_parallel 8; 3850 BDB::min_parallel 8;
3529 BDB::max_poll_time $TICK * 0.1; 3851 BDB::max_poll_reqs $TICK * 0.1;
3530 $BDB_POLL_WATCHER = Event->io ( 3852 $AnyEvent::BDB::WATCHER->priority (1);
3531 reentrant => 0,
3532 fd => BDB::poll_fileno,
3533 poll => 'r',
3534 prio => 0,
3535 data => WF_AUTOCANCEL,
3536 cb => \&BDB::poll_cb,
3537 );
3538
3539 BDB::set_sync_prepare {
3540 my $status;
3541 my $current = $Coro::current;
3542 (
3543 sub {
3544 $status = $!;
3545 $current->ready; undef $current;
3546 },
3547 sub {
3548 Coro::schedule while defined $current;
3549 $! = $status;
3550 },
3551 )
3552 };
3553 3853
3554 unless ($DB_ENV) { 3854 unless ($DB_ENV) {
3555 $DB_ENV = BDB::db_env_create; 3855 $DB_ENV = BDB::db_env_create;
3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3858 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3859 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3860 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3556 3861
3557 cf::sync_job { 3862 cf::sync_job {
3558 eval { 3863 eval {
3559 BDB::db_env_open 3864 BDB::db_env_open
3560 $DB_ENV, 3865 $DB_ENV,
3562 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3867 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3563 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3868 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3564 0666; 3869 0666;
3565 3870
3566 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3871 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3567
3568 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3569 | BDB::LOG_AUTOREMOVE, 1);
3570 $DB_ENV->set_lk_detect;
3571 }; 3872 };
3572 3873
3573 cf::cleanup "db_env_open(db): $@" if $@; 3874 cf::cleanup "db_env_open(db): $@" if $@;
3574 }; 3875 };
3575 } 3876 }
3576 3877
3577 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3878 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3578 after => 11, 3879 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3579 interval => 60, 3880 };
3580 hard => 1, 3881 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3581 prio => 0,
3582 data => WF_AUTOCANCEL,
3583 cb => sub {
3584 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3882 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3585 },
3586 ); 3883 };
3587 $BDB_TRICKLE_WATCHER = Event->timer ( 3884 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3588 after => 5,
3589 interval => 10,
3590 hard => 1,
3591 prio => 0,
3592 data => WF_AUTOCANCEL,
3593 cb => sub {
3594 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3885 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3595 },
3596 ); 3886 };
3597} 3887}
3598 3888
3599{ 3889{
3890 # configure IO::AIO
3891
3600 IO::AIO::min_parallel 8; 3892 IO::AIO::min_parallel 8;
3601
3602 undef $Coro::AIO::WATCHER;
3603 IO::AIO::max_poll_time $TICK * 0.1; 3893 IO::AIO::max_poll_time $TICK * 0.1;
3604 $AIO_POLL_WATCHER = Event->io ( 3894 undef $AnyEvent::AIO::WATCHER;
3605 reentrant => 0,
3606 data => WF_AUTOCANCEL,
3607 fd => IO::AIO::poll_fileno,
3608 poll => 'r',
3609 prio => 6,
3610 cb => \&IO::AIO::poll_cb,
3611 );
3612} 3895}
3613 3896
3614my $_log_backtrace; 3897my $_log_backtrace;
3615 3898
3616sub _log_backtrace { 3899sub _log_backtrace {
3619 $msg =~ s/\n//; 3902 $msg =~ s/\n//;
3620 3903
3621 # limit the # of concurrent backtraces 3904 # limit the # of concurrent backtraces
3622 if ($_log_backtrace < 2) { 3905 if ($_log_backtrace < 2) {
3623 ++$_log_backtrace; 3906 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg;
3624 async { 3908 async {
3909 $Coro::current->{desc} = "abt $msg";
3910
3625 my @bt = fork_call { 3911 my @bt = fork_call {
3626 @addr = map { sprintf "%x", $_ } @addr; 3912 @addr = map { sprintf "%x", $_ } @addr;
3627 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3913 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3628 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3914 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3629 or die "addr2line: $!"; 3915 or die "addr2line: $!";
3637 } 3923 }
3638 3924
3639 @funcs 3925 @funcs
3640 }; 3926 };
3641 3927
3642 LOG llevInfo, "[ABT] $msg\n"; 3928 LOG llevInfo, "[ABT] $perl_bt\n";
3929 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3643 LOG llevInfo, "[ABT] $_\n" for @bt; 3930 LOG llevInfo, "[ABT] $_\n" for @bt;
3644 --$_log_backtrace; 3931 --$_log_backtrace;
3645 }; 3932 };
3646 } else { 3933 } else {
3647 LOG llevInfo, "[ABT] $msg\n"; 3934 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines