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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines