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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines