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.329 by root, Fri Aug 10 05:38:16 2007 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
34use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
35 63
36# configure various modules to our taste 64# configure various modules to our taste
37# 65#
38$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
39Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41
42$Event::Eval = 1; # no idea why this is required, but it is
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 74
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 76
51our %COMMAND = (); 77our %COMMAND = ();
52our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
55our %EXTCMD = (); 81our %EXTCMD = ();
56our %EXTICMD = (); 82our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
59 85
60our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 87our @EVENT;
62 88
63our $CONFDIR = confdir; 89our $CONFDIR = confdir;
64our $DATADIR = datadir; 90our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
74 104
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 107our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
82 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 113our $DB_ENV;
85 114
86our %CFG; 115our %CFG;
87 116
88our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 118our $RUNTIME;
119our $NOW;
90 120
91our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
94 124
95# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 127
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
134
135our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
101 136
102binmode STDOUT; 137binmode STDOUT;
103binmode STDERR; 138binmode STDERR;
104 139
105# read virtual server time, if available 140# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 141unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 142 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 143 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 144 $RUNTIME = <$fh> + 0.;
110} 145}
111 146
112mkdir $_ 147mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 148 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 193
159The raw value load value from the last tick. 194The raw value load value from the last tick.
160 195
161=item %cf::CFG 196=item %cf::CFG
162 197
163Configuration for the server, loaded from C</etc/crossfire/config>, or 198Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 199from wherever your confdir points to.
165 200
166=item cf::wait_for_tick, cf::wait_for_tick_begin 201=item cf::wait_for_tick, cf::wait_for_tick_begin
167 202
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 203These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 221 $msg .= "\n"
187 unless $msg =~ /\n$/; 222 unless $msg =~ /\n$/;
188 223
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 224 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 225
191 utf8::encode $msg;
192 LOG llevError, $msg; 226 LOG llevError, $msg;
193 }; 227 };
194} 228}
229
230$Coro::State::DIEHOOK = sub {
231 return unless $^S eq 0; # "eq", not "=="
232
233 if ($Coro::current == $Coro::main) {#d#
234 warn "DIEHOOK called in main context, Coro bug?\n";#d#
235 return;#d#
236 }#d#
237
238 # kill coroutine otherwise
239 warn Carp::longmess $_[0];
240 Coro::terminate
241};
242
243$SIG{__DIE__} = sub { }; #d#?
195 244
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 245@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 246@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 247@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 248@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 255for my $pkg (qw(
207 cf::global cf::attachable 256 cf::global cf::attachable
208 cf::object cf::object::player 257 cf::object cf::object::player
209 cf::client cf::player 258 cf::client cf::player
210 cf::arch cf::living 259 cf::arch cf::living
260 cf::map cf::mapspace
211 cf::map cf::party cf::region 261 cf::party cf::region
212)) { 262)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 263 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 264}
216 265
217$Event::DIED = sub { 266$EV::DIED = sub {
218 warn "error in event callback: @_"; 267 warn "error in event callback: @_";
219}; 268};
220 269
221############################################################################# 270#############################################################################
222 271
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 294 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 295 $d
247 } || "[unable to dump $_[0]: '$@']"; 296 } || "[unable to dump $_[0]: '$@']";
248} 297}
249 298
250=item $ref = cf::from_json $json 299=item $ref = cf::decode_json $json
251 300
252Converts a JSON string into the corresponding perl data structure. 301Converts a JSON string into the corresponding perl data structure.
253 302
254=item $json = cf::to_json $ref 303=item $json = cf::encode_json $ref
255 304
256Converts a perl data structure into its JSON representation. 305Converts a perl data structure into its JSON representation.
257 306
258=cut 307=cut
259 308
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 309our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 310
262sub to_json ($) { $json_coder->encode ($_[0]) } 311sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 312sub decode_json($) { $json_coder->decode ($_[0]) }
313
314=item cf::post_init { BLOCK }
315
316Execute the given codeblock, I<after> all extensions have been (re-)loaded,
317but I<before> the server starts ticking again.
318
319The cdoeblock will have a single boolean argument to indicate whether this
320is a reload or not.
321
322=cut
323
324sub post_init(&) {
325 push @POST_INIT, shift;
326}
264 327
265=item cf::lock_wait $string 328=item cf::lock_wait $string
266 329
267Wait until the given lock is available. See cf::lock_acquire. 330Wait until the given lock is available. See cf::lock_acquire.
268 331
271Wait until the given lock is available and then acquires it and returns 334Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 335a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 336for example when the coroutine gets canceled), the lock is automatically
274returned. 337returned.
275 338
339Locks are *not* recursive, locking from the same coro twice results in a
340deadlocked coro.
341
276Lock names should begin with a unique identifier (for example, cf::map::find 342Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 343uses map_find and cf::map::load uses map_load).
278 344
279=item $locked = cf::lock_active $string 345=item $locked = cf::lock_active $string
280 346
281Return true if the lock is currently active, i.e. somebody has locked it. 347Return true if the lock is currently active, i.e. somebody has locked it.
282 348
283=cut 349=cut
284 350
285our %LOCK; 351our %LOCK;
352our %LOCKER;#d#
286 353
287sub lock_wait($) { 354sub lock_wait($) {
288 my ($key) = @_; 355 my ($key) = @_;
289 356
357 if ($LOCKER{$key} == $Coro::current) {#d#
358 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
359 return;#d#
360 }#d#
361
290 # wait for lock, if any 362 # wait for lock, if any
291 while ($LOCK{$key}) { 363 while ($LOCK{$key}) {
364 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
292 push @{ $LOCK{$key} }, $Coro::current; 365 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 366 Coro::schedule;
294 } 367 }
295} 368}
296 369
299 372
300 # wait, to be sure we are not locked 373 # wait, to be sure we are not locked
301 lock_wait $key; 374 lock_wait $key;
302 375
303 $LOCK{$key} = []; 376 $LOCK{$key} = [];
377 $LOCKER{$key} = $Coro::current;#d#
304 378
305 Coro::guard { 379 Coro::guard {
380 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 381 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 382 $_->ready for @{ delete $LOCK{$key} };
308 } 383 }
309} 384}
310 385
313 388
314 ! ! $LOCK{$key} 389 ! ! $LOCK{$key}
315} 390}
316 391
317sub freeze_mainloop { 392sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 393 tick_inhibit_inc;
319 394
320 my $guard = Coro::guard { 395 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 396}
322 }; 397
323 $TICK_WATCHER->stop; 398=item cf::periodic $interval, $cb
324 $guard 399
400Like EV::periodic, but randomly selects a starting point so that the actions
401get spread over timer.
402
403=cut
404
405sub periodic($$) {
406 my ($interval, $cb) = @_;
407
408 my $start = rand List::Util::min 180, $interval;
409
410 EV::periodic $start, $interval, 0, $cb
325} 411}
326 412
327=item cf::get_slot $time[, $priority[, $name]] 413=item cf::get_slot $time[, $priority[, $name]]
328 414
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 415Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 426our @SLOT_QUEUE;
341our $SLOT_QUEUE; 427our $SLOT_QUEUE;
342 428
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 429$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 430$SLOT_QUEUE = Coro::async {
431 $Coro::current->desc ("timeslot manager");
432
345 my $signal = new Coro::Signal; 433 my $signal = new Coro::Signal;
346 434
347 while () { 435 while () {
348 next_job: 436 next_job:
349 my $avail = cf::till_tick; 437 my $avail = cf::till_tick;
357 } 445 }
358 } 446 }
359 } 447 }
360 448
361 if (@SLOT_QUEUE) { 449 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 450 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 451 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 452 $signal->wait;
365 } else { 453 } else {
366 Coro::schedule; 454 Coro::schedule;
367 } 455 }
368 } 456 }
369}; 457};
370 458
371sub get_slot($;$$) { 459sub get_slot($;$$) {
460 return if tick_inhibit || $Coro::current == $Coro::main;
461
372 my ($time, $pri, $name) = @_; 462 my ($time, $pri, $name) = @_;
373 463
374 $time = $TICK * .6 if $time > $TICK * .6; 464 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 465 my $sig = new Coro::Signal;
376 466
390 480
391BEGIN { *async = \&Coro::async_pool } 481BEGIN { *async = \&Coro::async_pool }
392 482
393=item cf::sync_job { BLOCK } 483=item cf::sync_job { BLOCK }
394 484
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 485The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 486is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 487partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 488acceptable.
399 489
400If it must be done, put the blocking parts into C<sync_job>. This will run 490If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 491the given BLOCK in another coroutine while waiting for the result. The
406 496
407sub sync_job(&) { 497sub sync_job(&) {
408 my ($job) = @_; 498 my ($job) = @_;
409 499
410 if ($Coro::current == $Coro::main) { 500 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 501 my $time = EV::time;
412 502
413 # this is the main coro, too bad, we have to block 503 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 504 # till the operation succeeds, freezing the server :/
415 505
416 # TODO: use suspend/resume instead 506 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 507
418 my $freeze_guard = freeze_mainloop; 508 my $freeze_guard = freeze_mainloop;
419 509
420 my $busy = 1; 510 my $busy = 1;
421 my @res; 511 my @res;
422 512
423 (async { 513 (async {
514 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 515 @res = eval { $job->() };
425 warn $@ if $@; 516 warn $@ if $@;
426 undef $busy; 517 undef $busy;
427 })->prio (Coro::PRIO_MAX); 518 })->prio (Coro::PRIO_MAX);
428 519
429 while ($busy) { 520 while ($busy) {
430 Coro::cede or Event::one_event; 521 if (Coro::nready) {
522 Coro::cede_notself;
523 } else {
524 EV::loop EV::LOOP_ONESHOT;
431 } 525 }
526 }
432 527
433 $time = Event::time - $time; 528 my $time = EV::time - $time;
434 529
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 530 $TICK_START += $time; # do not account sync jobs to server load
439 531
440 wantarray ? @res : $res[0] 532 wantarray ? @res : $res[0]
441 } else { 533 } else {
442 # we are in another coroutine, how wonderful, everything just works 534 # we are in another coroutine, how wonderful, everything just works
443 535
468=item fork_call { }, $args 560=item fork_call { }, $args
469 561
470Executes the given code block with the given arguments in a seperate 562Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 563process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 564Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 565never block itself or use any form of event handling.
474 566
475=cut 567=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 568
486sub fork_call(&@) { 569sub fork_call(&@) {
487 my ($cb, @args) = @_; 570 my ($cb, @args) = @_;
488 571
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 572 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 573 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 574 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 575
494 if (my $pid = fork) { 576 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 577 reset_signals;
508 local $SIG{__WARN__}; 578 &$cb
509 local $SIG{__DIE__}; 579 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 580
516 eval { 581 wantarray ? @res : $res[-1]
517 close $fh1; 582}
518 583
519 my @res = eval { $cb->(@args) }; 584=item $coin = coin_from_name $name
520 585
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 586=cut
522 close $fh2;
523 };
524 587
525 warn $@ if $@; 588our %coin_alias = (
526 _exit 0; 589 "silver" => "silvercoin",
527 } 590 "silvercoin" => "silvercoin",
591 "silvercoins" => "silvercoin",
592 "gold" => "goldcoin",
593 "goldcoin" => "goldcoin",
594 "goldcoins" => "goldcoin",
595 "platinum" => "platinacoin",
596 "platinumcoin" => "platinacoin",
597 "platinumcoins" => "platinacoin",
598 "platina" => "platinacoin",
599 "platinacoin" => "platinacoin",
600 "platinacoins" => "platinacoin",
601 "royalty" => "royalty",
602 "royalties" => "royalty",
603);
604
605sub coin_from_name($) {
606 $coin_alias{$_[0]}
607 ? cf::arch::find $coin_alias{$_[0]}
608 : undef
528} 609}
529 610
530=item $value = cf::db_get $family => $key 611=item $value = cf::db_get $family => $key
531 612
532Returns a single value from the environment database. 613Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 615=item cf::db_put $family => $key => $value
535 616
536Stores the given C<$value> in the family. It can currently store binary 617Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 618data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 619
620=item $db = cf::db_table "name"
621
622Create and/or open a new database table. The string must not be "db" and must be unique
623within each server.
624
539=cut 625=cut
626
627sub db_table($) {
628 my ($name) = @_;
629 my $db = BDB::db_create $DB_ENV;
630
631 eval {
632 $db->set_flags (BDB::CHKSUM);
633
634 utf8::encode $name;
635 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
636 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
637 cf::cleanup "db_open(db): $!" if $!;
638 };
639 cf::cleanup "db_open(db): $@" if $@;
640
641 $db
642}
540 643
541our $DB; 644our $DB;
542 645
543sub db_init { 646sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 647 cf::sync_job {
548 eval { 648 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 649 };
558} 650}
559 651
560sub db_get($$) { 652sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 653 my $key = "$_[0]/$_[1]";
562 654
612 if (1) { 704 if (1) {
613 $md5 = 705 $md5 =
614 join "\x00", 706 join "\x00",
615 $processversion, 707 $processversion,
616 map { 708 map {
617 Coro::cede; 709 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 710 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 711 } 0.. $#$src;
620 712
621 713
622 my $dbmd5 = db_get cache => "$id/md5"; 714 my $dbmd5 = db_get cache => "$id/md5";
660 752
661############################################################################# 753#############################################################################
662 754
663=head2 ATTACHABLE OBJECTS 755=head2 ATTACHABLE OBJECTS
664 756
665Many objects in crossfire are so-called attachable objects. That means you can 757Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 758attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 759to it. All such attachable objects support the following methods.
668 760
669In the following description, CLASS can be any of C<global>, C<object> 761In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 762C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 763Deliantra).
672 764
673=over 4 765=over 4
674 766
675=item $attachable->attach ($attachment, key => $value...) 767=item $attachable->attach ($attachment, key => $value...)
676 768
720=item cf::CLASS::attachment $name, ... 812=item cf::CLASS::attachment $name, ...
721 813
722Register an attachment by C<$name> through which attachable objects of the 814Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 815given CLASS can refer to this attachment.
724 816
725Some classes such as crossfire maps and objects can specify attachments 817Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 818that are attached at load/instantiate time, thus the need for a name.
727 819
728These calls expect any number of the following handler/hook descriptions: 820These calls expect any number of the following handler/hook descriptions:
729 821
730=over 4 822=over 4
958 } 1050 }
959 1051
960 0 1052 0
961} 1053}
962 1054
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1056
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1057=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1058
967Generate an object-specific event with the given arguments. 1059Generate an object-specific event with the given arguments.
968 1060
974 1066
975=cut 1067=cut
976 1068
977############################################################################# 1069#############################################################################
978# object support 1070# object support
979#
980 1071
1072sub _object_equal($$);
1073sub _object_equal($$) {
1074 my ($a, $b) = @_;
1075
1076 return 0 unless (ref $a) eq (ref $b);
1077
1078 if ("HASH" eq ref $a) {
1079 my @ka = keys %$a;
1080 my @kb = keys %$b;
1081
1082 return 0 if @ka != @kb;
1083
1084 for (0 .. $#ka) {
1085 return 0 unless $ka[$_] eq $kb[$_];
1086 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1087 }
1088
1089 } elsif ("ARRAY" eq ref $a) {
1090
1091 return 0 if @$a != @$b;
1092
1093 for (0 .. $#$a) {
1094 return 0 unless _object_equal $a->[$_], $b->[$_];
1095 }
1096
1097 } elsif ($a ne $b) {
1098 return 0;
1099 }
1100
1101 1
1102}
1103
1104our $SLOW_MERGES;#d#
981sub _can_merge { 1105sub _can_merge {
982 my ($ob1, $ob2) = @_; 1106 my ($ob1, $ob2) = @_;
983 1107
984 local $Storable::canonical = 1; 1108 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1109
988 $fob1 eq $fob2 1110 # we do the slow way here
1111 return _object_equal $ob1, $ob2
989} 1112}
990 1113
991sub reattach { 1114sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1115 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1116 my ($obj) = @_;
994 1117
1118 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1119 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1120
997 my $registry = $obj->registry; 1121 my $registry = $obj->registry;
998 1122
999 @$registry = (); 1123 @$registry = ();
1000 1124
1015cf::attachable->attach ( 1139cf::attachable->attach (
1016 prio => -1000000, 1140 prio => -1000000,
1017 on_instantiate => sub { 1141 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1142 my ($obj, $data) = @_;
1019 1143
1020 $data = from_json $data; 1144 $data = decode_json $data;
1021 1145
1022 for (@$data) { 1146 for (@$data) {
1023 my ($name, $args) = @$_; 1147 my ($name, $args) = @$_;
1024 1148
1025 $obj->attach ($name, %{$args || {} }); 1149 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1165sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1166 my ($filename, $rdata, $objs) = @_;
1043 1167
1044 sync_job { 1168 sync_job {
1045 if (length $$rdata) { 1169 if (length $$rdata) {
1170 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1171 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1172 $decname, length $$rdata, scalar @$objs;
1048 1173
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1174 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1175 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1176 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1177 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1178 aio_close $fh;
1054 1179
1055 if (@$objs) { 1180 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1183 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1184 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1185 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1186 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1187 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1188 }
1064 } else { 1189 } else {
1065 aio_unlink "$filename.pst"; 1190 aio_unlink "$filename.pst";
1066 } 1191 }
1067 1192
1068 aio_rename "$filename~", $filename; 1193 aio_rename "$filename~", $filename;
1194
1195 $filename =~ s%/[^/]+$%%;
1196 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1197 } else {
1070 warn "FATAL: $filename~: $!\n"; 1198 warn "FATAL: $filename~: $!\n";
1071 } 1199 }
1072 } else { 1200 } else {
1073 aio_unlink $filename; 1201 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1202 aio_unlink "$filename.pst";
1075 } 1203 }
1076 } 1204 };
1077} 1205}
1078 1206
1079sub object_freezer_as_string { 1207sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1208 my ($rdata, $objs) = @_;
1081 1209
1093 or return; 1221 or return;
1094 1222
1095 unless (aio_stat "$filename.pst") { 1223 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1224 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1225 or return;
1226
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1227 my $st = eval { Coro::Storable::thaw $av };
1228 $av = $st->{objs};
1099 } 1229 }
1100 1230
1231 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1232 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1233 $decname, length $data, scalar @{$av || []};
1234
1103 return ($data, $av); 1235 ($data, $av)
1104} 1236}
1105 1237
1106=head2 COMMAND CALLBACKS 1238=head2 COMMAND CALLBACKS
1107 1239
1108=over 4 1240=over 4
1162 my ($name, $cb) = @_; 1294 my ($name, $cb) = @_;
1163 1295
1164 $EXTICMD{$name} = $cb; 1296 $EXTICMD{$name} = $cb;
1165} 1297}
1166 1298
1299use File::Glob ();
1300
1167cf::player->attach ( 1301cf::player->attach (
1168 on_command => sub { 1302 on_command => sub {
1169 my ($pl, $name, $params) = @_; 1303 my ($pl, $name, $params) = @_;
1170 1304
1171 my $cb = $COMMAND{$name} 1305 my $cb = $COMMAND{$name}
1186 my ($type, $reply, @payload) = 1320 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1321 "ARRAY" eq ref $msg
1188 ? @$msg 1322 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1323 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1324
1325 my @reply;
1326
1191 if (my $cb = $EXTCMD{$type}) { 1327 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1328 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1329 }
1330
1331 $pl->ext_reply ($reply, @reply)
1332 if $reply;
1333
1197 } else { 1334 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1335 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1336 }
1200 1337
1201 cf::override; 1338 cf::override;
1202 }, 1339 },
1203); 1340);
1341
1342# "readahead" all extensions
1343sub cache_extensions {
1344 my $grp = IO::AIO::aio_group;
1345
1346 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1347 for (grep /\.ext$/, @{$_[0]}) {
1348 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1349 }
1350 };
1351
1352 $grp
1353}
1204 1354
1205sub load_extensions { 1355sub load_extensions {
1206 cf::sync_job { 1356 cf::sync_job {
1207 my %todo; 1357 my %todo;
1208 1358
1228 1378
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1379 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1380 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1381
1232 $ext{source} = 1382 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1383 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1384 . "#line 1 \"$path\"\n{\n"
1235 . $source 1385 . $source
1236 . "\n};\n1"; 1386 . "\n};\n1";
1237 1387
1238 $todo{$base} = \%ext; 1388 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1404 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1405 : "$v->{base}: extension inactive.\n";
1256 1406
1257 if (exists $v->{meta}{mandatory}) { 1407 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1408 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1409 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1410 }
1262 1411
1263 warn $msg; 1412 warn $msg;
1264 } 1413 }
1265 1414
1279 1428
1280=back 1429=back
1281 1430
1282=head2 CORE EXTENSIONS 1431=head2 CORE EXTENSIONS
1283 1432
1284Functions and methods that extend core crossfire objects. 1433Functions and methods that extend core deliantra objects.
1285 1434
1286=cut 1435=cut
1287 1436
1288package cf::player; 1437package cf::player;
1289 1438
1290use Coro::AIO; 1439use Coro::AIO;
1291 1440
1292=head3 cf::player 1441=head3 cf::player
1293 1442
1294=over 4 1443=over 4
1444
1445=item cf::player::num_playing
1446
1447Returns the official number of playing players, as per the Crossfire metaserver rules.
1448
1449=cut
1450
1451sub num_playing {
1452 scalar grep
1453 $_->ob->map
1454 && !$_->hidden
1455 && !$_->ob->flag (cf::FLAG_WIZ),
1456 cf::player::list
1457}
1295 1458
1296=item cf::player::find $login 1459=item cf::player::find $login
1297 1460
1298Returns the given player object, loading it if necessary (might block). 1461Returns the given player object, loading it if necessary (might block).
1299 1462
1318 1481
1319sub exists($) { 1482sub exists($) {
1320 my ($login) = @_; 1483 my ($login) = @_;
1321 1484
1322 $cf::PLAYER{$login} 1485 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1486 or !aio_stat path $login
1324} 1487}
1325 1488
1326sub find($) { 1489sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1490 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1491 my $login = $_[0];
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1498 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1499 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1500 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1501 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1502
1340 my $pl = load_pl path $login 1503 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1504 or return;
1505
1506 my $pl = cf::player::load_pl $f
1507 or return;
1508
1509 local $cf::PLAYER_LOADING{$login} = $pl;
1510 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1511 $cf::PLAYER{$login} = $pl
1343 } 1512 }
1344 } 1513 }
1345} 1514}
1346 1515
1355 return if $pl->{deny_save}; 1524 return if $pl->{deny_save};
1356 1525
1357 aio_mkdir playerdir $pl, 0770; 1526 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1527 $pl->{last_save} = $cf::RUNTIME;
1359 1528
1529 cf::get_slot 0.01;
1530
1360 $pl->save_pl ($path); 1531 $pl->save_pl ($path);
1361 Coro::cede; 1532 cf::cede_to_tick;
1362} 1533}
1363 1534
1364sub new($) { 1535sub new($) {
1365 my ($login) = @_; 1536 my ($login) = @_;
1366 1537
1395 my ($pl) = @_; 1566 my ($pl) = @_;
1396 1567
1397 my $name = $pl->ob->name; 1568 my $name = $pl->ob->name;
1398 1569
1399 $pl->{deny_save} = 1; 1570 $pl->{deny_save} = 1;
1400 $pl->password ("*"); # this should lock out the player until we nuked the dir 1571 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1401 1572
1402 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1573 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1403 $pl->deactivate; 1574 $pl->deactivate;
1575 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1576 $pl->ob->check_score;
1404 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1577 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1405 $pl->ns->destroy if $pl->ns; 1578 $pl->ns->destroy if $pl->ns;
1406 1579
1407 my $path = playerdir $pl; 1580 my $path = playerdir $pl;
1408 my $temp = "$path~$cf::RUNTIME~deleting~"; 1581 my $temp = "$path~$cf::RUNTIME~deleting~";
1444 or return []; 1617 or return [];
1445 1618
1446 my @logins; 1619 my @logins;
1447 1620
1448 for my $login (@$dirs) { 1621 for my $login (@$dirs) {
1622 my $path = path $login;
1623
1624 # a .pst is a dead give-away for a valid player
1625 # if no pst file found, open and chekc for blocked users
1626 if (aio_stat "$path.pst") {
1449 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1627 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1450 aio_read $fh, 0, 512, my $buf, 0 or next; 1628 aio_read $fh, 0, 512, my $buf, 0 or next;
1451 $buf !~ /^password -------------$/m or next; # official not-valid tag 1629 $buf !~ /^password -------------$/m or next; # official not-valid tag
1630 }
1452 1631
1453 utf8::decode $login; 1632 utf8::decode $login;
1454 push @logins, $login; 1633 push @logins, $login;
1455 } 1634 }
1456 1635
1483 } 1662 }
1484 1663
1485 \@paths 1664 \@paths
1486} 1665}
1487 1666
1488=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1667=item $protocol_xml = $player->expand_cfpod ($cfpod)
1489 1668
1490Expand crossfire pod fragments into protocol xml. 1669Expand deliantra pod fragments into protocol xml.
1491
1492=cut
1493
1494sub expand_cfpod {
1495 ((my $self), (local $_)) = @_;
1496
1497 # escape & and <
1498 s/&/&amp;/g;
1499 s/(?<![BIUGH])</&lt;/g;
1500
1501 # this is buggy, it needs to properly take care of nested <'s
1502
1503 1 while
1504 # replace B<>, I<>, U<> etc.
1505 s/B<([^\>]*)>/<b>$1<\/b>/
1506 || s/I<([^\>]*)>/<i>$1<\/i>/
1507 || s/U<([^\>]*)>/<u>$1<\/u>/
1508 # replace G<male|female> tags
1509 || s{G<([^>|]*)\|([^>]*)>}{
1510 $self->gender ? $2 : $1
1511 }ge
1512 # replace H<hint text>
1513 || s{H<([^\>]*)>}
1514 {
1515 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1516 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1517 "")
1518 [$self->{hintmode}]
1519 }ge;
1520
1521 # create single paragraphs (very hackish)
1522 s/(?<=\S)\n(?=\w)/ /g;
1523
1524 # compress some whitespace
1525 s/\s+\n/\n/g; # ws line-ends
1526 s/\n\n+/\n/g; # double lines
1527 s/^\n+//; # beginning lines
1528 s/\n+$//; # ending lines
1529
1530 $_
1531}
1532
1533sub hintmode {
1534 $_[0]{hintmode} = $_[1] if @_ > 1;
1535 $_[0]{hintmode}
1536}
1537 1670
1538=item $player->ext_reply ($msgid, @msg) 1671=item $player->ext_reply ($msgid, @msg)
1539 1672
1540Sends an ext reply to the player. 1673Sends an ext reply to the player.
1541 1674
1542=cut 1675=cut
1543 1676
1544sub ext_reply($$@) { 1677sub ext_reply($$@) {
1545 my ($self, $id, @msg) = @_; 1678 my ($self, $id, @msg) = @_;
1546 1679
1547 if ($self->ns->extcmd == 2) { 1680 $self->ns->ext_reply ($id, @msg)
1548 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1549 } elsif ($self->ns->extcmd == 1) {
1550 #TODO: version 1, remove
1551 unshift @msg, msgtype => "reply", msgid => $id;
1552 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1553 }
1554} 1681}
1555 1682
1556=item $player->ext_msg ($type, @msg) 1683=item $player->ext_msg ($type, @msg)
1557 1684
1558Sends an ext event to the client. 1685Sends an ext event to the client.
1614our $MAX_RESET = 3600; 1741our $MAX_RESET = 3600;
1615our $DEFAULT_RESET = 3000; 1742our $DEFAULT_RESET = 3000;
1616 1743
1617sub generate_random_map { 1744sub generate_random_map {
1618 my ($self, $rmp) = @_; 1745 my ($self, $rmp) = @_;
1746
1747 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1748
1619 # mit "rum" bekleckern, nicht 1749 # mit "rum" bekleckern, nicht
1620 $self->_create_random_map ( 1750 $self->_create_random_map (
1621 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1751 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1622 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1752 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1623 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1753 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1745 1875
1746# the temporary/swap location 1876# the temporary/swap location
1747sub save_path { 1877sub save_path {
1748 my ($self) = @_; 1878 my ($self) = @_;
1749 1879
1750 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1880 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1751 "$TMPDIR/$path.map" 1881 "$TMPDIR/$path.map"
1752} 1882}
1753 1883
1754# the unique path, undef == no special unique path 1884# the unique path, undef == no special unique path
1755sub uniq_path { 1885sub uniq_path {
1756 my ($self) = @_; 1886 my ($self) = @_;
1757 1887
1758 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1888 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1759 "$UNIQUEDIR/$path" 1889 "$UNIQUEDIR/$path"
1760} 1890}
1761 1891
1762# and all this just because we cannot iterate over 1892# and all this just because we cannot iterate over
1763# all maps in C++... 1893# all maps in C++...
1786 1916
1787sub load_header_from($) { 1917sub load_header_from($) {
1788 my ($self, $path) = @_; 1918 my ($self, $path) = @_;
1789 1919
1790 utf8::encode $path; 1920 utf8::encode $path;
1791 #aio_open $path, O_RDONLY, 0 1921 my $f = new_from_file cf::object::thawer $path
1792 # or return;
1793
1794 $self->_load_header ($path)
1795 or return; 1922 or return;
1923
1924 $self->_load_header ($f)
1925 or return;
1926
1927 local $MAP_LOADING{$self->{path}} = $self;
1928 $f->resolve_delayed_derefs;
1796 1929
1797 $self->{load_path} = $path; 1930 $self->{load_path} = $path;
1798 1931
1799 1 1932 1
1800} 1933}
1854sub find { 1987sub find {
1855 my ($path, $origin) = @_; 1988 my ($path, $origin) = @_;
1856 1989
1857 $path = normalise $path, $origin && $origin->path; 1990 $path = normalise $path, $origin && $origin->path;
1858 1991
1992 cf::lock_wait "map_data:$path";#d#remove
1859 cf::lock_wait "map_find:$path"; 1993 cf::lock_wait "map_find:$path";
1860 1994
1861 $cf::MAP{$path} || do { 1995 $cf::MAP{$path} || do {
1996 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1862 my $guard = cf::lock_acquire "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
1998
1863 my $map = new_from_path cf::map $path 1999 my $map = new_from_path cf::map $path
1864 or return; 2000 or return;
1865 2001
1866 $map->{last_save} = $cf::RUNTIME; 2002 $map->{last_save} = $cf::RUNTIME;
1867 2003
1869 or return; 2005 or return;
1870 2006
1871 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2007 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1872 # doing this can freeze the server in a sync job, obviously 2008 # doing this can freeze the server in a sync job, obviously
1873 #$cf::WAIT_FOR_TICK->wait; 2009 #$cf::WAIT_FOR_TICK->wait;
2010 undef $guard2;
2011 undef $guard1;
1874 $map->reset; 2012 $map->reset;
1875 undef $guard;
1876 return find $path; 2013 return find $path;
1877 } 2014 }
1878 2015
1879 $cf::MAP{$path} = $map 2016 $cf::MAP{$path} = $map
1880 } 2017 }
1889 local $self->{deny_reset} = 1; # loading can take a long time 2026 local $self->{deny_reset} = 1; # loading can take a long time
1890 2027
1891 my $path = $self->{path}; 2028 my $path = $self->{path};
1892 2029
1893 { 2030 {
1894 my $guard = cf::lock_acquire "map_load:$path"; 2031 my $guard = cf::lock_acquire "map_data:$path";
1895 2032
2033 return unless $self->valid;
1896 return if $self->in_memory != cf::MAP_SWAPPED; 2034 return unless $self->in_memory == cf::MAP_SWAPPED;
1897 2035
1898 $self->in_memory (cf::MAP_LOADING); 2036 $self->in_memory (cf::MAP_LOADING);
1899 2037
1900 $self->alloc; 2038 $self->alloc;
1901 2039
1902 $self->pre_load; 2040 $self->pre_load;
1903 Coro::cede; 2041 cf::cede_to_tick;
1904 2042
2043 my $f = new_from_file cf::object::thawer $self->{load_path};
2044 $f->skip_block;
1905 $self->_load_objects ($self->{load_path}, 1) 2045 $self->_load_objects ($f)
1906 or return; 2046 or return;
1907 2047
1908 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2048 $self->post_load_original
1909 if delete $self->{load_original}; 2049 if delete $self->{load_original};
1910 2050
1911 if (my $uniq = $self->uniq_path) { 2051 if (my $uniq = $self->uniq_path) {
1912 utf8::encode $uniq; 2052 utf8::encode $uniq;
1913 if (aio_open $uniq, O_RDONLY, 0) { 2053 unless (aio_stat $uniq) {
2054 if (my $f = new_from_file cf::object::thawer $uniq) {
1914 $self->clear_unique_items; 2055 $self->clear_unique_items;
1915 $self->_load_objects ($uniq, 0); 2056 $self->_load_objects ($f);
2057 $f->resolve_delayed_derefs;
2058 }
1916 } 2059 }
1917 } 2060 }
1918 2061
1919 Coro::cede; 2062 $f->resolve_delayed_derefs;
2063
2064 cf::cede_to_tick;
1920 # now do the right thing for maps 2065 # now do the right thing for maps
1921 $self->link_multipart_objects; 2066 $self->link_multipart_objects;
1922 $self->difficulty ($self->estimate_difficulty) 2067 $self->difficulty ($self->estimate_difficulty)
1923 unless $self->difficulty; 2068 unless $self->difficulty;
1924 Coro::cede; 2069 cf::cede_to_tick;
1925 2070
1926 unless ($self->{deny_activate}) { 2071 unless ($self->{deny_activate}) {
1927 $self->decay_objects; 2072 $self->decay_objects;
1928 $self->fix_auto_apply; 2073 $self->fix_auto_apply;
1929 $self->update_buttons; 2074 $self->update_buttons;
1930 Coro::cede; 2075 cf::cede_to_tick;
1931 $self->set_darkness_map; 2076 $self->set_darkness_map;
1932 Coro::cede; 2077 cf::cede_to_tick;
1933 $self->activate; 2078 $self->activate;
1934 } 2079 }
1935 2080
1936 $self->{last_save} = $cf::RUNTIME; 2081 $self->{last_save} = $cf::RUNTIME;
1937 $self->last_access ($cf::RUNTIME); 2082 $self->last_access ($cf::RUNTIME);
1938 2083
1939 $self->in_memory (cf::MAP_IN_MEMORY); 2084 $self->in_memory (cf::MAP_ACTIVE);
1940 } 2085 }
1941 2086
1942 $self->post_load; 2087 $self->post_load;
1943} 2088}
1944 2089
1953 2098
1954 $self 2099 $self
1955} 2100}
1956 2101
1957# find and load all maps in the 3x3 area around a map 2102# find and load all maps in the 3x3 area around a map
1958sub load_diag { 2103sub load_neighbours {
1959 my ($map) = @_; 2104 my ($map) = @_;
1960 2105
1961 my @diag; # diagonal neighbours 2106 my @neigh; # diagonal neighbours
1962 2107
1963 for (0 .. 3) { 2108 for (0 .. 3) {
1964 my $neigh = $map->tile_path ($_) 2109 my $neigh = $map->tile_path ($_)
1965 or next; 2110 or next;
1966 $neigh = find $neigh, $map 2111 $neigh = find $neigh, $map
1967 or next; 2112 or next;
1968 $neigh->load; 2113 $neigh->load;
1969 2114
2115 push @neigh,
1970 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2116 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1971 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2117 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1972 } 2118 }
1973 2119
1974 for (@diag) { 2120 for (grep defined $_->[0], @neigh) {
2121 my ($path, $origin) = @$_;
1975 my $neigh = find @$_ 2122 my $neigh = find $path, $origin
1976 or next; 2123 or next;
1977 $neigh->load; 2124 $neigh->load;
1978 } 2125 }
1979} 2126}
1980 2127
1985} 2132}
1986 2133
1987sub do_load_sync { 2134sub do_load_sync {
1988 my ($map) = @_; 2135 my ($map) = @_;
1989 2136
2137 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2138 if $Coro::current == $Coro::main;
2139
1990 cf::sync_job { $map->load }; 2140 cf::sync_job { $map->load };
1991} 2141}
1992 2142
1993our %MAP_PREFETCH; 2143our %MAP_PREFETCH;
1994our $MAP_PREFETCHER = undef; 2144our $MAP_PREFETCHER = undef;
1995 2145
1996sub find_async { 2146sub find_async {
1997 my ($path, $origin) = @_; 2147 my ($path, $origin, $load) = @_;
1998 2148
1999 $path = normalise $path, $origin && $origin->{path}; 2149 $path = normalise $path, $origin && $origin->{path};
2000 2150
2001 if (my $map = $cf::MAP{$path}) { 2151 if (my $map = $cf::MAP{$path}) {
2002 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2152 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2003 } 2153 }
2004 2154
2005 undef $MAP_PREFETCH{$path}; 2155 $MAP_PREFETCH{$path} |= $load;
2156
2006 $MAP_PREFETCHER ||= cf::async { 2157 $MAP_PREFETCHER ||= cf::async {
2158 $Coro::current->{desc} = "map prefetcher";
2159
2007 while (%MAP_PREFETCH) { 2160 while (%MAP_PREFETCH) {
2008 for my $path (keys %MAP_PREFETCH) { 2161 while (my ($k, $v) = each %MAP_PREFETCH) {
2009 if (my $map = find $path) { 2162 if (my $map = find $k) {
2010 $map->load; 2163 $map->load if $v;
2011 } 2164 }
2012 2165
2013 delete $MAP_PREFETCH{$path}; 2166 delete $MAP_PREFETCH{$k};
2014 } 2167 }
2015 } 2168 }
2016 undef $MAP_PREFETCHER; 2169 undef $MAP_PREFETCHER;
2017 }; 2170 };
2018 $MAP_PREFETCHER->prio (6); 2171 $MAP_PREFETCHER->prio (6);
2021} 2174}
2022 2175
2023sub save { 2176sub save {
2024 my ($self) = @_; 2177 my ($self) = @_;
2025 2178
2026 my $lock = cf::lock_acquire "map_data:" . $self->path; 2179 my $lock = cf::lock_acquire "map_data:$self->{path}";
2027 2180
2028 $self->{last_save} = $cf::RUNTIME; 2181 $self->{last_save} = $cf::RUNTIME;
2029 2182
2030 return unless $self->dirty; 2183 return unless $self->dirty;
2031 2184
2037 return if $self->{deny_save}; 2190 return if $self->{deny_save};
2038 2191
2039 local $self->{last_access} = $self->last_access;#d# 2192 local $self->{last_access} = $self->last_access;#d#
2040 2193
2041 cf::async { 2194 cf::async {
2195 $Coro::current->{desc} = "map player save";
2042 $_->contr->save for $self->players; 2196 $_->contr->save for $self->players;
2043 }; 2197 };
2198
2199 cf::get_slot 0.02;
2044 2200
2045 if ($uniq) { 2201 if ($uniq) {
2046 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2202 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2047 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2203 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2048 } else { 2204 } else {
2054 my ($self) = @_; 2210 my ($self) = @_;
2055 2211
2056 # save first because save cedes 2212 # save first because save cedes
2057 $self->save; 2213 $self->save;
2058 2214
2059 my $lock = cf::lock_acquire "map_data:" . $self->path; 2215 my $lock = cf::lock_acquire "map_data:$self->{path}";
2060 2216
2061 return if $self->players; 2217 return if $self->players;
2062 return if $self->in_memory != cf::MAP_IN_MEMORY; 2218 return if $self->in_memory != cf::MAP_ACTIVE;
2063 return if $self->{deny_save}; 2219 return if $self->{deny_save};
2064 2220
2221 $self->in_memory (cf::MAP_SWAPPED);
2222
2223 $self->deactivate;
2224 $_->clear_links_to ($self) for values %cf::MAP;
2065 $self->clear; 2225 $self->clear;
2066 $self->in_memory (cf::MAP_SWAPPED);
2067} 2226}
2068 2227
2069sub reset_at { 2228sub reset_at {
2070 my ($self) = @_; 2229 my ($self) = @_;
2071 2230
2103 if $uniq; 2262 if $uniq;
2104 } 2263 }
2105 2264
2106 delete $cf::MAP{$self->path}; 2265 delete $cf::MAP{$self->path};
2107 2266
2267 $self->deactivate;
2268 $_->clear_links_to ($self) for values %cf::MAP;
2108 $self->clear; 2269 $self->clear;
2109
2110 $_->clear_links_to ($self) for values %cf::MAP;
2111 2270
2112 $self->unlink_save; 2271 $self->unlink_save;
2113 $self->destroy; 2272 $self->destroy;
2114} 2273}
2115 2274
2116my $nuke_counter = "aaaa"; 2275my $nuke_counter = "aaaa";
2117 2276
2118sub nuke { 2277sub nuke {
2119 my ($self) = @_; 2278 my ($self) = @_;
2120 2279
2280 {
2281 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282
2121 delete $cf::MAP{$self->path}; 2283 delete $cf::MAP{$self->path};
2122 2284
2123 $self->unlink_save; 2285 $self->unlink_save;
2124 2286
2125 bless $self, "cf::map"; 2287 bless $self, "cf::map";
2126 delete $self->{deny_reset}; 2288 delete $self->{deny_reset};
2127 $self->{deny_save} = 1; 2289 $self->{deny_save} = 1;
2128 $self->reset_timeout (1); 2290 $self->reset_timeout (1);
2129 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2291 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2130 2292
2131 $cf::MAP{$self->path} = $self; 2293 $cf::MAP{$self->path} = $self;
2294 }
2132 2295
2133 $self->reset; # polite request, might not happen 2296 $self->reset; # polite request, might not happen
2134} 2297}
2135 2298
2136=item $maps = cf::map::tmp_maps 2299=item $maps = cf::map::tmp_maps
2178 2341
2179sub unique_maps() { 2342sub unique_maps() {
2180 [ 2343 [
2181 map { 2344 map {
2182 utf8::decode $_; 2345 utf8::decode $_;
2183 /\.map$/ 2346 s/\.map$//; # TODO future compatibility hack
2347 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2348 ? ()
2184 ? normalise $_ 2349 : normalise $_
2185 : ()
2186 } @{ aio_readdir $UNIQUEDIR or [] } 2350 } @{ aio_readdir $UNIQUEDIR or [] }
2187 ] 2351 ]
2188} 2352}
2189 2353
2190package cf;
2191
2192=back 2354=back
2193 2355
2194=head3 cf::object 2356=head3 cf::object
2195 2357
2196=cut 2358=cut
2199 2361
2200=over 4 2362=over 4
2201 2363
2202=item $ob->inv_recursive 2364=item $ob->inv_recursive
2203 2365
2204Returns the inventory of the object _and_ their inventories, recursively. 2366Returns the inventory of the object I<and> their inventories, recursively,
2367but I<not> the object itself.
2205 2368
2206=cut 2369=cut
2207 2370
2208sub inv_recursive_; 2371sub inv_recursive_;
2209sub inv_recursive_ { 2372sub inv_recursive_ {
2212 2375
2213sub inv_recursive { 2376sub inv_recursive {
2214 inv_recursive_ inv $_[0] 2377 inv_recursive_ inv $_[0]
2215} 2378}
2216 2379
2380=item $ref = $ob->ref
2381
2382Creates and returns a persistent reference to an object that can be stored as a string.
2383
2384=item $ob = cf::object::deref ($refstring)
2385
2386returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2387even if the object actually exists. May block.
2388
2389=cut
2390
2391sub deref {
2392 my ($ref) = @_;
2393
2394 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2395 my ($uuid, $name) = ($1, $2);
2396 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2397 or return;
2398 $pl->ob->uuid eq $uuid
2399 or return;
2400
2401 $pl->ob
2402 } else {
2403 warn "$ref: cannot resolve object reference\n";
2404 undef
2405 }
2406}
2407
2217package cf; 2408package cf;
2218 2409
2219=back 2410=back
2220 2411
2221=head3 cf::object::player 2412=head3 cf::object::player
2227Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2418Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2228can be C<undef>. Does the right thing when the player is currently in a 2419can be C<undef>. Does the right thing when the player is currently in a
2229dialogue with the given NPC character. 2420dialogue with the given NPC character.
2230 2421
2231=cut 2422=cut
2423
2424our $SAY_CHANNEL = {
2425 id => "say",
2426 title => "Map",
2427 reply => "say ",
2428 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2429};
2430
2431our $CHAT_CHANNEL = {
2432 id => "chat",
2433 title => "Chat",
2434 reply => "chat ",
2435 tooltip => "Player chat and shouts, global to the server.",
2436};
2232 2437
2233# rough implementation of a future "reply" method that works 2438# rough implementation of a future "reply" method that works
2234# with dialog boxes. 2439# with dialog boxes.
2235#TODO: the first argument must go, split into a $npc->reply_to ( method 2440#TODO: the first argument must go, split into a $npc->reply_to ( method
2236sub cf::object::player::reply($$$;$) { 2441sub cf::object::player::reply($$$;$) {
2248 my $dialog = $pl->{npc_dialog}; 2453 my $dialog = $pl->{npc_dialog};
2249 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2454 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2250 2455
2251 } else { 2456 } else {
2252 $msg = $npc->name . " says: $msg" if $npc; 2457 $msg = $npc->name . " says: $msg" if $npc;
2253 $self->message ($msg, $flags); 2458 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2254 } 2459 }
2255 } 2460 }
2256} 2461}
2257 2462
2258=item $object->send_msg ($channel, $msg, $color, [extra...]) 2463=item $object->send_msg ($channel, $msg, $color, [extra...])
2283 2488
2284=item $player_object->enter_link 2489=item $player_object->enter_link
2285 2490
2286Freezes the player and moves him/her to a special map (C<{link}>). 2491Freezes the player and moves him/her to a special map (C<{link}>).
2287 2492
2288The player should be reasonably safe there for short amounts of time. You 2493The player should be reasonably safe there for short amounts of time (e.g.
2289I<MUST> call C<leave_link> as soon as possible, though. 2494for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2495though, as the palyer cannot control the character while it is on the link
2496map.
2290 2497
2291Will never block. 2498Will never block.
2292 2499
2293=item $player_object->leave_link ($map, $x, $y) 2500=item $player_object->leave_link ($map, $x, $y)
2294 2501
2349 # use -1 or undef as default coordinates, not 0, 0 2556 # use -1 or undef as default coordinates, not 0, 0
2350 ($x, $y) = ($map->enter_x, $map->enter_y) 2557 ($x, $y) = ($map->enter_x, $map->enter_y)
2351 if $x <=0 && $y <= 0; 2558 if $x <=0 && $y <= 0;
2352 2559
2353 $map->load; 2560 $map->load;
2354 $map->load_diag; 2561 $map->load_neighbours;
2355 2562
2356 return unless $self->contr->active; 2563 return unless $self->contr->active;
2564 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2357 $self->activate_recursive; 2565 $self->activate_recursive;
2358 2566
2359 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2567 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2360 $self->enter_map ($map, $x, $y); 2568 $self->enter_map ($map, $x, $y);
2361} 2569}
2366her, loading and preparing them map, calling the provided $check callback 2574her, loading and preparing them map, calling the provided $check callback
2367that has to return the map if sucecssful, and then unfreezes the player on 2575that has to return the map if sucecssful, and then unfreezes the player on
2368the new (success) or old (failed) map position. In either case, $done will 2576the new (success) or old (failed) map position. In either case, $done will
2369be called at the end of this process. 2577be called at the end of this process.
2370 2578
2579Note that $check will be called with a potentially non-loaded map, so if
2580it needs a loaded map it has to call C<< ->load >>.
2581
2371=cut 2582=cut
2372 2583
2373our $GOTOGEN; 2584our $GOTOGEN;
2374 2585
2375sub cf::object::player::goto { 2586sub cf::object::player::goto {
2379 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2590 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2380 2591
2381 $self->enter_link; 2592 $self->enter_link;
2382 2593
2383 (async { 2594 (async {
2595 $Coro::current->{desc} = "player::goto $path $x $y";
2596
2597 # *tag paths override both path and x|y
2598 if ($path =~ /^\*(.*)$/) {
2599 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2600 my $ob = $obs[rand @obs];
2601
2602 # see if we actually can go there
2603 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2604 $ob = $obs[rand @obs];
2605 } else {
2606 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2607 }
2608 # else put us there anyways for now #d#
2609
2610 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2611 } else {
2612 ($path, $x, $y) = (undef, undef, undef);
2613 }
2614 }
2615
2384 my $map = eval { 2616 my $map = eval {
2385 my $map = cf::map::find $path; 2617 my $map = defined $path ? cf::map::find $path : undef;
2386 2618
2387 if ($map) { 2619 if ($map) {
2388 $map = $map->customise_for ($self); 2620 $map = $map->customise_for ($self);
2389 $map = $check->($map) if $check && $map; 2621 $map = $check->($map) if $check && $map;
2390 } else { 2622 } else {
2391 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2623 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2392 } 2624 }
2393 2625
2394 $map 2626 $map
2395 }; 2627 };
2396 2628
2432} 2664}
2433 2665
2434sub prepare_random_map { 2666sub prepare_random_map {
2435 my ($exit) = @_; 2667 my ($exit) = @_;
2436 2668
2437 my $guard = cf::lock_acquire "exit_prepare:$exit";
2438
2439 # all this does is basically replace the /! path by 2669 # all this does is basically replace the /! path by
2440 # a new random map path (?random/...) with a seed 2670 # a new random map path (?random/...) with a seed
2441 # that depends on the exit object 2671 # that depends on the exit object
2442 2672
2443 my $rmp = parse_random_map_params $exit->msg; 2673 my $rmp = parse_random_map_params $exit->msg;
2445 if ($exit->map) { 2675 if ($exit->map) {
2446 $rmp->{region} = $exit->region->name; 2676 $rmp->{region} = $exit->region->name;
2447 $rmp->{origin_map} = $exit->map->path; 2677 $rmp->{origin_map} = $exit->map->path;
2448 $rmp->{origin_x} = $exit->x; 2678 $rmp->{origin_x} = $exit->x;
2449 $rmp->{origin_y} = $exit->y; 2679 $rmp->{origin_y} = $exit->y;
2680
2681 $exit->map->touch;
2450 } 2682 }
2451 2683
2452 $rmp->{random_seed} ||= $exit->random_seed; 2684 $rmp->{random_seed} ||= $exit->random_seed;
2453 2685
2454 my $data = cf::to_json $rmp; 2686 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2455 my $md5 = Digest::MD5::md5_hex $data; 2687 my $md5 = Digest::MD5::md5_hex $data;
2456 my $meta = "$RANDOMDIR/$md5.meta"; 2688 my $meta = "$RANDOMDIR/$md5.meta";
2457 2689
2458 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2690 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2459 aio_write $fh, 0, (length $data), $data, 0; 2691 aio_write $fh, 0, (length $data), $data, 0;
2460 undef $fh; 2692 undef $fh;
2461 aio_rename "$meta~", $meta; 2693 aio_rename "$meta~", $meta;
2462 2694
2695 my $slaying = "?random/$md5";
2696
2697 if ($exit->valid) {
2463 $exit->slaying ("?random/$md5"); 2698 $exit->slaying ("?random/$md5");
2464 $exit->msg (undef); 2699 $exit->msg (undef);
2700 }
2465 } 2701 }
2466} 2702}
2467 2703
2468sub cf::object::player::enter_exit { 2704sub cf::object::player::enter_exit {
2469 my ($self, $exit) = @_; 2705 my ($self, $exit) = @_;
2470 2706
2471 return unless $self->type == cf::PLAYER; 2707 return unless $self->type == cf::PLAYER;
2472 2708
2473 if ($exit->slaying eq "/!") {
2474 #TODO: this should de-fi-ni-te-ly not be a sync-job
2475 # the problem is that $exit might not survive long enough
2476 # so it needs to be done right now, right here
2477 cf::sync_job { prepare_random_map $exit };
2478 }
2479
2480 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2481 my $hp = $exit->stats->hp;
2482 my $sp = $exit->stats->sp;
2483
2484 $self->enter_link; 2709 $self->enter_link;
2485 2710
2486 # if exit is damned, update players death & WoR home-position
2487 $self->contr->savebed ($slaying, $hp, $sp)
2488 if $exit->flag (FLAG_DAMNED);
2489
2490 (async { 2711 (async {
2491 $self->deactivate_recursive; # just to be sure 2712 $Coro::current->{desc} = "enter_exit";
2713
2492 unless (eval { 2714 unless (eval {
2715 $self->deactivate_recursive; # just to be sure
2716
2717 # random map handling
2718 {
2719 my $guard = cf::lock_acquire "exit_prepare:$exit";
2720
2721 prepare_random_map $exit
2722 if $exit->slaying eq "/!";
2723 }
2724
2725 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2726 my $x = $exit->stats->hp;
2727 my $y = $exit->stats->sp;
2728
2493 $self->goto ($slaying, $hp, $sp); 2729 $self->goto ($map, $x, $y);
2494 2730
2731 # if exit is damned, update players death & WoR home-position
2732 $self->contr->savebed ($map, $x, $y)
2733 if $exit->flag (cf::FLAG_DAMNED);
2734
2495 1; 2735 1
2496 }) { 2736 }) {
2497 $self->message ("Something went wrong deep within the crossfire server. " 2737 $self->message ("Something went wrong deep within the deliantra server. "
2498 . "I'll try to bring you back to the map you were before. " 2738 . "I'll try to bring you back to the map you were before. "
2499 . "Please report this to the dungeon master!", 2739 . "Please report this to the dungeon master!",
2500 cf::NDI_UNIQUE | cf::NDI_RED); 2740 cf::NDI_UNIQUE | cf::NDI_RED);
2501 2741
2502 warn "ERROR in enter_exit: $@"; 2742 warn "ERROR in enter_exit: $@";
2530the message, with C<log> being the default. If C<$color> is negative, suppress 2770the message, with C<log> being the default. If C<$color> is negative, suppress
2531the message unless the client supports the msg packet. 2771the message unless the client supports the msg packet.
2532 2772
2533=cut 2773=cut
2534 2774
2775# non-persistent channels (usually the info channel)
2776our %CHANNEL = (
2777 "c/identify" => {
2778 id => "infobox",
2779 title => "Identify",
2780 reply => undef,
2781 tooltip => "Items recently identified",
2782 },
2783 "c/examine" => {
2784 id => "infobox",
2785 title => "Examine",
2786 reply => undef,
2787 tooltip => "Signs and other items you examined",
2788 },
2789 "c/book" => {
2790 id => "infobox",
2791 title => "Book",
2792 reply => undef,
2793 tooltip => "The contents of a note or book",
2794 },
2795 "c/lookat" => {
2796 id => "infobox",
2797 title => "Look",
2798 reply => undef,
2799 tooltip => "What you saw there",
2800 },
2801 "c/who" => {
2802 id => "infobox",
2803 title => "Players",
2804 reply => undef,
2805 tooltip => "Shows players who are currently online",
2806 },
2807 "c/body" => {
2808 id => "infobox",
2809 title => "Body Parts",
2810 reply => undef,
2811 tooltip => "Shows which body parts you posess and are available",
2812 },
2813 "c/skills" => {
2814 id => "infobox",
2815 title => "Skills",
2816 reply => undef,
2817 tooltip => "Shows your experience per skill and item power",
2818 },
2819 "c/uptime" => {
2820 id => "infobox",
2821 title => "Uptime",
2822 reply => undef,
2823 tooltip => "How long the server has been running since last restart",
2824 },
2825 "c/mapinfo" => {
2826 id => "infobox",
2827 title => "Map Info",
2828 reply => undef,
2829 tooltip => "Information related to the maps",
2830 },
2831 "c/party" => {
2832 id => "party",
2833 title => "Party",
2834 reply => "gsay ",
2835 tooltip => "Messages and chat related to your party",
2836 },
2837);
2838
2535sub cf::client::send_msg { 2839sub cf::client::send_msg {
2536 my ($self, $channel, $msg, $color, @extra) = @_; 2840 my ($self, $channel, $msg, $color, @extra) = @_;
2537 2841
2538 $msg = $self->pl->expand_cfpod ($msg); 2842 $msg = $self->pl->expand_cfpod ($msg)
2843 unless $color & cf::NDI_VERBATIM;
2539 2844
2540 $color &= cf::NDI_CLIENT_MASK; # just in case... 2845 $color &= cf::NDI_CLIENT_MASK; # just in case...
2541 2846
2847 # check predefined channels, for the benefit of C
2848 if ($CHANNEL{$channel}) {
2849 $channel = $CHANNEL{$channel};
2850
2851 $self->ext_msg (channel_info => $channel)
2852 if $self->can_msg;
2853
2854 $channel = $channel->{id};
2855
2542 if (ref $channel) { 2856 } elsif (ref $channel) {
2543 # send meta info to client, if not yet sent 2857 # send meta info to client, if not yet sent
2544 unless (exists $self->{channel}{$channel->{id}}) { 2858 unless (exists $self->{channel}{$channel->{id}}) {
2545 $self->{channel}{$channel->{id}} = $channel; 2859 $self->{channel}{$channel->{id}} = $channel;
2546 $self->ext_msg (channel_info => $channel); 2860 $self->ext_msg (channel_info => $channel)
2861 if $self->can_msg;
2547 } 2862 }
2548 2863
2549 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2550 } 2865 }
2551 2866
2554 if ($self->can_msg) { 2869 if ($self->can_msg) {
2555 # default colour, mask it out 2870 # default colour, mask it out
2556 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2871 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2557 if $color & cf::NDI_DEF; 2872 if $color & cf::NDI_DEF;
2558 2873
2559 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2874 my $pkt = "msg "
2875 . $self->{json_coder}->encode (
2560 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2876 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2877 );
2878
2879 # try lzf for large packets
2880 $pkt = "lzf " . Compress::LZF::compress $pkt
2881 if 1024 <= length $pkt and $self->{can_lzf};
2882
2883 # split very large packets
2884 if (8192 < length $pkt and $self->{can_lzf}) {
2885 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 $pkt = "frag";
2887 }
2888
2889 $self->send_packet ($pkt);
2561 } else { 2890 } else {
2562 if ($color >= 0) { 2891 if ($color >= 0) {
2563 # replace some tags by gcfclient-compatible ones 2892 # replace some tags by gcfclient-compatible ones
2564 for ($msg) { 2893 for ($msg) {
2565 1 while 2894 1 while
2573 $color &= cf::NDI_COLOR_MASK; 2902 $color &= cf::NDI_COLOR_MASK;
2574 2903
2575 utf8::encode $msg; 2904 utf8::encode $msg;
2576 2905
2577 if (0 && $msg =~ /\[/) { 2906 if (0 && $msg =~ /\[/) {
2907 # COMMAND/INFO
2578 $self->send_packet ("drawextinfo $color 4 0 $msg") 2908 $self->send_packet ("drawextinfo $color 10 8 $msg")
2579 } else { 2909 } else {
2580 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2910 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2581 $self->send_packet ("drawinfo $color $msg") 2911 $self->send_packet ("drawinfo $color $msg")
2582 } 2912 }
2583 } 2913 }
2591=cut 2921=cut
2592 2922
2593sub cf::client::ext_msg($$@) { 2923sub cf::client::ext_msg($$@) {
2594 my ($self, $type, @msg) = @_; 2924 my ($self, $type, @msg) = @_;
2595 2925
2596 my $extcmd = $self->extcmd;
2597
2598 if ($extcmd == 2) { 2926 if ($self->extcmd == 2) {
2599 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2927 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2600 } elsif ($extcmd == 1) { # TODO: remove 2928 } elsif ($self->extcmd == 1) { # TODO: remove
2601 push @msg, msgtype => "event_$type"; 2929 push @msg, msgtype => "event_$type";
2930 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2931 }
2932}
2933
2934=item $client->ext_reply ($msgid, @msg)
2935
2936Sends an ext reply to the client.
2937
2938=cut
2939
2940sub cf::client::ext_reply($$@) {
2941 my ($self, $id, @msg) = @_;
2942
2943 if ($self->extcmd == 2) {
2944 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2945 } elsif ($self->extcmd == 1) {
2946 #TODO: version 1, remove
2947 unshift @msg, msgtype => "reply", msgid => $id;
2602 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2948 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2603 } 2949 }
2604} 2950}
2605 2951
2606=item $success = $client->query ($flags, "text", \&cb) 2952=item $success = $client->query ($flags, "text", \&cb)
2668 my ($type, $reply, @payload) = 3014 my ($type, $reply, @payload) =
2669 "ARRAY" eq ref $msg 3015 "ARRAY" eq ref $msg
2670 ? @$msg 3016 ? @$msg
2671 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3017 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2672 3018
3019 my @reply;
3020
2673 if (my $cb = $EXTICMD{$type}) { 3021 if (my $cb = $EXTICMD{$type}) {
2674 my @reply = $cb->($ns, @payload); 3022 @reply = $cb->($ns, @payload);
2675
2676 $ns->ext_reply ($reply, @reply)
2677 if $reply;
2678 } 3023 }
3024
3025 $ns->ext_reply ($reply, @reply)
3026 if $reply;
3027
2679 } else { 3028 } else {
2680 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3029 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2681 } 3030 }
2682 3031
2683 cf::override; 3032 cf::override;
2743=pod 3092=pod
2744 3093
2745The following functions and methods are available within a safe environment: 3094The following functions and methods are available within a safe environment:
2746 3095
2747 cf::object 3096 cf::object
2748 contr pay_amount pay_player map x y force_find force_add 3097 contr pay_amount pay_player map x y force_find force_add destroy
2749 insert remove 3098 insert remove name archname title slaying race decrease split
2750 3099
2751 cf::object::player 3100 cf::object::player
2752 player 3101 player
2753 3102
2754 cf::player 3103 cf::player
2759 3108
2760=cut 3109=cut
2761 3110
2762for ( 3111for (
2763 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3112 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2764 insert remove inv)], 3113 insert remove inv nrof name archname title slaying race
3114 decrease split destroy change_exp)],
2765 ["cf::object::player" => qw(player)], 3115 ["cf::object::player" => qw(player)],
2766 ["cf::player" => qw(peaceful)], 3116 ["cf::player" => qw(peaceful)],
2767 ["cf::map" => qw(trigger)], 3117 ["cf::map" => qw(trigger)],
2768) { 3118) {
2769 no strict 'refs'; 3119 no strict 'refs';
2845# the server's init and main functions 3195# the server's init and main functions
2846 3196
2847sub load_facedata($) { 3197sub load_facedata($) {
2848 my ($path) = @_; 3198 my ($path) = @_;
2849 3199
3200 # HACK to clear player env face cache, we need some signal framework
3201 # for this (global event?)
3202 %ext::player_env::MUSIC_FACE_CACHE = ();
3203
3204 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3205
2850 warn "loading facedata from $path\n"; 3206 warn "loading facedata from $path\n";
2851 3207
2852 my $facedata; 3208 my $facedata;
2853 0 < aio_load $path, $facedata 3209 0 < aio_load $path, $facedata
2854 or die "$path: $!"; 3210 or die "$path: $!";
2856 $facedata = Coro::Storable::thaw $facedata; 3212 $facedata = Coro::Storable::thaw $facedata;
2857 3213
2858 $facedata->{version} == 2 3214 $facedata->{version} == 2
2859 or cf::cleanup "$path: version mismatch, cannot proceed."; 3215 or cf::cleanup "$path: version mismatch, cannot proceed.";
2860 3216
3217 # patch in the exptable
3218 $facedata->{resource}{"res/exp_table"} = {
3219 type => FT_RSRC,
3220 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3221 };
3222 cf::cede_to_tick;
3223
2861 { 3224 {
2862 my $faces = $facedata->{faceinfo}; 3225 my $faces = $facedata->{faceinfo};
2863 3226
2864 while (my ($face, $info) = each %$faces) { 3227 while (my ($face, $info) = each %$faces) {
2865 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3228 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3229
2866 cf::face::set_visibility $idx, $info->{visibility}; 3230 cf::face::set_visibility $idx, $info->{visibility};
2867 cf::face::set_magicmap $idx, $info->{magicmap}; 3231 cf::face::set_magicmap $idx, $info->{magicmap};
2868 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3232 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2869 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3233 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2870 3234
2871 cf::cede_to_tick; 3235 cf::cede_to_tick;
2872 } 3236 }
2873 3237
2874 while (my ($face, $info) = each %$faces) { 3238 while (my ($face, $info) = each %$faces) {
2875 next unless $info->{smooth}; 3239 next unless $info->{smooth};
3240
2876 my $idx = cf::face::find $face 3241 my $idx = cf::face::find $face
2877 or next; 3242 or next;
3243
2878 if (my $smooth = cf::face::find $info->{smooth}) { 3244 if (my $smooth = cf::face::find $info->{smooth}) {
2879 cf::face::set_smooth $idx, $smooth; 3245 cf::face::set_smooth $idx, $smooth;
2880 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3246 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2881 } else { 3247 } else {
2882 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3248 warn "smooth face '$info->{smooth}' not found for face '$face'";
2899 3265
2900 { 3266 {
2901 # TODO: for gcfclient pleasure, we should give resources 3267 # TODO: for gcfclient pleasure, we should give resources
2902 # that gcfclient doesn't grok a >10000 face index. 3268 # that gcfclient doesn't grok a >10000 face index.
2903 my $res = $facedata->{resource}; 3269 my $res = $facedata->{resource};
2904 my $enc = JSON::XS->new->utf8->canonical;
2905
2906 my $soundconf = delete $res->{"res/sound.conf"};
2907 3270
2908 while (my ($name, $info) = each %$res) { 3271 while (my ($name, $info) = each %$res) {
2909 my $meta = $enc->encode ({ 3272 if (defined $info->{type}) {
2910 name => $name,
2911 %{ $info->{meta} || {} },
2912 });
2913
2914 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3273 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3274 my $data;
2915 3275
2916 if ($info->{type} & 1) { 3276 if ($info->{type} & 1) {
2917 # prepend meta info 3277 # prepend meta info
2918 3278
3279 my $meta = $enc->encode ({
3280 name => $name,
3281 %{ $info->{meta} || {} },
3282 });
3283
2919 my $data = pack "(w/a*)*", $meta, $info->{data}; 3284 $data = pack "(w/a*)*", $meta, $info->{data};
2920 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3285 } else {
3286 $data = $info->{data};
3287 }
2921 3288
2922 cf::face::set_data $idx, 0, $data, $chk; 3289 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3290 cf::face::set_type $idx, $info->{type};
2923 } else { 3291 } else {
2924 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3292 $RESOURCE{$name} = $info;
2925 } 3293 }
2926 3294
2927 cf::face::set_type $idx, $info->{type};
2928
2929 cf::cede_to_tick; 3295 cf::cede_to_tick;
2930 } 3296 }
2931
2932 if ($soundconf) {
2933 $soundconf = $enc->decode (delete $soundconf->{data});
2934
2935 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2936 my $sound = $soundconf->{compat}[$_]
2937 or next;
2938
2939 my $face = cf::face::find "sound/$sound->[1]";
2940 cf::sound::set $sound->[0] => $face;
2941 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2942 }
2943
2944 while (my ($k, $v) = each %{$soundconf->{event}}) {
2945 my $face = cf::face::find "sound/$v";
2946 cf::sound::set $k => $face;
2947 }
2948 }
2949 } 3297 }
3298
3299 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2950 3300
2951 1 3301 1
2952} 3302}
3303
3304cf::global->attach (on_resource_update => sub {
3305 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3306 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3307
3308 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3309 my $sound = $soundconf->{compat}[$_]
3310 or next;
3311
3312 my $face = cf::face::find "sound/$sound->[1]";
3313 cf::sound::set $sound->[0] => $face;
3314 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3315 }
3316
3317 while (my ($k, $v) = each %{$soundconf->{event}}) {
3318 my $face = cf::face::find "sound/$v";
3319 cf::sound::set $k => $face;
3320 }
3321 }
3322});
2953 3323
2954register_exticmd fx_want => sub { 3324register_exticmd fx_want => sub {
2955 my ($ns, $want) = @_; 3325 my ($ns, $want) = @_;
2956 3326
2957 while (my ($k, $v) = each %$want) { 3327 while (my ($k, $v) = each %$want) {
2958 $ns->fx_want ($k, $v); 3328 $ns->fx_want ($k, $v);
2959 } 3329 }
2960}; 3330};
2961 3331
3332sub load_resource_file($) {
3333 my $guard = lock_acquire "load_resource_file";
3334
3335 my $status = load_resource_file_ $_[0];
3336 get_slot 0.1, 100;
3337 cf::arch::commit_load;
3338
3339 $status
3340}
3341
2962sub reload_regions { 3342sub reload_regions {
3343 # HACK to clear player env face cache, we need some signal framework
3344 # for this (global event?)
3345 %ext::player_env::MUSIC_FACE_CACHE = ();
3346
2963 load_resource_file "$MAPDIR/regions" 3347 load_resource_file "$MAPDIR/regions"
2964 or die "unable to load regions file\n"; 3348 or die "unable to load regions file\n";
2965 3349
2966 for (cf::region::list) { 3350 for (cf::region::list) {
2967 $_->{match} = qr/$_->{match}/ 3351 $_->{match} = qr/$_->{match}/
2975} 3359}
2976 3360
2977sub reload_archetypes { 3361sub reload_archetypes {
2978 load_resource_file "$DATADIR/archetypes" 3362 load_resource_file "$DATADIR/archetypes"
2979 or die "unable to load archetypes\n"; 3363 or die "unable to load archetypes\n";
2980 #d# NEED to laod twice to resolve forward references
2981 # this really needs to be done in an extra post-pass
2982 # (which needs to be synchronous, so solve it differently)
2983 load_resource_file "$DATADIR/archetypes"
2984 or die "unable to load archetypes\n";
2985} 3364}
2986 3365
2987sub reload_treasures { 3366sub reload_treasures {
2988 load_resource_file "$DATADIR/treasures" 3367 load_resource_file "$DATADIR/treasures"
2989 or die "unable to load treasurelists\n"; 3368 or die "unable to load treasurelists\n";
2990} 3369}
2991 3370
2992sub reload_resources { 3371sub reload_resources {
2993 warn "reloading resource files...\n"; 3372 warn "reloading resource files...\n";
2994 3373
3374 reload_facedata;
3375 reload_archetypes;
2995 reload_regions; 3376 reload_regions;
2996 reload_facedata;
2997 #reload_archetypes;#d#
2998 reload_archetypes;
2999 reload_treasures; 3377 reload_treasures;
3000 3378
3001 warn "finished reloading resource files\n"; 3379 warn "finished reloading resource files\n";
3002} 3380}
3003 3381
3004sub init { 3382sub reload_config {
3005 reload_resources;
3006}
3007
3008sub cfg_load {
3009 open my $fh, "<:utf8", "$CONFDIR/config" 3383 open my $fh, "<:utf8", "$CONFDIR/config"
3010 or return; 3384 or return;
3011 3385
3012 local $/; 3386 local $/;
3013 *CFG = YAML::Syck::Load <$fh>; 3387 *CFG = YAML::Load <$fh>;
3014 3388
3015 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3389 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3016 3390
3017 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3391 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3018 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3392 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3024 }; 3398 };
3025 warn $@ if $@; 3399 warn $@ if $@;
3026 } 3400 }
3027} 3401}
3028 3402
3403sub pidfile() {
3404 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3405 or die "$PIDFILE: $!";
3406 flock $fh, &Fcntl::LOCK_EX
3407 or die "$PIDFILE: flock: $!";
3408 $fh
3409}
3410
3411# make sure only one server instance is running at any one time
3412sub atomic {
3413 my $fh = pidfile;
3414
3415 my $pid = <$fh>;
3416 kill 9, $pid if $pid > 0;
3417
3418 seek $fh, 0, 0;
3419 print $fh $$;
3420}
3421
3029sub main { 3422sub main {
3423 cf::init_globals; # initialise logging
3424
3425 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3426 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3427 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3428 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3429
3430 cf::init_experience;
3431 cf::init_anim;
3432 cf::init_attackmess;
3433 cf::init_dynamic;
3434 cf::init_block;
3435
3436 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3437
3030 # we must not ever block the main coroutine 3438 # we must not ever block the main coroutine
3031 local $Coro::idle = sub { 3439 local $Coro::idle = sub {
3032 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3440 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3033 (async { 3441 (async {
3034 Event::one_event; 3442 $Coro::current->{desc} = "IDLE BUG HANDLER";
3443 EV::loop EV::LOOP_ONESHOT;
3035 })->prio (Coro::PRIO_MAX); 3444 })->prio (Coro::PRIO_MAX);
3036 }; 3445 };
3037 3446
3038 cfg_load; 3447 evthread_start IO::AIO::poll_fileno;
3448
3449 cf::sync_job {
3450 reload_resources;
3451 reload_config;
3039 db_init; 3452 db_init;
3453
3454 cf::load_settings;
3455 cf::load_materials;
3456 cf::init_uuid;
3457 cf::init_signals;
3458 cf::init_commands;
3459 cf::init_skills;
3460
3461 cf::init_beforeplay;
3462
3463 atomic;
3464
3040 load_extensions; 3465 load_extensions;
3041 3466
3042 $TICK_WATCHER->start; 3467 utime time, time, $RUNTIMEFILE;
3468
3469 # no (long-running) fork's whatsoever before this point(!)
3470 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3471
3472 (pop @POST_INIT)->(0) while @POST_INIT;
3473 };
3474
3043 Event::loop; 3475 EV::loop;
3044} 3476}
3045 3477
3046############################################################################# 3478#############################################################################
3047# initialisation and cleanup 3479# initialisation and cleanup
3048 3480
3049# install some emergency cleanup handlers 3481# install some emergency cleanup handlers
3050BEGIN { 3482BEGIN {
3483 our %SIGWATCHER = ();
3051 for my $signal (qw(INT HUP TERM)) { 3484 for my $signal (qw(INT HUP TERM)) {
3052 Event->signal ( 3485 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3053 reentrant => 0,
3054 data => WF_AUTOCANCEL,
3055 signal => $signal,
3056 prio => 0,
3057 cb => sub {
3058 cf::cleanup "SIG$signal"; 3486 cf::cleanup "SIG$signal";
3059 },
3060 ); 3487 };
3061 } 3488 }
3062} 3489}
3063 3490
3064sub write_runtime { 3491sub write_runtime_sync {
3065 my $runtime = "$LOCALDIR/runtime";
3066
3067 # first touch the runtime file to show we are still running: 3492 # first touch the runtime file to show we are still running:
3068 # the fsync below can take a very very long time. 3493 # the fsync below can take a very very long time.
3069 3494
3070 IO::AIO::aio_utime $runtime, undef, undef; 3495 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3071 3496
3072 my $guard = cf::lock_acquire "write_runtime"; 3497 my $guard = cf::lock_acquire "write_runtime";
3073 3498
3074 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3499 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3075 or return; 3500 or return;
3076 3501
3077 my $value = $cf::RUNTIME + 90 + 10; 3502 my $value = $cf::RUNTIME + 90 + 10;
3078 # 10 is the runtime save interval, for a monotonic clock 3503 # 10 is the runtime save interval, for a monotonic clock
3079 # 60 allows for the watchdog to kill the server. 3504 # 60 allows for the watchdog to kill the server.
3089 aio_utime $fh, undef, undef; 3514 aio_utime $fh, undef, undef;
3090 3515
3091 close $fh 3516 close $fh
3092 or return; 3517 or return;
3093 3518
3094 aio_rename "$runtime~", $runtime 3519 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3095 and return; 3520 and return;
3096 3521
3097 warn "runtime file written.\n"; 3522 warn "runtime file written.\n";
3098 3523
3099 1 3524 1
3525}
3526
3527our $uuid_lock;
3528our $uuid_skip;
3529
3530sub write_uuid_sync($) {
3531 $uuid_skip ||= $_[0];
3532
3533 return if $uuid_lock;
3534 local $uuid_lock = 1;
3535
3536 my $uuid = "$LOCALDIR/uuid";
3537
3538 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3539 or return;
3540
3541 my $value = uuid_seq uuid_cur;
3542
3543 unless ($value) {
3544 warn "cowardly refusing to write zero uuid value!\n";
3545 return;
3546 }
3547
3548 my $value = uuid_str $value + $uuid_skip;
3549 $uuid_skip = 0;
3550
3551 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3552 and return;
3553
3554 # always fsync - this file is important
3555 aio_fsync $fh
3556 and return;
3557
3558 close $fh
3559 or return;
3560
3561 aio_rename "$uuid~", $uuid
3562 and return;
3563
3564 warn "uuid file written ($value).\n";
3565
3566 1
3567
3568}
3569
3570sub write_uuid($$) {
3571 my ($skip, $sync) = @_;
3572
3573 $sync ? write_uuid_sync $skip
3574 : async { write_uuid_sync $skip };
3100} 3575}
3101 3576
3102sub emergency_save() { 3577sub emergency_save() {
3103 my $freeze_guard = cf::freeze_mainloop; 3578 my $freeze_guard = cf::freeze_mainloop;
3104 3579
3105 warn "enter emergency perl save\n"; 3580 warn "emergency_perl_save: enter\n";
3106 3581
3107 cf::sync_job { 3582 cf::sync_job {
3583 # this is a trade-off: we want to be very quick here, so
3584 # save all maps without fsync, and later call a global sync
3585 # (which in turn might be very very slow)
3586 local $USE_FSYNC = 0;
3587
3108 # use a peculiar iteration method to avoid tripping on perl 3588 # use a peculiar iteration method to avoid tripping on perl
3109 # refcount bugs in for. also avoids problems with players 3589 # refcount bugs in for. also avoids problems with players
3110 # and maps saved/destroyed asynchronously. 3590 # and maps saved/destroyed asynchronously.
3111 warn "begin emergency player save\n"; 3591 warn "emergency_perl_save: begin player save\n";
3112 for my $login (keys %cf::PLAYER) { 3592 for my $login (keys %cf::PLAYER) {
3113 my $pl = $cf::PLAYER{$login} or next; 3593 my $pl = $cf::PLAYER{$login} or next;
3114 $pl->valid or next; 3594 $pl->valid or next;
3595 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3115 $pl->save; 3596 $pl->save;
3116 } 3597 }
3117 warn "end emergency player save\n"; 3598 warn "emergency_perl_save: end player save\n";
3118 3599
3119 warn "begin emergency map save\n"; 3600 warn "emergency_perl_save: begin map save\n";
3120 for my $path (keys %cf::MAP) { 3601 for my $path (keys %cf::MAP) {
3121 my $map = $cf::MAP{$path} or next; 3602 my $map = $cf::MAP{$path} or next;
3122 $map->valid or next; 3603 $map->valid or next;
3123 $map->save; 3604 $map->save;
3124 } 3605 }
3125 warn "end emergency map save\n"; 3606 warn "emergency_perl_save: end map save\n";
3126 3607
3127 warn "begin emergency database checkpoint\n"; 3608 warn "emergency_perl_save: begin database checkpoint\n";
3128 BDB::db_env_txn_checkpoint $DB_ENV; 3609 BDB::db_env_txn_checkpoint $DB_ENV;
3129 warn "end emergency database checkpoint\n"; 3610 warn "emergency_perl_save: end database checkpoint\n";
3611
3612 warn "emergency_perl_save: begin write uuid\n";
3613 write_uuid_sync 1;
3614 warn "emergency_perl_save: end write uuid\n";
3130 }; 3615 };
3131 3616
3617 warn "emergency_perl_save: starting sync()\n";
3618 IO::AIO::aio_sync sub {
3619 warn "emergency_perl_save: finished sync()\n";
3620 };
3621
3132 warn "leave emergency perl save\n"; 3622 warn "emergency_perl_save: leave\n";
3133} 3623}
3134 3624
3135sub post_cleanup { 3625sub post_cleanup {
3136 my ($make_core) = @_; 3626 my ($make_core) = @_;
3137 3627
3138 warn Carp::longmess "post_cleanup backtrace" 3628 warn Carp::longmess "post_cleanup backtrace"
3139 if $make_core; 3629 if $make_core;
3630
3631 my $fh = pidfile;
3632 unlink $PIDFILE if <$fh> == $$;
3633}
3634
3635# a safer delete_package, copied from Symbol
3636sub clear_package($) {
3637 my $pkg = shift;
3638
3639 # expand to full symbol table name if needed
3640 unless ($pkg =~ /^main::.*::$/) {
3641 $pkg = "main$pkg" if $pkg =~ /^::/;
3642 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3643 $pkg .= '::' unless $pkg =~ /::$/;
3644 }
3645
3646 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3647 my $stem_symtab = *{$stem}{HASH};
3648
3649 defined $stem_symtab and exists $stem_symtab->{$leaf}
3650 or return;
3651
3652 # clear all symbols
3653 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3654 for my $name (keys %$leaf_symtab) {
3655 _gv_clear *{"$pkg$name"};
3656# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3657 }
3658 warn "cleared package $pkg\n";#d#
3140} 3659}
3141 3660
3142sub do_reload_perl() { 3661sub do_reload_perl() {
3143 # can/must only be called in main 3662 # can/must only be called in main
3144 if ($Coro::current != $Coro::main) { 3663 if ($Coro::current != $Coro::main) {
3145 warn "can only reload from main coroutine"; 3664 warn "can only reload from main coroutine";
3146 return; 3665 return;
3147 } 3666 }
3148 3667
3668 return if $RELOAD++;
3669
3670 my $t1 = EV::time;
3671
3672 while ($RELOAD) {
3149 warn "reloading..."; 3673 warn "reloading...";
3150 3674
3151 warn "entering sync_job"; 3675 warn "entering sync_job";
3152 3676
3153 cf::sync_job { 3677 cf::sync_job {
3154 cf::write_runtime; # external watchdog should not bark 3678 cf::write_runtime_sync; # external watchdog should not bark
3155 cf::emergency_save; 3679 cf::emergency_save;
3156 cf::write_runtime; # external watchdog should not bark 3680 cf::write_runtime_sync; # external watchdog should not bark
3157 3681
3158 warn "syncing database to disk"; 3682 warn "syncing database to disk";
3159 BDB::db_env_txn_checkpoint $DB_ENV; 3683 BDB::db_env_txn_checkpoint $DB_ENV;
3160 3684
3161 # if anything goes wrong in here, we should simply crash as we already saved 3685 # if anything goes wrong in here, we should simply crash as we already saved
3162 3686
3163 warn "cancelling all WF_AUTOCANCEL watchers";
3164 for (Event::all_watchers) {
3165 $_->cancel if $_->data & WF_AUTOCANCEL;
3166 }
3167
3168 warn "flushing outstanding aio requests"; 3687 warn "flushing outstanding aio requests";
3169 for (;;) {
3170 BDB::flush;
3171 IO::AIO::flush;
3172 Coro::cede;
3173 last unless IO::AIO::nreqs || BDB::nreqs; 3688 while (IO::AIO::nreqs || BDB::nreqs) {
3174 warn "iterate..."; 3689 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3175 }
3176
3177 ++$RELOAD;
3178
3179 warn "cancelling all extension coros";
3180 $_->cancel for values %EXT_CORO;
3181 %EXT_CORO = ();
3182
3183 warn "removing commands";
3184 %COMMAND = ();
3185
3186 warn "removing ext/exti commands";
3187 %EXTCMD = ();
3188 %EXTICMD = ();
3189
3190 warn "unloading/nuking all extensions";
3191 for my $pkg (@EXTS) {
3192 warn "... unloading $pkg";
3193
3194 if (my $cb = $pkg->can ("unload")) {
3195 eval {
3196 $cb->($pkg);
3197 1
3198 } or warn "$pkg unloaded, but with errors: $@";
3199 } 3690 }
3200 3691
3201 warn "... nuking $pkg"; 3692 warn "cancelling all extension coros";
3202 Symbol::delete_package $pkg; 3693 $_->cancel for values %EXT_CORO;
3203 } 3694 %EXT_CORO = ();
3204 3695
3205 warn "unloading all perl modules loaded from $LIBDIR"; 3696 warn "removing commands";
3206 while (my ($k, $v) = each %INC) { 3697 %COMMAND = ();
3207 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3208 3698
3699 warn "removing ext/exti commands";
3700 %EXTCMD = ();
3701 %EXTICMD = ();
3702
3703 warn "unloading/nuking all extensions";
3704 for my $pkg (@EXTS) {
3209 warn "... unloading $k"; 3705 warn "... unloading $pkg";
3210 delete $INC{$k};
3211 3706
3212 $k =~ s/\.pm$//;
3213 $k =~ s/\//::/g;
3214
3215 if (my $cb = $k->can ("unload_module")) { 3707 if (my $cb = $pkg->can ("unload")) {
3708 eval {
3216 $cb->(); 3709 $cb->($pkg);
3710 1
3711 } or warn "$pkg unloaded, but with errors: $@";
3712 }
3713
3714 warn "... clearing $pkg";
3715 clear_package $pkg;
3217 } 3716 }
3218 3717
3219 Symbol::delete_package $k; 3718 warn "unloading all perl modules loaded from $LIBDIR";
3719 while (my ($k, $v) = each %INC) {
3720 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3721
3722 warn "... unloading $k";
3723 delete $INC{$k};
3724
3725 $k =~ s/\.pm$//;
3726 $k =~ s/\//::/g;
3727
3728 if (my $cb = $k->can ("unload_module")) {
3729 $cb->();
3730 }
3731
3732 clear_package $k;
3220 } 3733 }
3221 3734
3222 warn "getting rid of safe::, as good as possible"; 3735 warn "getting rid of safe::, as good as possible";
3223 Symbol::delete_package "safe::$_" 3736 clear_package "safe::$_"
3224 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3737 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3225 3738
3226 warn "unloading cf.pm \"a bit\""; 3739 warn "unloading cf.pm \"a bit\"";
3227 delete $INC{"cf.pm"}; 3740 delete $INC{"cf.pm"};
3228 delete $INC{"cf/pod.pm"}; 3741 delete $INC{"cf/pod.pm"};
3229 3742
3230 # don't, removes xs symbols, too, 3743 # don't, removes xs symbols, too,
3231 # and global variables created in xs 3744 # and global variables created in xs
3232 #Symbol::delete_package __PACKAGE__; 3745 #clear_package __PACKAGE__;
3233 3746
3234 warn "unload completed, starting to reload now"; 3747 warn "unload completed, starting to reload now";
3235 3748
3236 warn "reloading cf.pm"; 3749 warn "reloading cf.pm";
3237 require cf; 3750 require cf;
3238 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3751 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3239 3752
3240 warn "loading config and database again"; 3753 warn "loading config and database again";
3241 cf::cfg_load; 3754 cf::reload_config;
3242 3755
3243 warn "loading extensions"; 3756 warn "loading extensions";
3244 cf::load_extensions; 3757 cf::load_extensions;
3245 3758
3759 if ($REATTACH_ON_RELOAD) {
3246 warn "reattaching attachments to objects/players"; 3760 warn "reattaching attachments to objects/players";
3247 _global_reattach; # objects, sockets 3761 _global_reattach; # objects, sockets
3248 warn "reattaching attachments to maps"; 3762 warn "reattaching attachments to maps";
3249 reattach $_ for values %MAP; 3763 reattach $_ for values %MAP;
3250 warn "reattaching attachments to players"; 3764 warn "reattaching attachments to players";
3251 reattach $_ for values %PLAYER; 3765 reattach $_ for values %PLAYER;
3766 }
3252 3767
3768 warn "running post_init jobs";
3769 (pop @POST_INIT)->(1) while @POST_INIT;
3770
3253 warn "leaving sync_job"; 3771 warn "leaving sync_job";
3254 3772
3255 1 3773 1
3256 } or do { 3774 } or do {
3257 warn $@; 3775 warn $@;
3258 warn "error while reloading, exiting."; 3776 cf::cleanup "error while reloading, exiting.";
3259 exit 1;
3260 }; 3777 };
3261 3778
3262 warn "reloaded"; 3779 warn "reloaded";
3780 --$RELOAD;
3781 }
3782
3783 $t1 = EV::time - $t1;
3784 warn "reload completed in ${t1}s\n";
3263}; 3785};
3264 3786
3265our $RELOAD_WATCHER; # used only during reload 3787our $RELOAD_WATCHER; # used only during reload
3266 3788
3267sub reload_perl() { 3789sub reload_perl() {
3268 # doing reload synchronously and two reloads happen back-to-back, 3790 # doing reload synchronously and two reloads happen back-to-back,
3269 # coro crashes during coro_state_free->destroy here. 3791 # coro crashes during coro_state_free->destroy here.
3270 3792
3271 $RELOAD_WATCHER ||= Event->timer ( 3793 $RELOAD_WATCHER ||= cf::async {
3272 reentrant => 0, 3794 Coro::AIO::aio_wait cache_extensions;
3273 after => 0, 3795
3274 data => WF_AUTOCANCEL, 3796 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3275 cb => sub {
3276 do_reload_perl; 3797 do_reload_perl;
3277 undef $RELOAD_WATCHER; 3798 undef $RELOAD_WATCHER;
3278 }, 3799 };
3279 ); 3800 };
3280} 3801}
3281 3802
3282register_command "reload" => sub { 3803register_command "reload" => sub {
3283 my ($who, $arg) = @_; 3804 my ($who, $arg) = @_;
3284 3805
3285 if ($who->flag (FLAG_WIZ)) { 3806 if ($who->flag (FLAG_WIZ)) {
3286 $who->message ("reloading server."); 3807 $who->message ("reloading server.");
3808 async {
3809 $Coro::current->{desc} = "perl_reload";
3287 async { reload_perl }; 3810 reload_perl;
3811 };
3288 } 3812 }
3289}; 3813};
3290 3814
3291unshift @INC, $LIBDIR; 3815unshift @INC, $LIBDIR;
3292 3816
3294 3818
3295our @WAIT_FOR_TICK; 3819our @WAIT_FOR_TICK;
3296our @WAIT_FOR_TICK_BEGIN; 3820our @WAIT_FOR_TICK_BEGIN;
3297 3821
3298sub wait_for_tick { 3822sub wait_for_tick {
3299 return unless $TICK_WATCHER->is_active;
3300 return if $Coro::current == $Coro::main; 3823 return if tick_inhibit || $Coro::current == $Coro::main;
3301 3824
3302 my $signal = new Coro::Signal; 3825 my $signal = new Coro::Signal;
3303 push @WAIT_FOR_TICK, $signal; 3826 push @WAIT_FOR_TICK, $signal;
3304 $signal->wait; 3827 $signal->wait;
3305} 3828}
3306 3829
3307sub wait_for_tick_begin { 3830sub wait_for_tick_begin {
3308 return unless $TICK_WATCHER->is_active;
3309 return if $Coro::current == $Coro::main; 3831 return if tick_inhibit || $Coro::current == $Coro::main;
3310 3832
3311 my $signal = new Coro::Signal; 3833 my $signal = new Coro::Signal;
3312 push @WAIT_FOR_TICK_BEGIN, $signal; 3834 push @WAIT_FOR_TICK_BEGIN, $signal;
3313 $signal->wait; 3835 $signal->wait;
3314} 3836}
3315 3837
3316 my $min = 1e6;#d# 3838sub tick {
3317 my $avg = 10;
3318$TICK_WATCHER = Event->timer (
3319 reentrant => 0,
3320 parked => 1,
3321 prio => 0,
3322 at => $NEXT_TICK || $TICK,
3323 data => WF_AUTOCANCEL,
3324 cb => sub {
3325 if ($Coro::current != $Coro::main) { 3839 if ($Coro::current != $Coro::main) {
3326 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3840 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3327 unless ++$bug_warning > 10; 3841 unless ++$bug_warning > 10;
3328 return; 3842 return;
3329 } 3843 }
3330 3844
3331 $NOW = $tick_start = Event::time;
3332
3333 cf::server_tick; # one server iteration 3845 cf::server_tick; # one server iteration
3334 3846
3335 0 && sync_job {#d# 3847 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3336 for(1..10) { 3848 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3337 my $t = Event::time; 3849 Coro::async_pool {
3338 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3850 $Coro::current->{desc} = "runtime saver";
3339 or die; 3851 write_runtime_sync
3340 3852 or warn "ERROR: unable to write runtime file: $!";
3341 $map->width (50);
3342 $map->height (50);
3343 $map->alloc;
3344 $map->_load_objects ("/tmp/x.map", 1);
3345 my $t = Event::time - $t;
3346
3347 #next unless $t < 0.0013;#d#
3348 if ($t < $min) {
3349 $min = $t;
3350 }
3351 $avg = $avg * 0.99 + $t * 0.01;
3352 }
3353 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3354 exit 0;
3355 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3356 }; 3853 };
3854 }
3357 3855
3358 $RUNTIME += $TICK;
3359 $NEXT_TICK += $TICK;
3360
3361 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3362 $NEXT_RUNTIME_WRITE = $NOW + 10;
3363 Coro::async_pool {
3364 write_runtime
3365 or warn "ERROR: unable to write runtime file: $!";
3366 };
3367 }
3368
3369# my $AFTER = Event::time;
3370# warn $AFTER - $NOW;#d#
3371
3372 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3856 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3373 $sig->send; 3857 $sig->send;
3374 } 3858 }
3375 while (my $sig = shift @WAIT_FOR_TICK) { 3859 while (my $sig = shift @WAIT_FOR_TICK) {
3376 $sig->send; 3860 $sig->send;
3377 } 3861 }
3378 3862
3379 $NOW = Event::time; 3863 $LOAD = ($NOW - $TICK_START) / $TICK;
3380
3381 # if we are delayed by four ticks or more, skip them all
3382 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3383
3384 $TICK_WATCHER->at ($NEXT_TICK);
3385 $TICK_WATCHER->start;
3386
3387 $LOAD = ($NOW - $tick_start) / $TICK;
3388 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3864 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3389 3865
3390 _post_tick; 3866 if (0) {
3391 3867 if ($NEXT_TICK) {
3392 3868 my $jitter = $TICK_START - $NEXT_TICK;
3869 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3870 warn "jitter $JITTER\n";#d#
3871 }
3393 }, 3872 }
3394); 3873}
3395 3874
3396{ 3875{
3397 BDB::max_poll_time $TICK * 0.1; 3876 # configure BDB
3398 $BDB_POLL_WATCHER = Event->io ( 3877
3399 reentrant => 0,
3400 fd => BDB::poll_fileno,
3401 poll => 'r',
3402 prio => 0,
3403 data => WF_AUTOCANCEL,
3404 cb => \&BDB::poll_cb,
3405 );
3406 BDB::min_parallel 8; 3878 BDB::min_parallel 8;
3407 3879 BDB::max_poll_reqs $TICK * 0.1;
3408 BDB::set_sync_prepare { 3880 $AnyEvent::BDB::WATCHER->priority (1);
3409 my $status;
3410 my $current = $Coro::current;
3411 (
3412 sub {
3413 $status = $!;
3414 $current->ready; undef $current;
3415 },
3416 sub {
3417 Coro::schedule while defined $current;
3418 $! = $status;
3419 },
3420 )
3421 };
3422 3881
3423 unless ($DB_ENV) { 3882 unless ($DB_ENV) {
3424 $DB_ENV = BDB::db_env_create; 3883 $DB_ENV = BDB::db_env_create;
3884 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3885 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3886 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3887 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3888 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3425 3889
3426 cf::sync_job { 3890 cf::sync_job {
3427 eval { 3891 eval {
3428 BDB::db_env_open 3892 BDB::db_env_open
3429 $DB_ENV, 3893 $DB_ENV,
3431 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3895 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3432 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3896 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3433 0666; 3897 0666;
3434 3898
3435 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3899 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3436
3437 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3438 $DB_ENV->set_lk_detect;
3439 }; 3900 };
3440 3901
3441 cf::cleanup "db_env_open(db): $@" if $@; 3902 cf::cleanup "db_env_open(db): $@" if $@;
3442 }; 3903 };
3443 } 3904 }
3905
3906 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3907 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3908 };
3909 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3910 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3911 };
3912 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3913 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3914 };
3444} 3915}
3445 3916
3446{ 3917{
3918 # configure IO::AIO
3919
3447 IO::AIO::min_parallel 8; 3920 IO::AIO::min_parallel 8;
3448
3449 undef $Coro::AIO::WATCHER;
3450 IO::AIO::max_poll_time $TICK * 0.1; 3921 IO::AIO::max_poll_time $TICK * 0.1;
3451 $AIO_POLL_WATCHER = Event->io ( 3922 undef $AnyEvent::AIO::WATCHER;
3452 reentrant => 0,
3453 data => WF_AUTOCANCEL,
3454 fd => IO::AIO::poll_fileno,
3455 poll => 'r',
3456 prio => 6,
3457 cb => \&IO::AIO::poll_cb,
3458 );
3459} 3923}
3460 3924
3461my $_log_backtrace; 3925my $_log_backtrace;
3462 3926
3463sub _log_backtrace { 3927sub _log_backtrace {
3466 $msg =~ s/\n//; 3930 $msg =~ s/\n//;
3467 3931
3468 # limit the # of concurrent backtraces 3932 # limit the # of concurrent backtraces
3469 if ($_log_backtrace < 2) { 3933 if ($_log_backtrace < 2) {
3470 ++$_log_backtrace; 3934 ++$_log_backtrace;
3935 my $perl_bt = Carp::longmess $msg;
3471 async { 3936 async {
3937 $Coro::current->{desc} = "abt $msg";
3938
3472 my @bt = fork_call { 3939 my @bt = fork_call {
3473 @addr = map { sprintf "%x", $_ } @addr; 3940 @addr = map { sprintf "%x", $_ } @addr;
3474 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3941 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3475 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3942 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3476 or die "addr2line: $!"; 3943 or die "addr2line: $!";
3484 } 3951 }
3485 3952
3486 @funcs 3953 @funcs
3487 }; 3954 };
3488 3955
3489 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $perl_bt\n";
3957 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3490 LOG llevInfo, "[ABT] $_\n" for @bt; 3958 LOG llevInfo, "[ABT] $_\n" for @bt;
3491 --$_log_backtrace; 3959 --$_log_backtrace;
3492 }; 3960 };
3493 } else { 3961 } else {
3494 LOG llevInfo, "[ABT] $msg\n"; 3962 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines