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.391 by root, Fri Oct 26 04:22:05 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 Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.1 (); 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.51 (); 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>:
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 LOG llevError, Carp::longmess "sync job";#d# 483 LOG llevError, Carp::longmess "sync job";#d#
433 484
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 485 my $freeze_guard = freeze_mainloop;
437 486
438 my $busy = 1; 487 my $busy = 1;
439 my @res; 488 my @res;
440 489
447 496
448 while ($busy) { 497 while ($busy) {
449 if (Coro::nready) { 498 if (Coro::nready) {
450 Coro::cede_notself; 499 Coro::cede_notself;
451 } else { 500 } else {
452 Event::one_event; 501 EV::loop EV::LOOP_ONESHOT;
453 } 502 }
454 } 503 }
455 504
456 $time = Event::time - $time; 505 my $time = EV::time - $time;
457 506
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 507 $TICK_START += $time; # do not account sync jobs to server load
462 508
463 wantarray ? @res : $res[0] 509 wantarray ? @res : $res[0]
464 } else { 510 } else {
465 # we are in another coroutine, how wonderful, everything just works 511 # we are in another coroutine, how wonderful, everything just works
466 512
491=item fork_call { }, $args 537=item fork_call { }, $args
492 538
493Executes the given code block with the given arguments in a seperate 539Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 540process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 541Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 542never block itself or use any form of event handling.
497 543
498=cut 544=cut
499 545
500sub fork_call(&@) { 546sub fork_call(&@) {
501 my ($cb, @args) = @_; 547 my ($cb, @args) = @_;
508 reset_signals; 554 reset_signals;
509 &$cb 555 &$cb
510 }, @args; 556 }, @args;
511 557
512 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
513} 586}
514 587
515=item $value = cf::db_get $family => $key 588=item $value = cf::db_get $family => $key
516 589
517Returns a single value from the environment database. 590Returns a single value from the environment database.
656 729
657############################################################################# 730#############################################################################
658 731
659=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
660 733
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
664 737
665In 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>
666C<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
667Crossfire TRT). 740Deliantra).
668 741
669=over 4 742=over 4
670 743
671=item $attachable->attach ($attachment, key => $value...) 744=item $attachable->attach ($attachment, key => $value...)
672 745
716=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
717 790
718Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
720 793
721Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 796
724These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
725 798
726=over 4 799=over 4
954 } 1027 }
955 1028
956 0 1029 0
957} 1030}
958 1031
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1033
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1035
963Generate an object-specific event with the given arguments. 1036Generate an object-specific event with the given arguments.
964 1037
1017 1090
1018sub reattach { 1091sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1092 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1093 my ($obj) = @_;
1021 1094
1095 # no longer needed after getting rid of delete_package?
1022 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
1023 1097
1024 my $registry = $obj->registry; 1098 my $registry = $obj->registry;
1025 1099
1026 @$registry = (); 1100 @$registry = ();
1027 1101
1042cf::attachable->attach ( 1116cf::attachable->attach (
1043 prio => -1000000, 1117 prio => -1000000,
1044 on_instantiate => sub { 1118 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1119 my ($obj, $data) = @_;
1046 1120
1047 $data = from_json $data; 1121 $data = decode_json $data;
1048 1122
1049 for (@$data) { 1123 for (@$data) {
1050 my ($name, $args) = @$_; 1124 my ($name, $args) = @$_;
1051 1125
1052 $obj->attach ($name, %{$args || {} }); 1126 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1147 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1148 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1149 $decname, length $$rdata, scalar @$objs;
1076 1150
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1152 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1155 aio_close $fh;
1082 1156
1083 if (@$objs) { 1157 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1159 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1161 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1162 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1163 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1164 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1165 }
1092 } else { 1166 } else {
1093 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1094 } 1168 }
1095 1169
1096 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1174 } else {
1098 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1099 } 1176 }
1100 } else { 1177 } else {
1101 aio_unlink $filename; 1178 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1103 } 1180 }
1194 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1195 1272
1196 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1197} 1274}
1198 1275
1276use File::Glob ();
1277
1199cf::player->attach ( 1278cf::player->attach (
1200 on_command => sub { 1279 on_command => sub {
1201 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1202 1281
1203 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
1235 1314
1236 cf::override; 1315 cf::override;
1237 }, 1316 },
1238); 1317);
1239 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
1240sub load_extensions { 1332sub load_extensions {
1241 cf::sync_job { 1333 cf::sync_job {
1242 my %todo; 1334 my %todo;
1243 1335
1244 for my $path (<$LIBDIR/*.ext>) { 1336 for my $path (<$LIBDIR/*.ext>) {
1263 1355
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1358
1267 $ext{source} = 1359 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1361 . "#line 1 \"$path\"\n{\n"
1270 . $source 1362 . $source
1271 . "\n};\n1"; 1363 . "\n};\n1";
1272 1364
1273 $todo{$base} = \%ext; 1365 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1381 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1382 : "$v->{base}: extension inactive.\n";
1291 1383
1292 if (exists $v->{meta}{mandatory}) { 1384 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1385 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1386 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1387 }
1297 1388
1298 warn $msg; 1389 warn $msg;
1299 } 1390 }
1300 1391
1314 1405
1315=back 1406=back
1316 1407
1317=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1318 1409
1319Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1320 1411
1321=cut 1412=cut
1322 1413
1323package cf::player; 1414package cf::player;
1324 1415
1367 1458
1368sub exists($) { 1459sub exists($) {
1369 my ($login) = @_; 1460 my ($login) = @_;
1370 1461
1371 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1373} 1464}
1374 1465
1375sub find($) { 1466sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1468 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1480 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1481 or return;
1391 1482
1392 my $pl = cf::player::load_pl $f 1483 my $pl = cf::player::load_pl $f
1393 or return; 1484 or return;
1485
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1486 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1487 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1488 $cf::PLAYER{$login} = $pl
1397 } 1489 }
1398 } 1490 }
1408 1500
1409 return if $pl->{deny_save}; 1501 return if $pl->{deny_save};
1410 1502
1411 aio_mkdir playerdir $pl, 0770; 1503 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1504 $pl->{last_save} = $cf::RUNTIME;
1505
1506 cf::get_slot 0.01;
1413 1507
1414 $pl->save_pl ($path); 1508 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1509 cf::cede_to_tick;
1416} 1510}
1417 1511
1449 my ($pl) = @_; 1543 my ($pl) = @_;
1450 1544
1451 my $name = $pl->ob->name; 1545 my $name = $pl->ob->name;
1452 1546
1453 $pl->{deny_save} = 1; 1547 $pl->{deny_save} = 1;
1454 $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
1455 1549
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1551 $pl->deactivate;
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1554 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1555 $pl->ns->destroy if $pl->ns;
1460 1556
1461 my $path = playerdir $pl; 1557 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1558 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1597
1502 for my $login (@$dirs) { 1598 for my $login (@$dirs) {
1503 my $path = path $login; 1599 my $path = path $login;
1504 1600
1505 # a .pst is a dead give-away for a valid player 1601 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1602 # if no pst file found, open and chekc for blocked users
1603 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1604 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1605 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1606 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1607 }
1511 1608
1542 } 1639 }
1543 1640
1544 \@paths 1641 \@paths
1545} 1642}
1546 1643
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1645
1549Expand crossfire pod fragments into protocol xml. 1646Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636 1647
1637=item $player->ext_reply ($msgid, @msg) 1648=item $player->ext_reply ($msgid, @msg)
1638 1649
1639Sends an ext reply to the player. 1650Sends an ext reply to the player.
1640 1651
1707our $MAX_RESET = 3600; 1718our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1719our $DEFAULT_RESET = 3000;
1709 1720
1710sub generate_random_map { 1721sub generate_random_map {
1711 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
1712 # mit "rum" bekleckern, nicht 1726 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1727 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1838 1852
1839# the temporary/swap location 1853# the temporary/swap location
1840sub save_path { 1854sub save_path {
1841 my ($self) = @_; 1855 my ($self) = @_;
1842 1856
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1857 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1858 "$TMPDIR/$path.map"
1845} 1859}
1846 1860
1847# the unique path, undef == no special unique path 1861# the unique path, undef == no special unique path
1848sub uniq_path { 1862sub uniq_path {
1849 my ($self) = @_; 1863 my ($self) = @_;
1850 1864
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1853}
1854
1855# and all this just because we cannot iterate over
1856# all maps in C++...
1857sub change_all_map_light {
1858 my ($change) = @_;
1859
1860 $_->change_map_light ($change)
1861 for grep $_->outdoor, values %cf::MAP;
1862} 1867}
1863 1868
1864sub decay_objects { 1869sub decay_objects {
1865 my ($self) = @_; 1870 my ($self) = @_;
1866 1871
1950sub find { 1955sub find {
1951 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1952 1957
1953 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1954 1959
1955 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1957 1962
1958 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1962 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
1963 or return; 1965 or return;
1964 1966
1965 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
1966 1968
1968 or return; 1970 or return;
1969 1971
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1972 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 1973 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 1974 #$cf::WAIT_FOR_TICK->wait;
1975 undef $guard2;
1973 undef $guard1; 1976 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 1977 $map->reset;
1976 return find $path; 1978 return find $path;
1977 } 1979 }
1978 1980
1979 $cf::MAP{$path} = $map 1981 $cf::MAP{$path} = $map
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2008 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2009 $f->skip_block;
2008 $self->_load_objects ($f) 2010 $self->_load_objects ($f)
2009 or return; 2011 or return;
2010 2012
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2013 $self->post_load_original
2012 if delete $self->{load_original}; 2014 if delete $self->{load_original};
2013 2015
2014 if (my $uniq = $self->uniq_path) { 2016 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2017 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2018 unless (aio_stat $uniq) {
2034 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2035 $self->decay_objects; 2037 $self->decay_objects;
2036 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2037 $self->update_buttons; 2039 $self->update_buttons;
2038 cf::cede_to_tick; 2040 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
2041 $self->activate; 2041 $self->activate;
2042 } 2042 }
2043 2043
2044 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2046 2046
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2048 }
2049 2049
2050 $self->post_load; 2050 $self->post_load;
2051} 2051}
2052 2052
2110 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2111 2111
2112 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2113 2113
2114 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2116 }
2117 2117
2118 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2119 2119
2120 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2157 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2160 }; 2160 };
2161 2161
2162 cf::get_slot 0.02;
2163
2162 if ($uniq) { 2164 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2167 } else {
2166 $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);
2174 $self->save; 2176 $self->save;
2175 2177
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2179
2178 return if $self->players; 2180 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2181 2183
2182 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2183 2185
2184 $self->deactivate; 2186 $self->deactivate;
2302 2304
2303sub unique_maps() { 2305sub unique_maps() {
2304 [ 2306 [
2305 map { 2307 map {
2306 utf8::decode $_; 2308 utf8::decode $_;
2307 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2308 ? normalise $_ 2312 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2314 ]
2312} 2315}
2313 2316
2314package cf;
2315
2316=back 2317=back
2317 2318
2318=head3 cf::object 2319=head3 cf::object
2319 2320
2320=cut 2321=cut
2323 2324
2324=over 4 2325=over 4
2325 2326
2326=item $ob->inv_recursive 2327=item $ob->inv_recursive
2327 2328
2328Returns 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.
2329 2331
2330=cut 2332=cut
2331 2333
2332sub inv_recursive_; 2334sub inv_recursive_;
2333sub inv_recursive_ { 2335sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2339} 2341}
2340 2342
2341=item $ref = $ob->ref 2343=item $ref = $ob->ref
2342 2344
2343creates 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.
2344 2346
2345=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2346 2348
2347returns 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,
2348even if the object actually exists. May block. 2350even if the object actually exists. May block.
2380can 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
2381dialogue with the given NPC character. 2383dialogue with the given NPC character.
2382 2384
2383=cut 2385=cut
2384 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
2385# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2402# with dialog boxes.
2387#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
2388sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2401 $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));
2402 2418
2403 } else { 2419 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2422 }
2407 } 2423 }
2408} 2424}
2409 2425
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2451
2436=item $player_object->enter_link 2452=item $player_object->enter_link
2437 2453
2438Freezes 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}>).
2439 2455
2440The 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.
2441I<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.
2442 2460
2443Will never block. 2461Will never block.
2444 2462
2445=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2446 2464
2504 2522
2505 $map->load; 2523 $map->load;
2506 $map->load_neighbours; 2524 $map->load_neighbours;
2507 2525
2508 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2509 $self->activate_recursive; 2528 $self->activate_recursive;
2510 2529
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2513} 2532}
2517Moves 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
2518her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2519that 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
2520the 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
2521be 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 >>.
2522 2544
2523=cut 2545=cut
2524 2546
2525our $GOTOGEN; 2547our $GOTOGEN;
2526 2548
2605} 2627}
2606 2628
2607sub prepare_random_map { 2629sub prepare_random_map {
2608 my ($exit) = @_; 2630 my ($exit) = @_;
2609 2631
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2634 # that depends on the exit object
2615 2635
2616 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2638 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2623 } 2645 }
2624 2646
2625 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2626 2648
2627 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2630 2652
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2655 undef $fh;
2634 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2635 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2638 } 2664 }
2639} 2665}
2640 2666
2641sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2643 2669
2644 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2645 2671
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2672 $self->enter_link;
2658 2673
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2674 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2665 2676
2666 $self->deactivate_recursive; # just to be sure
2667 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
2668 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2669 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
2670 1; 2698 1
2671 }) { 2699 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "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. "
2674 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2704
2677 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2743 id => "infobox", 2771 id => "infobox",
2744 title => "Body Parts", 2772 title => "Body Parts",
2745 reply => undef, 2773 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2747 }, 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 },
2748 "c/uptime" => { 2800 "c/uptime" => {
2749 id => "infobox", 2801 id => "infobox",
2750 title => "Uptime", 2802 title => "Uptime",
2751 reply => undef, 2803 reply => undef,
2752 tooltip => "How long the server has been running since last restart", 2804 tooltip => "How long the server has been running since last restart",
2755 id => "infobox", 2807 id => "infobox",
2756 title => "Map Info", 2808 title => "Map Info",
2757 reply => undef, 2809 reply => undef,
2758 tooltip => "Information related to the maps", 2810 tooltip => "Information related to the maps",
2759 }, 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,
2760); 2826);
2761 2827
2762sub cf::client::send_msg { 2828sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2830
2765 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2766 2833
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 2835
2769 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2772 2839
2773 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2777 2842
2778 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2783 if $self->can_msg;
2784 } 2848 }
2785 2849
2786 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2787 } 2851 }
2788 2852
2789 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2790 2854
2791 if ($self->can_msg) {
2792 # default colour, mask it out 2855 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2795 2858
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2859 my $pkt = "msg "
2860 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2798 } else { 2862 );
2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809 2863
2810 $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};
2811 2867
2812 utf8::encode $msg; 2868 # split very large packets
2813 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2814 if (0 && $msg =~ /\[/) { 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2815 # COMMAND/INFO 2871 $pkt = "frag";
2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2817 } else {
2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2819 $self->send_packet ("drawinfo $color $msg")
2820 }
2821 }
2822 } 2872 }
2873
2874 $self->send_packet ($pkt);
2823} 2875}
2824 2876
2825=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2826 2878
2827Sends an ext event to the client. 2879Sends an ext event to the client.
3001 3053
3002The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3003 3055
3004 cf::object 3056 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3058 insert remove name archname title slaying race decrease split
3059 value
3007 3060
3008 cf::object::player 3061 cf::object::player
3009 player 3062 player
3010 3063
3011 cf::player 3064 cf::player
3016 3069
3017=cut 3070=cut
3018 3071
3019for ( 3072for (
3020 ["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
3021 insert remove inv name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3023 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3025 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3026) { 3079) {
3027 no strict 'refs'; 3080 no strict 'refs';
3028 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3029 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3046 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3047 3100
3048 my $qcode = $code; 3101 my $qcode = $code;
3049 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3050 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3051 3106
3052 local $_; 3107 local $_;
3053 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3054 3109
3055 my $eval = 3110 my $eval =
3132 { 3187 {
3133 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
3134 3189
3135 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
3137 cf::face::set_visibility $idx, $info->{visibility}; 3193 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3194 cf::face::set_magicmap $idx, $info->{magicmap};
3139 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};
3140 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};
3141 3197
3142 cf::cede_to_tick; 3198 cf::cede_to_tick;
3143 } 3199 }
3144 3200
3145 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
3147 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
3148 or next; 3205 or next;
3206
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3208 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3210 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
3171 { 3229 {
3172 # TODO: for gcfclient pleasure, we should give resources 3230 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3231 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3232 my $res = $facedata->{resource};
3175 3233
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3234 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3236 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3237 my $data;
3181 3238
3182 if ($info->{type} & 1) { 3239 if ($info->{type} & 1) {
3183 # prepend meta info 3240 # prepend meta info
3184 3241
3185 my $meta = $enc->encode ({ 3242 my $meta = $enc->encode ({
3186 name => $name, 3243 name => $name,
3187 %{ $info->{meta} || {} }, 3244 %{ $info->{meta} || {} },
3188 }); 3245 });
3189 3246
3190 $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};
3191 } else { 3254 } else {
3192 $data = $info->{data}; 3255 $RESOURCE{$name} = $info;
3193 } 3256 }
3194 3257
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3258 cf::cede_to_tick;
3199 } 3259 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3260 }
3261
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3263
3220 1 3264 1
3221} 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});
3222 3286
3223register_exticmd fx_want => sub { 3287register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3288 my ($ns, $want) = @_;
3225 3289
3226 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3228 } 3292 }
3229}; 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}
3230 3304
3231sub reload_regions { 3305sub reload_regions {
3232 # 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
3233 # for this (global event?) 3307 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3322}
3249 3323
3250sub reload_archetypes { 3324sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3327}
3259 3328
3260sub reload_treasures { 3329sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3263} 3332}
3264 3333
3265sub reload_resources { 3334sub reload_resources {
3266 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3267 3336
3337 reload_facedata;
3338 reload_archetypes;
3268 reload_regions; 3339 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3340 reload_treasures;
3273 3341
3274 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3275}
3276
3277sub init {
3278 reload_resources;
3279} 3343}
3280 3344
3281sub reload_config { 3345sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3347 or return;
3284 3348
3285 local $/; 3349 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3350 *CFG = YAML::Load <$fh>;
3287 3351
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3353
3290 $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};
3291 $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};
3297 }; 3361 };
3298 warn $@ if $@; 3362 warn $@ if $@;
3299 } 3363 }
3300} 3364}
3301 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
3302sub 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
3303 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3305 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#
3306 (async { 3403 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3405 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3310 }; 3407 };
3311 3408
3409 evthread_start IO::AIO::poll_fileno;
3410
3411 cf::sync_job {
3412 reload_resources;
3312 reload_config; 3413 reload_config;
3313 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
3314 load_extensions; 3427 load_extensions;
3315 3428
3316 $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
3317 Event::loop; 3437 EV::loop;
3318} 3438}
3319 3439
3320############################################################################# 3440#############################################################################
3321# initialisation and cleanup 3441# initialisation and cleanup
3322 3442
3323# install some emergency cleanup handlers 3443# install some emergency cleanup handlers
3324BEGIN { 3444BEGIN {
3445 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3446 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3447 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3448 cf::cleanup "SIG$signal";
3333 },
3334 ); 3449 };
3335 } 3450 }
3336} 3451}
3337 3452
3338sub write_runtime { 3453sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime";
3340
3341 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3343 3456
3344 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3458
3346 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3347 3460
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3349 or return; 3462 or return;
3350 3463
3351 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3364 3477
3365 close $fh 3478 close $fh
3366 or return; 3479 or return;
3367 3480
3368 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3482 and return;
3370 3483
3371 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3372 3485
3373 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 };
3374} 3537}
3375 3538
3376sub emergency_save() { 3539sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3378 3541
3379 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3380 3543
3381 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
3382 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3383 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3384 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3385 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3386 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3387 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3388 $pl->valid or next; 3556 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3390 $pl->save; 3558 $pl->save;
3391 } 3559 }
3392 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3393 3561
3394 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3395 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3396 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3397 $map->valid or next; 3565 $map->valid or next;
3398 $map->save; 3566 $map->save;
3399 } 3567 }
3400 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3401 3569
3402 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3404 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";
3405 }; 3577 };
3406 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
3407 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3408} 3585}
3409 3586
3410sub post_cleanup { 3587sub post_cleanup {
3411 my ($make_core) = @_; 3588 my ($make_core) = @_;
3412 3589
3413 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3414 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#
3415} 3621}
3416 3622
3417sub do_reload_perl() { 3623sub do_reload_perl() {
3418 # can/must only be called in main 3624 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3420 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3421 return; 3627 return;
3422 } 3628 }
3423 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3424 warn "reloading..."; 3635 warn "reloading...";
3425 3636
3426 warn "entering sync_job"; 3637 warn "entering sync_job";
3427 3638
3428 cf::sync_job { 3639 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3641 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3432 3643
3433 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3646
3436 # 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
3437 3648
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = ();
3457
3458 warn "removing commands";
3459 %COMMAND = ();
3460
3461 warn "removing ext/exti commands";
3462 %EXTCMD = ();
3463 %EXTICMD = ();
3464
3465 warn "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg";
3468
3469 if (my $cb = $pkg->can ("unload")) {
3470 eval {
3471 $cb->($pkg);
3472 1
3473 } or warn "$pkg unloaded, but with errors: $@";
3474 } 3652 }
3475 3653
3476 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3478 } 3656 %EXT_CORO = ();
3479 3657
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3481 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3485 delete $INC{$k};
3486 3668
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3491 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3492 } 3678 }
3493 3679
3494 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;
3495 } 3695 }
3496 3696
3497 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3499 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);
3500 3700
3501 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3504 3704
3505 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3706 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3508 3708
3509 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3510 3710
3511 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3512 require cf; 3712 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3514 3714
3515 warn "loading config and database again"; 3715 warn "loading config and database again";
3516 cf::reload_config; 3716 cf::reload_config;
3517 3717
3518 warn "loading extensions"; 3718 warn "loading extensions";
3519 cf::load_extensions; 3719 cf::load_extensions;
3520 3720
3721 if ($REATTACH_ON_RELOAD) {
3521 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3527 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3528 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3529 3734
3530 1 3735 1
3531 } or do { 3736 } or do {
3532 warn $@; 3737 warn $@;
3533 warn "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3739 };
3536 3740
3537 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3538}; 3747};
3539 3748
3540our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3541 3750
3542sub reload_perl() { 3751sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3545 3754
3546 $RELOAD_WATCHER ||= Event->timer ( 3755 $RELOAD_WATCHER ||= cf::async {
3547 reentrant => 0, 3756 Coro::AIO::aio_wait cache_extensions;
3548 after => 0, 3757
3549 data => WF_AUTOCANCEL, 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3550 cb => sub {
3551 do_reload_perl; 3759 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3553 }, 3761 };
3554 ); 3762 };
3555} 3763}
3556 3764
3557register_command "reload" => sub { 3765register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3559 3767
3572 3780
3573our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3575 3783
3576sub wait_for_tick { 3784sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3786
3580 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3789 $signal->wait;
3583} 3790}
3584 3791
3585sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3794
3589 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3797 $signal->wait;
3592} 3798}
3593 3799
3594$TICK_WATCHER = Event->timer ( 3800sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3602 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"
3603 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3604 return; 3804 return;
3605 } 3805 }
3606 3806
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3610 3808
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3811 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3813 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3815 };
3816 }
3622 3817
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3819 $sig->send;
3625 } 3820 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3822 $sig->send;
3628 } 3823 }
3629 3824
3630 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3827
3641 _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 }
3642 }, 3834 }
3643); 3835}
3644 3836
3645{ 3837{
3838 # configure BDB
3839
3646 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3842 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 3843
3672 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | 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;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 3851
3679 cf::sync_job { 3852 cf::sync_job {
3680 eval { 3853 eval {
3690 3863
3691 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3865 };
3693 } 3866 }
3694 3867
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3868 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 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 { };
3703 },
3704 ); 3870 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3871 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3873 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3876 };
3725} 3877}
3726 3878
3727{ 3879{
3880 # configure IO::AIO
3881
3728 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 3885}
3741 3886
3742my $_log_backtrace; 3887my $_log_backtrace;
3743 3888
3744sub _log_backtrace { 3889sub _log_backtrace {
3747 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3748 3893
3749 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3752 async { 3898 async {
3753 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3754 3900
3755 my @bt = fork_call { 3901 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3767 } 3913 }
3768 3914
3769 @funcs 3915 @funcs
3770 }; 3916 };
3771 3917
3772 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 3921 --$_log_backtrace;
3775 }; 3922 };
3776 } else { 3923 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3779 } 3926 }
3780} 3927}
3781 3928
3782# load additional modules 3929# load additional modules
3783use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3784 3931
3785END { cf::emergency_save } 3932END { cf::emergency_save }
3786 3933
37871 39341
3788 3935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines