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.332 by root, Sat Aug 18 17:33:53 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 1.4 (); 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
112our $BDB_DEADLOCK_WATCHER;
113our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 114our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 115our $DB_ENV;
116
117our @EXTRA_MODULES = qw(pod mapscript);
86 118
87our %CFG; 119our %CFG;
88 120
89our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 122our $RUNTIME;
123our $NOW;
91 124
92our %PLAYER; # all users 125our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 126our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 127our $LINK_MAP; # the special {link} map, which is always available
95 128
96# 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 ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 130our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 131
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
134our $JITTER; # average jitter
101our $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)
102 140
103binmode STDOUT; 141binmode STDOUT;
104binmode STDERR; 142binmode STDERR;
105 143
106# read virtual server time, if available 144# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
111} 149}
112 150
113mkdir $_ 151mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
159 197
160The raw value load value from the last tick. 198The raw value load value from the last tick.
161 199
162=item %cf::CFG 200=item %cf::CFG
163 201
164Configuration for the server, loaded from C</etc/crossfire/config>, or 202Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 203from wherever your confdir points to.
166 204
167=item cf::wait_for_tick, cf::wait_for_tick_begin 205=item cf::wait_for_tick, cf::wait_for_tick_begin
168 206
169These 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
187 $msg .= "\n" 225 $msg .= "\n"
188 unless $msg =~ /\n$/; 226 unless $msg =~ /\n$/;
189 227
190 $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;
191 229
192 utf8::encode $msg;
193 LOG llevError, $msg; 230 LOG llevError, $msg;
194 }; 231 };
195} 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#?
196 248
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 249@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 250@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 251@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 252@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 259for my $pkg (qw(
208 cf::global cf::attachable 260 cf::global cf::attachable
209 cf::object cf::object::player 261 cf::object cf::object::player
210 cf::client cf::player 262 cf::client cf::player
211 cf::arch cf::living 263 cf::arch cf::living
264 cf::map cf::mapspace
212 cf::map cf::party cf::region 265 cf::party cf::region
213)) { 266)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 268}
217 269
218$Event::DIED = sub { 270$EV::DIED = sub {
219 warn "error in event callback: @_"; 271 warn "error in event callback: @_";
220}; 272};
221 273
222############################################################################# 274#############################################################################
223 275
246 $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;
247 $d 299 $d
248 } || "[unable to dump $_[0]: '$@']"; 300 } || "[unable to dump $_[0]: '$@']";
249} 301}
250 302
251=item $ref = cf::from_json $json 303=item $ref = cf::decode_json $json
252 304
253Converts a JSON string into the corresponding perl data structure. 305Converts a JSON string into the corresponding perl data structure.
254 306
255=item $json = cf::to_json $ref 307=item $json = cf::encode_json $ref
256 308
257Converts a perl data structure into its JSON representation. 309Converts a perl data structure into its JSON representation.
258 310
259=cut 311=cut
260 312
261our $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
262 314
263sub to_json ($) { $json_coder->encode ($_[0]) } 315sub encode_json($) { $json_coder->encode ($_[0]) }
264sub 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}
265 331
266=item cf::lock_wait $string 332=item cf::lock_wait $string
267 333
268Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
269 335
270=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
271 337
272Wait 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
273a 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,
274for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
275returned. 341returned.
276 342
343Locks are *not* recursive, locking from the same coro twice results in a
344deadlocked coro.
345
277Lock names should begin with a unique identifier (for example, cf::map::find 346Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 347uses map_find and cf::map::load uses map_load).
279 348
280=item $locked = cf::lock_active $string 349=item $locked = cf::lock_active $string
281 350
282Return 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.
283 352
284=cut 353=cut
285 354
286our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
287 356
288sub lock_wait($) { 357sub lock_wait($) {
289 my ($key) = @_; 358 $LOCKS->wait ($_[0]);
290
291 # wait for lock, if any
292 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule;
295 }
296} 359}
297 360
298sub lock_acquire($) { 361sub lock_acquire($) {
299 my ($key) = @_; 362 $LOCKS->guard ($_[0])
300
301 # wait, to be sure we are not locked
302 lock_wait $key;
303
304 $LOCK{$key} = [];
305
306 Coro::guard {
307 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} };
309 }
310} 363}
311 364
312sub lock_active($) { 365sub lock_active($) {
313 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
314
315 ! ! $LOCK{$key}
316} 367}
317 368
318sub freeze_mainloop { 369sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 370 tick_inhibit_inc;
320 371
321 my $guard = Coro::guard { 372 &Guard::guard (\&tick_inhibit_dec);
322 $TICK_WATCHER->start; 373}
323 }; 374
324 $TICK_WATCHER->stop; 375=item cf::periodic $interval, $cb
325 $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
326} 388}
327 389
328=item cf::get_slot $time[, $priority[, $name]] 390=item cf::get_slot $time[, $priority[, $name]]
329 391
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 392Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 403our @SLOT_QUEUE;
342our $SLOT_QUEUE; 404our $SLOT_QUEUE;
343 405
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 406$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 407$SLOT_QUEUE = Coro::async {
408 $Coro::current->desc ("timeslot manager");
409
346 my $signal = new Coro::Signal; 410 my $signal = new Coro::Signal;
347 411
348 while () { 412 while () {
349 next_job: 413 next_job:
350 my $avail = cf::till_tick; 414 my $avail = cf::till_tick;
358 } 422 }
359 } 423 }
360 } 424 }
361 425
362 if (@SLOT_QUEUE) { 426 if (@SLOT_QUEUE) {
363 # 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
364 push @cf::WAIT_FOR_TICK, $signal; 428 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 429 $signal->wait;
366 } else { 430 } else {
367 Coro::schedule; 431 Coro::schedule;
368 } 432 }
369 } 433 }
370}; 434};
371 435
372sub get_slot($;$$) { 436sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main;
438
373 my ($time, $pri, $name) = @_; 439 my ($time, $pri, $name) = @_;
374 440
375 $time = $TICK * .6 if $time > $TICK * .6; 441 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 442 my $sig = new Coro::Signal;
377 443
391 457
392BEGIN { *async = \&Coro::async_pool } 458BEGIN { *async = \&Coro::async_pool }
393 459
394=item cf::sync_job { BLOCK } 460=item cf::sync_job { BLOCK }
395 461
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 462The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 463is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 464partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 465acceptable.
400 466
401If 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
402the given BLOCK in another coroutine while waiting for the result. The 468the given BLOCK in another coroutine while waiting for the result. The
407 473
408sub sync_job(&) { 474sub sync_job(&) {
409 my ($job) = @_; 475 my ($job) = @_;
410 476
411 if ($Coro::current == $Coro::main) { 477 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 478 my $time = EV::time;
413 479
414 # this is the main coro, too bad, we have to block 480 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 481 # till the operation succeeds, freezing the server :/
416 482
417 # TODO: use suspend/resume instead 483 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 484
419 my $freeze_guard = freeze_mainloop; 485 my $freeze_guard = freeze_mainloop;
420 486
421 my $busy = 1; 487 my $busy = 1;
422 my @res; 488 my @res;
423 489
424 (async { 490 (async {
491 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 492 @res = eval { $job->() };
426 warn $@ if $@; 493 warn $@ if $@;
427 undef $busy; 494 undef $busy;
428 })->prio (Coro::PRIO_MAX); 495 })->prio (Coro::PRIO_MAX);
429 496
430 while ($busy) { 497 while ($busy) {
431 Coro::cede or Event::one_event; 498 if (Coro::nready) {
499 Coro::cede_notself;
500 } else {
501 EV::loop EV::LOOP_ONESHOT;
432 } 502 }
503 }
433 504
434 $time = Event::time - $time; 505 my $time = EV::time - $time;
435 506
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 507 $TICK_START += $time; # do not account sync jobs to server load
440 508
441 wantarray ? @res : $res[0] 509 wantarray ? @res : $res[0]
442 } else { 510 } else {
443 # we are in another coroutine, how wonderful, everything just works 511 # we are in another coroutine, how wonderful, everything just works
444 512
469=item fork_call { }, $args 537=item fork_call { }, $args
470 538
471Executes the given code block with the given arguments in a seperate 539Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 540process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 541Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 542never block itself or use any form of event handling.
475 543
476=cut 544=cut
477 545
478sub fork_call(&@) { 546sub fork_call(&@) {
479 my ($cb, @args) = @_; 547 my ($cb, @args) = @_;
480 548
481 # we seemingly have to make a local copy of the whole thing, 549 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 550 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 551 # TODO: investigate and fix (likely this will be rather laborious)
484 552
485 my @res = Coro::Util::fork_eval { 553 my @res = Coro::Util::fork_eval {
486 reset_signals; 554 reset_signals;
487 &$cb 555 &$cb
488 }, @args; 556 }, @args;
489 557
490 wantarray ? @res : $res[-1] 558 wantarray ? @res : $res[-1]
491} 559}
492 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
586}
587
493=item $value = cf::db_get $family => $key 588=item $value = cf::db_get $family => $key
494 589
495Returns a single value from the environment database. 590Returns a single value from the environment database.
496 591
497=item cf::db_put $family => $key => $value 592=item cf::db_put $family => $key => $value
498 593
499Stores the given C<$value> in the family. It can currently store binary 594Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 595data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 596
597=item $db = cf::db_table "name"
598
599Create and/or open a new database table. The string must not be "db" and must be unique
600within each server.
601
502=cut 602=cut
603
604sub db_table($) {
605 my ($name) = @_;
606 my $db = BDB::db_create $DB_ENV;
607
608 eval {
609 $db->set_flags (BDB::CHKSUM);
610
611 utf8::encode $name;
612 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
613 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
614 cf::cleanup "db_open(db): $!" if $!;
615 };
616 cf::cleanup "db_open(db): $@" if $@;
617
618 $db
619}
503 620
504our $DB; 621our $DB;
505 622
506sub db_init { 623sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 624 cf::sync_job {
511 eval { 625 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 626 };
521} 627}
522 628
523sub db_get($$) { 629sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 630 my $key = "$_[0]/$_[1]";
525 631
575 if (1) { 681 if (1) {
576 $md5 = 682 $md5 =
577 join "\x00", 683 join "\x00",
578 $processversion, 684 $processversion,
579 map { 685 map {
580 Coro::cede; 686 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 687 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 688 } 0.. $#$src;
583 689
584 690
585 my $dbmd5 = db_get cache => "$id/md5"; 691 my $dbmd5 = db_get cache => "$id/md5";
623 729
624############################################################################# 730#############################################################################
625 731
626=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
627 733
628Many 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
629attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
631 737
632In 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>
633C<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
634Crossfire TRT). 740Deliantra).
635 741
636=over 4 742=over 4
637 743
638=item $attachable->attach ($attachment, key => $value...) 744=item $attachable->attach ($attachment, key => $value...)
639 745
683=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
684 790
685Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
687 793
688Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
689that 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.
690 796
691These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
692 798
693=over 4 799=over 4
921 } 1027 }
922 1028
923 0 1029 0
924} 1030}
925 1031
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1032=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1033
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1034=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1035
930Generate an object-specific event with the given arguments. 1036Generate an object-specific event with the given arguments.
931 1037
937 1043
938=cut 1044=cut
939 1045
940############################################################################# 1046#############################################################################
941# object support 1047# object support
942#
943 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#
944sub _can_merge { 1082sub _can_merge {
945 my ($ob1, $ob2) = @_; 1083 my ($ob1, $ob2) = @_;
946 1084
947 local $Storable::canonical = 1; 1085 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1086
951 $fob1 eq $fob2 1087 # we do the slow way here
1088 return _object_equal $ob1, $ob2
952} 1089}
953 1090
954sub reattach { 1091sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1092 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1093 my ($obj) = @_;
957 1094
1095 # no longer needed after getting rid of delete_package?
958 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
959 1097
960 my $registry = $obj->registry; 1098 my $registry = $obj->registry;
961 1099
962 @$registry = (); 1100 @$registry = ();
963 1101
978cf::attachable->attach ( 1116cf::attachable->attach (
979 prio => -1000000, 1117 prio => -1000000,
980 on_instantiate => sub { 1118 on_instantiate => sub {
981 my ($obj, $data) = @_; 1119 my ($obj, $data) = @_;
982 1120
983 $data = from_json $data; 1121 $data = decode_json $data;
984 1122
985 for (@$data) { 1123 for (@$data) {
986 my ($name, $args) = @$_; 1124 my ($name, $args) = @$_;
987 1125
988 $obj->attach ($name, %{$args || {} }); 1126 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1142sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1143 my ($filename, $rdata, $objs) = @_;
1006 1144
1007 sync_job { 1145 sync_job {
1008 if (length $$rdata) { 1146 if (length $$rdata) {
1147 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1148 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1149 $decname, length $$rdata, scalar @$objs;
1011 1150
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1152 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1016 close $fh; 1155 aio_close $fh;
1017 1156
1018 if (@$objs) { 1157 if (@$objs) {
1019 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) {
1020 chmod SAVE_MODE, $fh; 1159 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1161 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1162 aio_fsync $fh if $cf::USE_FSYNC;
1024 close $fh; 1163 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1164 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1165 }
1027 } else { 1166 } else {
1028 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1029 } 1168 }
1030 1169
1031 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1032 } else { 1174 } else {
1033 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1034 } 1176 }
1035 } else { 1177 } else {
1036 aio_unlink $filename; 1178 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1038 } 1180 }
1039 } 1181 };
1040} 1182}
1041 1183
1042sub object_freezer_as_string { 1184sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1185 my ($rdata, $objs) = @_;
1044 1186
1056 or return; 1198 or return;
1057 1199
1058 unless (aio_stat "$filename.pst") { 1200 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1201 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1202 or return;
1203
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1204 my $st = eval { Coro::Storable::thaw $av };
1205 $av = $st->{objs};
1062 } 1206 }
1063 1207
1208 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1209 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1210 $decname, length $data, scalar @{$av || []};
1211
1066 return ($data, $av); 1212 ($data, $av)
1067} 1213}
1068 1214
1069=head2 COMMAND CALLBACKS 1215=head2 COMMAND CALLBACKS
1070 1216
1071=over 4 1217=over 4
1125 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1126 1272
1127 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1128} 1274}
1129 1275
1276use File::Glob ();
1277
1130cf::player->attach ( 1278cf::player->attach (
1131 on_command => sub { 1279 on_command => sub {
1132 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1133 1281
1134 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
1149 my ($type, $reply, @payload) = 1297 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1298 "ARRAY" eq ref $msg
1151 ? @$msg 1299 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1300 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1301
1302 my @reply;
1303
1154 if (my $cb = $EXTCMD{$type}) { 1304 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1305 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1306 }
1307
1308 $pl->ext_reply ($reply, @reply)
1309 if $reply;
1310
1160 } else { 1311 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1312 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1313 }
1163 1314
1164 cf::override; 1315 cf::override;
1165 }, 1316 },
1166); 1317);
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}
1167 1331
1168sub load_extensions { 1332sub load_extensions {
1169 cf::sync_job { 1333 cf::sync_job {
1170 my %todo; 1334 my %todo;
1171 1335
1191 1355
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1358
1195 $ext{source} = 1359 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n" 1361 . "#line 1 \"$path\"\n{\n"
1198 . $source 1362 . $source
1199 . "\n};\n1"; 1363 . "\n};\n1";
1200 1364
1201 $todo{$base} = \%ext; 1365 $todo{$base} = \%ext;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1381 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1382 : "$v->{base}: extension inactive.\n";
1219 1383
1220 if (exists $v->{meta}{mandatory}) { 1384 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1385 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1386 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1387 }
1225 1388
1226 warn $msg; 1389 warn $msg;
1227 } 1390 }
1228 1391
1242 1405
1243=back 1406=back
1244 1407
1245=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1246 1409
1247Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1248 1411
1249=cut 1412=cut
1250 1413
1251package cf::player; 1414package cf::player;
1252 1415
1253use Coro::AIO; 1416use Coro::AIO;
1254 1417
1255=head3 cf::player 1418=head3 cf::player
1256 1419
1257=over 4 1420=over 4
1421
1422=item cf::player::num_playing
1423
1424Returns the official number of playing players, as per the Crossfire metaserver rules.
1425
1426=cut
1427
1428sub num_playing {
1429 scalar grep
1430 $_->ob->map
1431 && !$_->hidden
1432 && !$_->ob->flag (cf::FLAG_WIZ),
1433 cf::player::list
1434}
1258 1435
1259=item cf::player::find $login 1436=item cf::player::find $login
1260 1437
1261Returns the given player object, loading it if necessary (might block). 1438Returns the given player object, loading it if necessary (might block).
1262 1439
1281 1458
1282sub exists($) { 1459sub exists($) {
1283 my ($login) = @_; 1460 my ($login) = @_;
1284 1461
1285 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1286 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1287} 1464}
1288 1465
1289sub find($) { 1466sub find($) {
1290 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1291 my $login = $_[0]; 1468 my $login = $_[0];
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1475 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1476 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1477 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1478 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1479
1303 my $pl = load_pl path $login 1480 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1481 or return;
1482
1483 my $pl = cf::player::load_pl $f
1484 or return;
1485
1486 local $cf::PLAYER_LOADING{$login} = $pl;
1487 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1488 $cf::PLAYER{$login} = $pl
1306 } 1489 }
1307 } 1490 }
1308} 1491}
1309 1492
1318 return if $pl->{deny_save}; 1501 return if $pl->{deny_save};
1319 1502
1320 aio_mkdir playerdir $pl, 0770; 1503 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1504 $pl->{last_save} = $cf::RUNTIME;
1322 1505
1506 cf::get_slot 0.01;
1507
1323 $pl->save_pl ($path); 1508 $pl->save_pl ($path);
1324 Coro::cede; 1509 cf::cede_to_tick;
1325} 1510}
1326 1511
1327sub new($) { 1512sub new($) {
1328 my ($login) = @_; 1513 my ($login) = @_;
1329 1514
1358 my ($pl) = @_; 1543 my ($pl) = @_;
1359 1544
1360 my $name = $pl->ob->name; 1545 my $name = $pl->ob->name;
1361 1546
1362 $pl->{deny_save} = 1; 1547 $pl->{deny_save} = 1;
1363 $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
1364 1549
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1366 $pl->deactivate; 1551 $pl->deactivate;
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1554 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1368 $pl->ns->destroy if $pl->ns; 1555 $pl->ns->destroy if $pl->ns;
1369 1556
1370 my $path = playerdir $pl; 1557 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1558 my $temp = "$path~$cf::RUNTIME~deleting~";
1407 or return []; 1594 or return [];
1408 1595
1409 my @logins; 1596 my @logins;
1410 1597
1411 for my $login (@$dirs) { 1598 for my $login (@$dirs) {
1599 my $path = path $login;
1600
1601 # a .pst is a dead give-away for a valid player
1602 # if no pst file found, open and chekc for blocked users
1603 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1604 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1605 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1606 $buf !~ /^password -------------$/m or next; # official not-valid tag
1607 }
1415 1608
1416 utf8::decode $login; 1609 utf8::decode $login;
1417 push @logins, $login; 1610 push @logins, $login;
1418 } 1611 }
1419 1612
1446 } 1639 }
1447 1640
1448 \@paths 1641 \@paths
1449} 1642}
1450 1643
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1452 1645
1453Expand crossfire pod fragments into protocol xml. 1646Expand deliantra pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500 1647
1501=item $player->ext_reply ($msgid, @msg) 1648=item $player->ext_reply ($msgid, @msg)
1502 1649
1503Sends an ext reply to the player. 1650Sends an ext reply to the player.
1504 1651
1505=cut 1652=cut
1506 1653
1507sub ext_reply($$@) { 1654sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1655 my ($self, $id, @msg) = @_;
1509 1656
1510 if ($self->ns->extcmd == 2) { 1657 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1658}
1518 1659
1519=item $player->ext_msg ($type, @msg) 1660=item $player->ext_msg ($type, @msg)
1520 1661
1521Sends an ext event to the client. 1662Sends an ext event to the client.
1577our $MAX_RESET = 3600; 1718our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1719our $DEFAULT_RESET = 3000;
1579 1720
1580sub generate_random_map { 1721sub generate_random_map {
1581 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
1582 # mit "rum" bekleckern, nicht 1726 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1727 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1852
1709# the temporary/swap location 1853# the temporary/swap location
1710sub save_path { 1854sub save_path {
1711 my ($self) = @_; 1855 my ($self) = @_;
1712 1856
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1857 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1858 "$TMPDIR/$path.map"
1715} 1859}
1716 1860
1717# the unique path, undef == no special unique path 1861# the unique path, undef == no special unique path
1718sub uniq_path { 1862sub uniq_path {
1719 my ($self) = @_; 1863 my ($self) = @_;
1720 1864
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 1867}
1733 1868
1734sub decay_objects { 1869sub decay_objects {
1735 my ($self) = @_; 1870 my ($self) = @_;
1736 1871
1749 1884
1750sub load_header_from($) { 1885sub load_header_from($) {
1751 my ($self, $path) = @_; 1886 my ($self, $path) = @_;
1752 1887
1753 utf8::encode $path; 1888 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1889 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 or return; 1890 or return;
1891
1892 $self->_load_header ($f)
1893 or return;
1894
1895 local $MAP_LOADING{$self->{path}} = $self;
1896 $f->resolve_delayed_derefs;
1759 1897
1760 $self->{load_path} = $path; 1898 $self->{load_path} = $path;
1761 1899
1762 1 1900 1
1763} 1901}
1817sub find { 1955sub find {
1818 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1819 1957
1820 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1821 1959
1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1823 1962
1824 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
1827 or return; 1965 or return;
1828 1966
1829 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
1830 1968
1832 or return; 1970 or return;
1833 1971
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1972 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1973 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1974 #$cf::WAIT_FOR_TICK->wait;
1975 undef $guard2;
1976 undef $guard1;
1837 $map->reset; 1977 $map->reset;
1838 undef $guard;
1839 return find $path; 1978 return find $path;
1840 } 1979 }
1841 1980
1842 $cf::MAP{$path} = $map 1981 $cf::MAP{$path} = $map
1843 } 1982 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 1991 local $self->{deny_reset} = 1; # loading can take a long time
1853 1992
1854 my $path = $self->{path}; 1993 my $path = $self->{path};
1855 1994
1856 { 1995 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 1996 my $guard = cf::lock_acquire "map_data:$path";
1858 1997
1998 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 1999 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2000
1861 $self->in_memory (cf::MAP_LOADING); 2001 $self->in_memory (cf::MAP_LOADING);
1862 2002
1863 $self->alloc; 2003 $self->alloc;
1864 2004
1865 $self->pre_load; 2005 $self->pre_load;
1866 Coro::cede; 2006 cf::cede_to_tick;
1867 2007
2008 my $f = new_from_file cf::object::thawer $self->{load_path};
2009 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2010 $self->_load_objects ($f)
1869 or return; 2011 or return;
1870 2012
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2013 $self->post_load_original
1872 if delete $self->{load_original}; 2014 if delete $self->{load_original};
1873 2015
1874 if (my $uniq = $self->uniq_path) { 2016 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2017 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2018 unless (aio_stat $uniq) {
2019 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2020 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2021 $self->_load_objects ($f);
2022 $f->resolve_delayed_derefs;
2023 }
1879 } 2024 }
1880 } 2025 }
1881 2026
1882 Coro::cede; 2027 $f->resolve_delayed_derefs;
2028
2029 cf::cede_to_tick;
1883 # now do the right thing for maps 2030 # now do the right thing for maps
1884 $self->link_multipart_objects; 2031 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2032 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2033 unless $self->difficulty;
1887 Coro::cede; 2034 cf::cede_to_tick;
1888 2035
1889 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2037 $self->decay_objects;
1891 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
1892 $self->update_buttons; 2039 $self->update_buttons;
1893 Coro::cede; 2040 cf::cede_to_tick;
1894 $self->set_darkness_map;
1895 Coro::cede;
1896 $self->activate; 2041 $self->activate;
1897 } 2042 }
1898 2043
1899 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
1901 2046
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2048 }
1904 2049
1905 $self->post_load; 2050 $self->post_load;
1906} 2051}
1907 2052
1916 2061
1917 $self 2062 $self
1918} 2063}
1919 2064
1920# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2066sub load_neighbours {
1922 my ($map) = @_; 2067 my ($map) = @_;
1923 2068
1924 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1925 2070
1926 for (0 .. 3) { 2071 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1928 or next; 2073 or next;
1929 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1930 or next; 2075 or next;
1931 $neigh->load; 2076 $neigh->load;
1932 2077
2078 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2081 }
1936 2082
1937 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1939 or next; 2086 or next;
1940 $neigh->load; 2087 $neigh->load;
1941 } 2088 }
1942} 2089}
1943 2090
1948} 2095}
1949 2096
1950sub do_load_sync { 2097sub do_load_sync {
1951 my ($map) = @_; 2098 my ($map) = @_;
1952 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1953 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1954} 2104}
1955 2105
1956our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1958 2108
1959sub find_async { 2109sub find_async {
1960 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1961 2111
1962 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1963 2113
1964 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1966 } 2116 }
1967 2117
1968 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1969 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1970 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2125 if (my $map = find $k) {
1973 $map->load; 2126 $map->load if $v;
1974 } 2127 }
1975 2128
1976 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1977 } 2130 }
1978 } 2131 }
1979 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1980 }; 2133 };
1981 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1984} 2137}
1985 2138
1986sub save { 2139sub save {
1987 my ($self) = @_; 2140 my ($self) = @_;
1988 2141
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2143
1991 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1992 2145
1993 return unless $self->dirty; 2146 return unless $self->dirty;
1994 2147
2000 return if $self->{deny_save}; 2153 return if $self->{deny_save};
2001 2154
2002 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
2003 2156
2004 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2006 }; 2160 };
2161
2162 cf::get_slot 0.02;
2007 2163
2008 if ($uniq) { 2164 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2010 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2011 } else { 2167 } else {
2017 my ($self) = @_; 2173 my ($self) = @_;
2018 2174
2019 # save first because save cedes 2175 # save first because save cedes
2020 $self->save; 2176 $self->save;
2021 2177
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2179
2024 return if $self->players; 2180 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2026 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2027 2183
2184 $self->in_memory (cf::MAP_SWAPPED);
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2188 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2189}
2031 2190
2032sub reset_at { 2191sub reset_at {
2033 my ($self) = @_; 2192 my ($self) = @_;
2034 2193
2066 if $uniq; 2225 if $uniq;
2067 } 2226 }
2068 2227
2069 delete $cf::MAP{$self->path}; 2228 delete $cf::MAP{$self->path};
2070 2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2232 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2233
2075 $self->unlink_save; 2234 $self->unlink_save;
2076 $self->destroy; 2235 $self->destroy;
2077} 2236}
2078 2237
2079my $nuke_counter = "aaaa"; 2238my $nuke_counter = "aaaa";
2080 2239
2081sub nuke { 2240sub nuke {
2082 my ($self) = @_; 2241 my ($self) = @_;
2083 2242
2243 {
2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245
2084 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
2085 2247
2086 $self->unlink_save; 2248 $self->unlink_save;
2087 2249
2088 bless $self, "cf::map"; 2250 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2251 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2252 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2253 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2255
2094 $cf::MAP{$self->path} = $self; 2256 $cf::MAP{$self->path} = $self;
2257 }
2095 2258
2096 $self->reset; # polite request, might not happen 2259 $self->reset; # polite request, might not happen
2097} 2260}
2098 2261
2099=item $maps = cf::map::tmp_maps 2262=item $maps = cf::map::tmp_maps
2141 2304
2142sub unique_maps() { 2305sub unique_maps() {
2143 [ 2306 [
2144 map { 2307 map {
2145 utf8::decode $_; 2308 utf8::decode $_;
2146 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2147 ? normalise $_ 2312 : normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2150 ] 2314 ]
2151} 2315}
2152 2316
2153package cf;
2154
2155=back 2317=back
2156 2318
2157=head3 cf::object 2319=head3 cf::object
2158 2320
2159=cut 2321=cut
2162 2324
2163=over 4 2325=over 4
2164 2326
2165=item $ob->inv_recursive 2327=item $ob->inv_recursive
2166 2328
2167Returns 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.
2168 2331
2169=cut 2332=cut
2170 2333
2171sub inv_recursive_; 2334sub inv_recursive_;
2172sub inv_recursive_ { 2335sub inv_recursive_ {
2175 2338
2176sub inv_recursive { 2339sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2178} 2341}
2179 2342
2343=item $ref = $ob->ref
2344
2345Creates and returns a persistent reference to an object that can be stored as a string.
2346
2347=item $ob = cf::object::deref ($refstring)
2348
2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2350even if the object actually exists. May block.
2351
2352=cut
2353
2354sub deref {
2355 my ($ref) = @_;
2356
2357 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2358 my ($uuid, $name) = ($1, $2);
2359 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2360 or return;
2361 $pl->ob->uuid eq $uuid
2362 or return;
2363
2364 $pl->ob
2365 } else {
2366 warn "$ref: cannot resolve object reference\n";
2367 undef
2368 }
2369}
2370
2180package cf; 2371package cf;
2181 2372
2182=back 2373=back
2183 2374
2184=head3 cf::object::player 2375=head3 cf::object::player
2190Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2381Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2191can 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
2192dialogue with the given NPC character. 2383dialogue with the given NPC character.
2193 2384
2194=cut 2385=cut
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};
2195 2400
2196# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2197# with dialog boxes. 2402# with dialog boxes.
2198#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
2199sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2211 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2212 $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));
2213 2418
2214 } else { 2419 } else {
2215 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2216 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2217 } 2422 }
2218 } 2423 }
2219} 2424}
2220 2425
2221=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2246 2451
2247=item $player_object->enter_link 2452=item $player_object->enter_link
2248 2453
2249Freezes 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}>).
2250 2455
2251The 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.
2252I<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.
2253 2460
2254Will never block. 2461Will never block.
2255 2462
2256=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2257 2464
2312 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2315 2522
2316 $map->load; 2523 $map->load;
2317 $map->load_diag; 2524 $map->load_neighbours;
2318 2525
2319 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2320 $self->activate_recursive; 2528 $self->activate_recursive;
2321 2529
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2323 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2324} 2532}
2329her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2330that 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
2331the 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
2332be called at the end of this process. 2540be called at the end of this process.
2333 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 >>.
2544
2334=cut 2545=cut
2335 2546
2336our $GOTOGEN; 2547our $GOTOGEN;
2337 2548
2338sub cf::object::player::goto { 2549sub cf::object::player::goto {
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2554
2344 $self->enter_link; 2555 $self->enter_link;
2345 2556
2346 (async { 2557 (async {
2558 $Coro::current->{desc} = "player::goto $path $x $y";
2559
2560 # *tag paths override both path and x|y
2561 if ($path =~ /^\*(.*)$/) {
2562 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2563 my $ob = $obs[rand @obs];
2564
2565 # see if we actually can go there
2566 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2567 $ob = $obs[rand @obs];
2568 } else {
2569 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2570 }
2571 # else put us there anyways for now #d#
2572
2573 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2574 } else {
2575 ($path, $x, $y) = (undef, undef, undef);
2576 }
2577 }
2578
2347 my $map = eval { 2579 my $map = eval {
2348 my $map = cf::map::find $path; 2580 my $map = defined $path ? cf::map::find $path : undef;
2349 2581
2350 if ($map) { 2582 if ($map) {
2351 $map = $map->customise_for ($self); 2583 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2584 $map = $check->($map) if $check && $map;
2353 } else { 2585 } else {
2354 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2586 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2355 } 2587 }
2356 2588
2357 $map 2589 $map
2358 }; 2590 };
2359 2591
2395} 2627}
2396 2628
2397sub prepare_random_map { 2629sub prepare_random_map {
2398 my ($exit) = @_; 2630 my ($exit) = @_;
2399 2631
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
2401
2402 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2403 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2404 # that depends on the exit object 2634 # that depends on the exit object
2405 2635
2406 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2408 if ($exit->map) { 2638 if ($exit->map) {
2409 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2410 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2411 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2412 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2413 } 2645 }
2414 2646
2415 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2416 2648
2417 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2418 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2420 2652
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh; 2655 undef $fh;
2424 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2425 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2426 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2427 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2428 } 2664 }
2429} 2665}
2430 2666
2431sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2432 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2433 2669
2434 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2435 2671
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
2447 $self->enter_link; 2672 $self->enter_link;
2448 2673
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2453 (async { 2674 (async {
2454 $self->deactivate_recursive; # just to be sure 2675 $Coro::current->{desc} = "enter_exit";
2676
2455 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
2456 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2457 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
2458 1; 2698 1
2459 }) { 2699 }) {
2460 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2461 . "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. "
2462 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2463 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2464 2704
2465 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2493the 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
2494the message unless the client supports the msg packet. 2734the message unless the client supports the msg packet.
2495 2735
2496=cut 2736=cut
2497 2737
2738# non-persistent channels (usually the info channel)
2739our %CHANNEL = (
2740 "c/identify" => {
2741 id => "infobox",
2742 title => "Identify",
2743 reply => undef,
2744 tooltip => "Items recently identified",
2745 },
2746 "c/examine" => {
2747 id => "infobox",
2748 title => "Examine",
2749 reply => undef,
2750 tooltip => "Signs and other items you examined",
2751 },
2752 "c/book" => {
2753 id => "infobox",
2754 title => "Book",
2755 reply => undef,
2756 tooltip => "The contents of a note or book",
2757 },
2758 "c/lookat" => {
2759 id => "infobox",
2760 title => "Look",
2761 reply => undef,
2762 tooltip => "What you saw there",
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,
2826);
2827
2498sub cf::client::send_msg { 2828sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2830
2501 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2502 2833
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 2835
2836 # check predefined channels, for the benefit of C
2837 if ($CHANNEL{$channel}) {
2838 $channel = $CHANNEL{$channel};
2839
2840 $self->ext_msg (channel_info => $channel);
2841 $channel = $channel->{id};
2842
2505 if (ref $channel) { 2843 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2847 $self->ext_msg (channel_info => $channel);
2510 } 2848 }
2512 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2513 } 2851 }
2514 2852
2515 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2516 2854
2517 if ($self->can_msg) {
2518 # default colour, mask it out 2855 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2521 2858
2522 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2859 my $pkt = "msg "
2860 . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2524 } else { 2862 );
2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535 2863
2536 $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};
2537 2867
2538 utf8::encode $msg; 2868 # split very large packets
2539 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2540 if (0 && $msg =~ /\[/) { 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2541 # COMMAND/INFO 2871 $pkt = "frag";
2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2543 } else {
2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2545 $self->send_packet ("drawinfo $color $msg")
2546 }
2547 }
2548 } 2872 }
2873
2874 $self->send_packet ($pkt);
2549} 2875}
2550 2876
2551=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2552 2878
2553Sends an ext event to the client. 2879Sends an ext event to the client.
2555=cut 2881=cut
2556 2882
2557sub cf::client::ext_msg($$@) { 2883sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2884 my ($self, $type, @msg) = @_;
2559 2885
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2886 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2887 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2888 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2889 push @msg, msgtype => "event_$type";
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2891 }
2892}
2893
2894=item $client->ext_reply ($msgid, @msg)
2895
2896Sends an ext reply to the client.
2897
2898=cut
2899
2900sub cf::client::ext_reply($$@) {
2901 my ($self, $id, @msg) = @_;
2902
2903 if ($self->extcmd == 2) {
2904 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2905 } elsif ($self->extcmd == 1) {
2906 #TODO: version 1, remove
2907 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2908 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2909 }
2568} 2910}
2569 2911
2570=item $success = $client->query ($flags, "text", \&cb) 2912=item $success = $client->query ($flags, "text", \&cb)
2632 my ($type, $reply, @payload) = 2974 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2975 "ARRAY" eq ref $msg
2634 ? @$msg 2976 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2977 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 2978
2979 my @reply;
2980
2637 if (my $cb = $EXTICMD{$type}) { 2981 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 2982 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 2983 }
2984
2985 $ns->ext_reply ($reply, @reply)
2986 if $reply;
2987
2643 } else { 2988 } else {
2644 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2989 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2645 } 2990 }
2646 2991
2647 cf::override; 2992 cf::override;
2707=pod 3052=pod
2708 3053
2709The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
2710 3055
2711 cf::object 3056 cf::object
2712 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
2713 insert remove name archname title slaying race 3058 insert remove name archname title slaying race decrease split
3059 value
2714 3060
2715 cf::object::player 3061 cf::object::player
2716 player 3062 player
2717 3063
2718 cf::player 3064 cf::player
2723 3069
2724=cut 3070=cut
2725 3071
2726for ( 3072for (
2727 ["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
2728 insert remove inv name archname title slaying race)], 3074 insert remove inv nrof name archname title slaying race
3075 decrease split destroy change_exp value msg lore send_msg)],
2729 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
2732) { 3079) {
2733 no strict 'refs'; 3080 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2752 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
2753 3100
2754 my $qcode = $code; 3101 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
2757 3106
2758 local $_; 3107 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
2760 3109
2761 my $eval = 3110 my $eval =
2809# the server's init and main functions 3158# the server's init and main functions
2810 3159
2811sub load_facedata($) { 3160sub load_facedata($) {
2812 my ($path) = @_; 3161 my ($path) = @_;
2813 3162
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168
2814 warn "loading facedata from $path\n"; 3169 warn "loading facedata from $path\n";
2815 3170
2816 my $facedata; 3171 my $facedata;
2817 0 < aio_load $path, $facedata 3172 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3173 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3175 $facedata = Coro::Storable::thaw $facedata;
2821 3176
2822 $facedata->{version} == 2 3177 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3178 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3179
3180 # patch in the exptable
3181 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3184 };
3185 cf::cede_to_tick;
3186
2825 { 3187 {
2826 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
2827 3189
2828 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
2830 cf::face::set_visibility $idx, $info->{visibility}; 3193 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3194 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3197
2835 cf::cede_to_tick; 3198 cf::cede_to_tick;
2836 } 3199 }
2837 3200
2838 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
2840 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
2841 or next; 3205 or next;
3206
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3208 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3210 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3228
2864 { 3229 {
2865 # TODO: for gcfclient pleasure, we should give resources 3230 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3231 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3232 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3233
2872 while (my ($name, $info) = each %$res) { 3234 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3235 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3236 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
2879 3238
2880 if ($info->{type} & 1) { 3239 if ($info->{type} & 1) {
2881 # prepend meta info 3240 # prepend meta info
2882 3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3247 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3248 } else {
3249 $data = $info->{data};
3250 }
2885 3251
2886 cf::face::set_data $idx, 0, $data, $chk; 3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type};
2887 } else { 3254 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3255 $RESOURCE{$name} = $info;
2889 } 3256 }
2890 3257
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3258 cf::cede_to_tick;
2894 } 3259 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3260 }
3261
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3263
2915 1 3264 1
2916} 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});
2917 3286
2918register_exticmd fx_want => sub { 3287register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_; 3288 my ($ns, $want) = @_;
2920 3289
2921 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
2923 } 3292 }
2924}; 3293};
2925 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}
3304
2926sub reload_regions { 3305sub reload_regions {
3306 # HACK to clear player env face cache, we need some signal framework
3307 # for this (global event?)
3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3309
2927 load_resource_file "$MAPDIR/regions" 3310 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3311 or die "unable to load regions file\n";
2929 3312
2930 for (cf::region::list) { 3313 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3314 $_->{match} = qr/$_->{match}/
2939} 3322}
2940 3323
2941sub reload_archetypes { 3324sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949} 3327}
2950 3328
2951sub reload_treasures { 3329sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
2954} 3332}
2955 3333
2956sub reload_resources { 3334sub reload_resources {
2957 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
2958 3336
3337 reload_facedata;
3338 reload_archetypes;
2959 reload_regions; 3339 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures; 3340 reload_treasures;
2964 3341
2965 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
2966} 3343}
2967 3344
2968sub init { 3345sub reload_config {
2969 reload_resources;
2970}
2971
2972sub cfg_load {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3347 or return;
2975 3348
2976 local $/; 3349 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3350 *CFG = YAML::Load <$fh>;
2978 3351
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3352 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2980 3353
2981 $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};
2982 $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};
2988 }; 3361 };
2989 warn $@ if $@; 3362 warn $@ if $@;
2990 } 3363 }
2991} 3364}
2992 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
2993sub 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
2994 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
2996 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#
2997 (async { 3403 (async {
2998 Event::one_event; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3405 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3000 }; 3407 };
3001 3408
3002 cfg_load; 3409 evthread_start IO::AIO::poll_fileno;
3410
3411 cf::sync_job {
3412 reload_resources;
3413 reload_config;
3003 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
3004 load_extensions; 3427 load_extensions;
3005 3428
3006 $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
3007 Event::loop; 3437 EV::loop;
3008} 3438}
3009 3439
3010############################################################################# 3440#############################################################################
3011# initialisation and cleanup 3441# initialisation and cleanup
3012 3442
3013# install some emergency cleanup handlers 3443# install some emergency cleanup handlers
3014BEGIN { 3444BEGIN {
3445 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3446 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3447 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3448 cf::cleanup "SIG$signal";
3023 },
3024 ); 3449 };
3025 } 3450 }
3026} 3451}
3027 3452
3028sub write_runtime { 3453sub write_runtime_sync {
3029 my $runtime = "$LOCALDIR/runtime";
3030
3031 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3033 3456
3034 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3035 3458
3036 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3037 3460
3038 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3039 or return; 3462 or return;
3040 3463
3041 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3042 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3043 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
3053 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3054 3477
3055 close $fh 3478 close $fh
3056 or return; 3479 or return;
3057 3480
3058 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3059 and return; 3482 and return;
3060 3483
3061 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3062 3485
3063 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 };
3064} 3537}
3065 3538
3066sub emergency_save() { 3539sub emergency_save() {
3067 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3068 3541
3069 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3070 3543
3071 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
3072 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3073 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3074 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3076 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3556 $pl->valid or next;
3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3558 $pl->save;
3080 } 3559 }
3081 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3082 3561
3083 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3084 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3085 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3086 $map->valid or next; 3565 $map->valid or next;
3087 $map->save; 3566 $map->save;
3088 } 3567 }
3089 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3090 3569
3091 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3093 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";
3094 }; 3577 };
3095 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
3096 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3097} 3585}
3098 3586
3099sub post_cleanup { 3587sub post_cleanup {
3100 my ($make_core) = @_; 3588 my ($make_core) = @_;
3101 3589
3102 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3103 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#
3104} 3621}
3105 3622
3106sub do_reload_perl() { 3623sub do_reload_perl() {
3107 # can/must only be called in main 3624 # can/must only be called in main
3108 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3109 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3110 return; 3627 return;
3111 } 3628 }
3112 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3113 warn "reloading..."; 3635 warn "reloading...";
3114 3636
3115 warn "entering sync_job"; 3637 warn "entering sync_job";
3116 3638
3117 cf::sync_job { 3639 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3119 cf::emergency_save; 3641 cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3121 3643
3122 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3124 3646
3125 # 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
3126 3648
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131
3132 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
3133 for (;;) {
3134 BDB::flush;
3135 IO::AIO::flush;
3136 Coro::cede;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3138 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3139 }
3140
3141 ++$RELOAD;
3142
3143 warn "cancelling all extension coros";
3144 $_->cancel for values %EXT_CORO;
3145 %EXT_CORO = ();
3146
3147 warn "removing commands";
3148 %COMMAND = ();
3149
3150 warn "removing ext/exti commands";
3151 %EXTCMD = ();
3152 %EXTICMD = ();
3153
3154 warn "unloading/nuking all extensions";
3155 for my $pkg (@EXTS) {
3156 warn "... unloading $pkg";
3157
3158 if (my $cb = $pkg->can ("unload")) {
3159 eval {
3160 $cb->($pkg);
3161 1
3162 } or warn "$pkg unloaded, but with errors: $@";
3163 } 3652 }
3164 3653
3165 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3166 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3167 } 3656 %EXT_CORO = ();
3168 3657
3169 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3170 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3171 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3172 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3173 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3174 delete $INC{$k};
3175 3668
3176 $k =~ s/\.pm$//;
3177 $k =~ s/\//::/g;
3178
3179 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3180 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3181 } 3678 }
3182 3679
3183 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;
3184 } 3695 }
3185 3696
3186 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3187 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3188 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);
3189 3700
3190 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3191 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3192 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3193 3704
3194 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3195 # and global variables created in xs 3706 # and global variables created in xs
3196 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3197 3708
3198 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3199 3710
3200 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3201 require cf; 3712 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3714
3204 warn "loading config and database again"; 3715 warn "loading config and database again";
3205 cf::cfg_load; 3716 cf::reload_config;
3206 3717
3207 warn "loading extensions"; 3718 warn "loading extensions";
3208 cf::load_extensions; 3719 cf::load_extensions;
3209 3720
3721 if ($REATTACH_ON_RELOAD) {
3210 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3211 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3212 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3213 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3214 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3215 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3216 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3217 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3218 3734
3219 1 3735 1
3220 } or do { 3736 } or do {
3221 warn $@; 3737 warn $@;
3222 warn "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3223 exit 1;
3224 }; 3739 };
3225 3740
3226 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3227}; 3747};
3228 3748
3229our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3230 3750
3231sub reload_perl() { 3751sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3234 3754
3235 $RELOAD_WATCHER ||= Event->timer ( 3755 $RELOAD_WATCHER ||= cf::async {
3236 reentrant => 0, 3756 Coro::AIO::aio_wait cache_extensions;
3237 after => 0, 3757
3238 data => WF_AUTOCANCEL, 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3239 cb => sub {
3240 do_reload_perl; 3759 do_reload_perl;
3241 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3242 }, 3761 };
3243 ); 3762 };
3244} 3763}
3245 3764
3246register_command "reload" => sub { 3765register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3248 3767
3249 if ($who->flag (FLAG_WIZ)) { 3768 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3769 $who->message ("reloading server.");
3770 async {
3771 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3772 reload_perl;
3773 };
3252 } 3774 }
3253}; 3775};
3254 3776
3255unshift @INC, $LIBDIR; 3777unshift @INC, $LIBDIR;
3256 3778
3258 3780
3259our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3261 3783
3262sub wait_for_tick { 3784sub wait_for_tick {
3263 return unless $TICK_WATCHER->is_active;
3264 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3265 3786
3266 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3267 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait; 3789 $signal->wait;
3269} 3790}
3270 3791
3271sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3272 return unless $TICK_WATCHER->is_active;
3273 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3274 3794
3275 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3797 $signal->wait;
3278} 3798}
3279 3799
3280 my $min = 1e6;#d# 3800sub tick {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3290 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"
3291 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3292 return; 3804 return;
3293 } 3805 }
3294 3806
3295 $NOW = $tick_start = Event::time;
3296
3297 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3298 3808
3299 0 && sync_job {#d# 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3300 for(1..10) { 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3301 my $t = Event::time; 3811 Coro::async_pool {
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3812 $Coro::current->{desc} = "runtime saver";
3303 or die; 3813 write_runtime_sync
3304 3814 or warn "ERROR: unable to write runtime file: $!";
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 3815 };
3816 }
3321 3817
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3819 $sig->send;
3338 } 3820 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3822 $sig->send;
3341 } 3823 }
3342 3824
3343 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3827
3354 _post_tick; 3828 if (0) {
3355 3829 if ($NEXT_TICK) {
3356 3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3357 }, 3834 }
3358); 3835}
3359 3836
3360{ 3837{
3361 BDB::max_poll_time $TICK * 0.1; 3838 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 3839
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3371 3841 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 3842 $AnyEvent::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 3843
3387 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
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;
3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3851
3390 cf::sync_job { 3852 cf::sync_job {
3391 eval { 3853 eval {
3392 BDB::db_env_open 3854 BDB::db_env_open
3393 $DB_ENV, 3855 $DB_ENV,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3857 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3858 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3859 0666;
3398 3860
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3861 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3862 };
3404 3863
3405 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3865 };
3407 } 3866 }
3867
3868 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3869 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3870 };
3871 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3872 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3873 };
3874 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3875 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3876 };
3408} 3877}
3409 3878
3410{ 3879{
3880 # configure IO::AIO
3881
3411 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 3885}
3424 3886
3425my $_log_backtrace; 3887my $_log_backtrace;
3426 3888
3427sub _log_backtrace { 3889sub _log_backtrace {
3430 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3431 3893
3432 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3435 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3436 my @bt = fork_call { 3901 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3904 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3905 or die "addr2line: $!";
3448 } 3913 }
3449 3914
3450 @funcs 3915 @funcs
3451 }; 3916 };
3452 3917
3453 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3454 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3455 --$_log_backtrace; 3921 --$_log_backtrace;
3456 }; 3922 };
3457 } else { 3923 } else {
3458 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3459 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3460 } 3926 }
3461} 3927}
3462 3928
3463# load additional modules 3929# load additional modules
3464use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3465 3931
3466END { cf::emergency_save } 3932END { cf::emergency_save }
3467 3933
34681 39341
3469 3935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines