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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines