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.454 by root, Thu Sep 25 12:14:32 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines