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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.446 by root, Tue Sep 16 16:03:02 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
40Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
41 69
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 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 71
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 73
51our %COMMAND = (); 74our %COMMAND = ();
58our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
59 82
60our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
61our @EVENT; 84our @EVENT;
62 85
63our $CONFDIR = confdir; 86our $CONFDIR = confdir;
64our $DATADIR = datadir; 87our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
100our %RESOURCE;
74 101
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $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 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 104our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
82 106
107our $BDB_DEADLOCK_WATCHER;
108our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 109our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 110our $DB_ENV;
85 111
86our %CFG; 112our %CFG;
87 113
88our $UPTIME; $UPTIME ||= time; 114our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 115our $RUNTIME;
116our $NOW;
90 117
91our %PLAYER; # all users 118our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 119our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 120our $LINK_MAP; # the special {link} map, which is always available
94 121
95# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 124
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
101 129
102binmode STDOUT; 130binmode STDOUT;
103binmode STDERR; 131binmode STDERR;
104 132
105# read virtual server time, if available 133# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
110} 138}
111 139
112mkdir $_ 140mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
158 186
159The raw value load value from the last tick. 187The raw value load value from the last tick.
160 188
161=item %cf::CFG 189=item %cf::CFG
162 190
163Configuration for the server, loaded from C</etc/crossfire/config>, or 191Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 192from wherever your confdir points to.
165 193
166=item cf::wait_for_tick, cf::wait_for_tick_begin 194=item cf::wait_for_tick, cf::wait_for_tick_begin
167 195
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
186 $msg .= "\n" 214 $msg .= "\n"
187 unless $msg =~ /\n$/; 215 unless $msg =~ /\n$/;
188 216
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 218
191 utf8::encode $msg;
192 LOG llevError, $msg; 219 LOG llevError, $msg;
193 }; 220 };
194} 221}
222
223$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "=="
225
226 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d#
229 }#d#
230
231 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate
234};
235
236$SIG{__DIE__} = sub { }; #d#?
195 237
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
206for my $pkg (qw( 248for my $pkg (qw(
207 cf::global cf::attachable 249 cf::global cf::attachable
208 cf::object cf::object::player 250 cf::object cf::object::player
209 cf::client cf::player 251 cf::client cf::player
210 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
211 cf::map cf::party cf::region 254 cf::party cf::region
212)) { 255)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 257}
216 258
217$Event::DIED = sub { 259$EV::DIED = sub {
218 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
219}; 261};
220 262
221############################################################################# 263#############################################################################
222 264
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 288 $d
247 } || "[unable to dump $_[0]: '$@']"; 289 } || "[unable to dump $_[0]: '$@']";
248} 290}
249 291
250=item $ref = cf::from_json $json 292=item $ref = cf::decode_json $json
251 293
252Converts a JSON string into the corresponding perl data structure. 294Converts a JSON string into the corresponding perl data structure.
253 295
254=item $json = cf::to_json $ref 296=item $json = cf::encode_json $ref
255 297
256Converts a perl data structure into its JSON representation. 298Converts a perl data structure into its JSON representation.
257 299
258=cut 300=cut
259 301
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 303
262sub to_json ($) { $json_coder->encode ($_[0]) } 304sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 305sub decode_json($) { $json_coder->decode ($_[0]) }
264 306
265=item cf::lock_wait $string 307=item cf::lock_wait $string
266 308
267Wait until the given lock is available. See cf::lock_acquire. 309Wait until the given lock is available. See cf::lock_acquire.
268 310
271Wait until the given lock is available and then acquires it and returns 313Wait 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, 314a Coro::guard object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 315for example when the coroutine gets canceled), the lock is automatically
274returned. 316returned.
275 317
318Locks are *not* recursive, locking from the same coro twice results in a
319deadlocked coro.
320
276Lock names should begin with a unique identifier (for example, cf::map::find 321Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 322uses map_find and cf::map::load uses map_load).
278 323
279=item $locked = cf::lock_active $string 324=item $locked = cf::lock_active $string
280 325
281Return true if the lock is currently active, i.e. somebody has locked it. 326Return true if the lock is currently active, i.e. somebody has locked it.
282 327
283=cut 328=cut
284 329
285our %LOCK; 330our %LOCK;
331our %LOCKER;#d#
286 332
287sub lock_wait($) { 333sub lock_wait($) {
288 my ($key) = @_; 334 my ($key) = @_;
335
336 if ($LOCKER{$key} == $Coro::current) {#d#
337 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
338 return;#d#
339 }#d#
289 340
290 # wait for lock, if any 341 # wait for lock, if any
291 while ($LOCK{$key}) { 342 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current; 343 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule; 344 Coro::schedule;
299 350
300 # wait, to be sure we are not locked 351 # wait, to be sure we are not locked
301 lock_wait $key; 352 lock_wait $key;
302 353
303 $LOCK{$key} = []; 354 $LOCK{$key} = [];
355 $LOCKER{$key} = $Coro::current;#d#
304 356
305 Coro::guard { 357 Coro::guard {
358 delete $LOCKER{$key};#d#
306 # wake up all waiters, to be on the safe side 359 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} }; 360 $_->ready for @{ delete $LOCK{$key} };
308 } 361 }
309} 362}
310 363
313 366
314 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
315} 368}
316 369
317sub freeze_mainloop { 370sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
319 372
320 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
321 $TICK_WATCHER->start; 374}
322 }; 375
323 $TICK_WATCHER->stop; 376=item cf::periodic $interval, $cb
324 $guard 377
378Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer.
380
381=cut
382
383sub periodic($$) {
384 my ($interval, $cb) = @_;
385
386 my $start = rand List::Util::min 180, $interval;
387
388 EV::periodic $start, $interval, 0, $cb
325} 389}
326 390
327=item cf::get_slot $time[, $priority[, $name]] 391=item cf::get_slot $time[, $priority[, $name]]
328 392
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 393Allocate $time seconds of blocking CPU time at priority C<$priority>:
340our @SLOT_QUEUE; 404our @SLOT_QUEUE;
341our $SLOT_QUEUE; 405our $SLOT_QUEUE;
342 406
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 407$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 408$SLOT_QUEUE = Coro::async {
409 $Coro::current->desc ("timeslot manager");
410
345 my $signal = new Coro::Signal; 411 my $signal = new Coro::Signal;
346 412
347 while () { 413 while () {
348 next_job: 414 next_job:
349 my $avail = cf::till_tick; 415 my $avail = cf::till_tick;
357 } 423 }
358 } 424 }
359 } 425 }
360 426
361 if (@SLOT_QUEUE) { 427 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 428 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 429 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 430 $signal->wait;
365 } else { 431 } else {
366 Coro::schedule; 432 Coro::schedule;
367 } 433 }
368 } 434 }
369}; 435};
370 436
371sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
372 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
373 441
374 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
375 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
376 444
390 458
391BEGIN { *async = \&Coro::async_pool } 459BEGIN { *async = \&Coro::async_pool }
392 460
393=item cf::sync_job { BLOCK } 461=item cf::sync_job { BLOCK }
394 462
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 463The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 464is 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 465partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 466acceptable.
399 467
400If it must be done, put the blocking parts into C<sync_job>. This will run 468If 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 469the given BLOCK in another coroutine while waiting for the result. The
406 474
407sub sync_job(&) { 475sub sync_job(&) {
408 my ($job) = @_; 476 my ($job) = @_;
409 477
410 if ($Coro::current == $Coro::main) { 478 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 479 my $time = EV::time;
412 480
413 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
415 483
416 # TODO: use suspend/resume instead 484 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 485
418 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
419 487
420 my $busy = 1; 488 my $busy = 1;
421 my @res; 489 my @res;
422 490
423 (async { 491 (async {
492 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 493 @res = eval { $job->() };
425 warn $@ if $@; 494 warn $@ if $@;
426 undef $busy; 495 undef $busy;
427 })->prio (Coro::PRIO_MAX); 496 })->prio (Coro::PRIO_MAX);
428 497
429 while ($busy) { 498 while ($busy) {
430 Coro::cede or Event::one_event; 499 if (Coro::nready) {
500 Coro::cede_notself;
501 } else {
502 EV::loop EV::LOOP_ONESHOT;
431 } 503 }
504 }
432 505
433 $time = Event::time - $time; 506 my $time = EV::time - $time;
434 507
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 508 $TICK_START += $time; # do not account sync jobs to server load
439 509
440 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
441 } else { 511 } else {
442 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
443 513
468=item fork_call { }, $args 538=item fork_call { }, $args
469 539
470Executes the given code block with the given arguments in a seperate 540Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 541process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 542Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 543never block itself or use any form of event handling.
474 544
475=cut 545=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 546
486sub fork_call(&@) { 547sub fork_call(&@) {
487 my ($cb, @args) = @_; 548 my ($cb, @args) = @_;
488 549
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 550 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 551 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 552 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 553
494 if (my $pid = fork) { 554 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; 555 reset_signals;
508 local $SIG{__WARN__}; 556 &$cb
509 local $SIG{__DIE__}; 557 }, @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 558
516 eval { 559 wantarray ? @res : $res[-1]
517 close $fh1; 560}
518 561
519 my @res = eval { $cb->(@args) }; 562=item $coin = coin_from_name $name
520 563
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res; 564=cut
522 close $fh2;
523 };
524 565
525 warn $@ if $@; 566our %coin_alias = (
526 _exit 0; 567 "silver" => "silvercoin",
527 } 568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
528} 587}
529 588
530=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
531 590
532Returns a single value from the environment database. 591Returns a single value from the environment database.
534=item cf::db_put $family => $key => $value 593=item cf::db_put $family => $key => $value
535 594
536Stores the given C<$value> in the family. It can currently store binary 595Stores 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). 596data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 597
598=item $db = cf::db_table "name"
599
600Create and/or open a new database table. The string must not be "db" and must be unique
601within each server.
602
539=cut 603=cut
604
605sub db_table($) {
606 my ($name) = @_;
607 my $db = BDB::db_create $DB_ENV;
608
609 eval {
610 $db->set_flags (BDB::CHKSUM);
611
612 utf8::encode $name;
613 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
614 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
615 cf::cleanup "db_open(db): $!" if $!;
616 };
617 cf::cleanup "db_open(db): $@" if $@;
618
619 $db
620}
540 621
541our $DB; 622our $DB;
542 623
543sub db_init { 624sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 625 cf::sync_job {
548 eval { 626 $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 } 627 };
558} 628}
559 629
560sub db_get($$) { 630sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 631 my $key = "$_[0]/$_[1]";
562 632
612 if (1) { 682 if (1) {
613 $md5 = 683 $md5 =
614 join "\x00", 684 join "\x00",
615 $processversion, 685 $processversion,
616 map { 686 map {
617 Coro::cede; 687 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 688 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 689 } 0.. $#$src;
620 690
621 691
622 my $dbmd5 = db_get cache => "$id/md5"; 692 my $dbmd5 = db_get cache => "$id/md5";
666attach callbacks/event handlers (a collection of which is called an "attachment") 736attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 737to it. All such attachable objects support the following methods.
668 738
669In the following description, CLASS can be any of C<global>, C<object> 739In 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 740C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 741Deliantra).
672 742
673=over 4 743=over 4
674 744
675=item $attachable->attach ($attachment, key => $value...) 745=item $attachable->attach ($attachment, key => $value...)
676 746
958 } 1028 }
959 1029
960 0 1030 0
961} 1031}
962 1032
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1033=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1034
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1036
967Generate an object-specific event with the given arguments. 1037Generate an object-specific event with the given arguments.
968 1038
974 1044
975=cut 1045=cut
976 1046
977############################################################################# 1047#############################################################################
978# object support 1048# object support
979#
980 1049
1050sub _object_equal($$);
1051sub _object_equal($$) {
1052 my ($a, $b) = @_;
1053
1054 return 0 unless (ref $a) eq (ref $b);
1055
1056 if ("HASH" eq ref $a) {
1057 my @ka = keys %$a;
1058 my @kb = keys %$b;
1059
1060 return 0 if @ka != @kb;
1061
1062 for (0 .. $#ka) {
1063 return 0 unless $ka[$_] eq $kb[$_];
1064 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1065 }
1066
1067 } elsif ("ARRAY" eq ref $a) {
1068
1069 return 0 if @$a != @$b;
1070
1071 for (0 .. $#$a) {
1072 return 0 unless _object_equal $a->[$_], $b->[$_];
1073 }
1074
1075 } elsif ($a ne $b) {
1076 return 0;
1077 }
1078
1079 1
1080}
1081
1082our $SLOW_MERGES;#d#
981sub _can_merge { 1083sub _can_merge {
982 my ($ob1, $ob2) = @_; 1084 my ($ob1, $ob2) = @_;
983 1085
984 local $Storable::canonical = 1; 1086 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1087
988 $fob1 eq $fob2 1088 # we do the slow way here
1089 return _object_equal $ob1, $ob2
989} 1090}
990 1091
991sub reattach { 1092sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1094 my ($obj) = @_;
994 1095
1096 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1098
997 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
998 1100
999 @$registry = (); 1101 @$registry = ();
1000 1102
1015cf::attachable->attach ( 1117cf::attachable->attach (
1016 prio => -1000000, 1118 prio => -1000000,
1017 on_instantiate => sub { 1119 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1120 my ($obj, $data) = @_;
1019 1121
1020 $data = from_json $data; 1122 $data = decode_json $data;
1021 1123
1022 for (@$data) { 1124 for (@$data) {
1023 my ($name, $args) = @$_; 1125 my ($name, $args) = @$_;
1024 1126
1025 $obj->attach ($name, %{$args || {} }); 1127 $obj->attach ($name, %{$args || {} });
1041sub object_freezer_save { 1143sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1144 my ($filename, $rdata, $objs) = @_;
1043 1145
1044 sync_job { 1146 sync_job {
1045 if (length $$rdata) { 1147 if (length $$rdata) {
1148 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1048 1151
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1053 close $fh; 1156 aio_close $fh;
1054 1157
1055 if (@$objs) { 1158 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1061 close $fh; 1164 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1166 }
1064 } else { 1167 } else {
1065 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1066 } 1169 }
1071 } 1174 }
1072 } else { 1175 } else {
1073 aio_unlink $filename; 1176 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1075 } 1178 }
1076 } 1179 };
1077} 1180}
1078 1181
1079sub object_freezer_as_string { 1182sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1183 my ($rdata, $objs) = @_;
1081 1184
1093 or return; 1196 or return;
1094 1197
1095 unless (aio_stat "$filename.pst") { 1198 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1199 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1200 or return;
1201
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1202 my $st = eval { Coro::Storable::thaw $av };
1203 $av = $st->{objs};
1099 } 1204 }
1100 1205
1206 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1207 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1208 $decname, length $data, scalar @{$av || []};
1209
1103 return ($data, $av); 1210 ($data, $av)
1104} 1211}
1105 1212
1106=head2 COMMAND CALLBACKS 1213=head2 COMMAND CALLBACKS
1107 1214
1108=over 4 1215=over 4
1181 my ($pl, $buf) = @_; 1288 my ($pl, $buf) = @_;
1182 1289
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1290 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1291
1185 if (ref $msg) { 1292 if (ref $msg) {
1293 my ($type, $reply, @payload) =
1294 "ARRAY" eq ref $msg
1295 ? @$msg
1296 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1297
1298 my @reply;
1299
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1300 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1301 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1302 }
1303
1304 $pl->ext_reply ($reply, @reply)
1305 if $reply;
1306
1191 } else { 1307 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1309 }
1194 1310
1195 cf::override; 1311 cf::override;
1222 1338
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1341
1226 $ext{source} = 1342 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1229 . $source 1345 . $source
1230 . "\n};\n1"; 1346 . "\n};\n1";
1231 1347
1232 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
1248 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1249 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1250 1366
1251 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1252 warn $msg; 1368 warn $msg;
1253 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1254 exit 1;
1255 } 1370 }
1256 1371
1257 warn $msg; 1372 warn $msg;
1258 } 1373 }
1259 1374
1284use Coro::AIO; 1399use Coro::AIO;
1285 1400
1286=head3 cf::player 1401=head3 cf::player
1287 1402
1288=over 4 1403=over 4
1404
1405=item cf::player::num_playing
1406
1407Returns the official number of playing players, as per the Crossfire metaserver rules.
1408
1409=cut
1410
1411sub num_playing {
1412 scalar grep
1413 $_->ob->map
1414 && !$_->hidden
1415 && !$_->ob->flag (cf::FLAG_WIZ),
1416 cf::player::list
1417}
1289 1418
1290=item cf::player::find $login 1419=item cf::player::find $login
1291 1420
1292Returns the given player object, loading it if necessary (might block). 1421Returns the given player object, loading it if necessary (might block).
1293 1422
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1458 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1459 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1460 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1461 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1462
1334 my $pl = load_pl path $login 1463 my $f = new_from_file cf::object::thawer path $login
1335 or return; 1464 or return;
1465
1466 my $pl = cf::player::load_pl $f
1467 or return;
1468
1469 local $cf::PLAYER_LOADING{$login} = $pl;
1470 $f->resolve_delayed_derefs;
1336 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1337 } 1472 }
1338 } 1473 }
1339} 1474}
1340 1475
1349 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1350 1485
1351 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1353 1488
1489 cf::get_slot 0.01;
1490
1354 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1355 Coro::cede; 1492 cf::cede_to_tick;
1356} 1493}
1357 1494
1358sub new($) { 1495sub new($) {
1359 my ($login) = @_; 1496 my ($login) = @_;
1360 1497
1366 $cf::PLAYER{$login} = $self; 1503 $cf::PLAYER{$login} = $self;
1367 1504
1368 $self 1505 $self
1369} 1506}
1370 1507
1508=item $player->send_msg ($channel, $msg, $color, [extra...])
1509
1510=cut
1511
1512sub send_msg {
1513 my $ns = shift->ns
1514 or return;
1515 $ns->send_msg (@_);
1516}
1517
1371=item $pl->quit_character 1518=item $pl->quit_character
1372 1519
1373Nukes the player without looking back. If logged in, the connection will 1520Nukes the player without looking back. If logged in, the connection will
1374be destroyed. May block for a long time. 1521be destroyed. May block for a long time.
1375 1522
1379 my ($pl) = @_; 1526 my ($pl) = @_;
1380 1527
1381 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1382 1529
1383 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1384 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1385 1532
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1389 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1390 1539
1391 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
1428 or return []; 1577 or return [];
1429 1578
1430 my @logins; 1579 my @logins;
1431 1580
1432 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1582 my $path = path $login;
1583
1584 # a .pst is a dead give-away for a valid player
1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1590 }
1436 1591
1437 utf8::decode $login; 1592 utf8::decode $login;
1438 push @logins, $login; 1593 push @logins, $login;
1439 } 1594 }
1440 1595
1471 1626
1472=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1473 1628
1474Expand crossfire pod fragments into protocol xml. 1629Expand crossfire pod fragments into protocol xml.
1475 1630
1476=cut
1477
1478sub expand_cfpod {
1479 ((my $self), (local $_)) = @_;
1480
1481 # escape & and <
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484
1485 # this is buggy, it needs to properly take care of nested <'s
1486
1487 1 while
1488 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/
1492 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1
1495 }ge
1496 # replace H<hint text>
1497 || s{H<([^\>]*)>}
1498 {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "")
1502 [$self->{hintmode}]
1503 }ge;
1504
1505 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g;
1507
1508 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1513
1514 $_
1515}
1516
1517sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode}
1520}
1521
1522=item $player->ext_reply ($msgid, %msg) 1631=item $player->ext_reply ($msgid, @msg)
1523 1632
1524Sends an ext reply to the player. 1633Sends an ext reply to the player.
1525 1634
1526=cut 1635=cut
1527 1636
1528sub ext_reply($$%) { 1637sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1638 my ($self, $id, @msg) = @_;
1530 1639
1531 $msg{msgid} = $id; 1640 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1641}
1534 1642
1535=item $player->ext_event ($type, %msg) 1643=item $player->ext_msg ($type, @msg)
1536 1644
1537Sends an ext event to the client. 1645Sends an ext event to the client.
1538 1646
1539=cut 1647=cut
1540 1648
1541sub ext_event($$%) { 1649sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1650 my ($self, $type, @msg) = @_;
1543 1651
1544 $self->ns->ext_event ($type, %msg); 1652 $self->ns->ext_msg ($type, @msg);
1545} 1653}
1546 1654
1547=head3 cf::region 1655=head3 cf::region
1548 1656
1549=over 4 1657=over 4
1593our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1594our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1595 1703
1596sub generate_random_map { 1704sub generate_random_map {
1597 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1598 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1599 $self->_create_random_map ( 1710 $self->_create_random_map (
1600 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1601 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1602 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1724 1835
1725# the temporary/swap location 1836# the temporary/swap location
1726sub save_path { 1837sub save_path {
1727 my ($self) = @_; 1838 my ($self) = @_;
1728 1839
1729 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1730 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1731} 1842}
1732 1843
1733# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1734sub uniq_path { 1845sub uniq_path {
1735 my ($self) = @_; 1846 my ($self) = @_;
1736 1847
1737 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1738 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1739} 1850}
1740 1851
1741# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1742# all maps in C++... 1853# all maps in C++...
1765 1876
1766sub load_header_from($) { 1877sub load_header_from($) {
1767 my ($self, $path) = @_; 1878 my ($self, $path) = @_;
1768 1879
1769 utf8::encode $path; 1880 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1881 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1882 or return;
1883
1884 $self->_load_header ($f)
1885 or return;
1886
1887 local $MAP_LOADING{$self->{path}} = $self;
1888 $f->resolve_delayed_derefs;
1775 1889
1776 $self->{load_path} = $path; 1890 $self->{load_path} = $path;
1777 1891
1778 1 1892 1
1779} 1893}
1833sub find { 1947sub find {
1834 my ($path, $origin) = @_; 1948 my ($path, $origin) = @_;
1835 1949
1836 $path = normalise $path, $origin && $origin->path; 1950 $path = normalise $path, $origin && $origin->path;
1837 1951
1952 cf::lock_wait "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1839 1954
1840 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1841 my $guard = cf::lock_acquire "map_find:$path"; 1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1842 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1843 or return; 1960 or return;
1844 1961
1845 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1846 1963
1848 or return; 1965 or return;
1849 1966
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1971 undef $guard1;
1853 $map->reset; 1972 $map->reset;
1854 undef $guard;
1855 return find $path; 1973 return find $path;
1856 } 1974 }
1857 1975
1858 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
1859 } 1977 }
1868 local $self->{deny_reset} = 1; # loading can take a long time 1986 local $self->{deny_reset} = 1; # loading can take a long time
1869 1987
1870 my $path = $self->{path}; 1988 my $path = $self->{path};
1871 1989
1872 { 1990 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 1991 my $guard = cf::lock_acquire "map_data:$path";
1874 1992
1993 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 1994 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 1995
1877 $self->in_memory (cf::MAP_LOADING); 1996 $self->in_memory (cf::MAP_LOADING);
1878 1997
1879 $self->alloc; 1998 $self->alloc;
1880 1999
1881 $self->pre_load; 2000 $self->pre_load;
1882 Coro::cede; 2001 cf::cede_to_tick;
1883 2002
2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2005 $self->_load_objects ($f)
1885 or return; 2006 or return;
1886 2007
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
1888 if delete $self->{load_original}; 2009 if delete $self->{load_original};
1889 2010
1890 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2012 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2013 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2015 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2016 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs;
2018 }
1895 } 2019 }
1896 } 2020 }
1897 2021
1898 Coro::cede; 2022 $f->resolve_delayed_derefs;
2023
2024 cf::cede_to_tick;
1899 # now do the right thing for maps 2025 # now do the right thing for maps
1900 $self->link_multipart_objects; 2026 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2027 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2028 unless $self->difficulty;
1903 Coro::cede; 2029 cf::cede_to_tick;
1904 2030
1905 unless ($self->{deny_activate}) { 2031 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2032 $self->decay_objects;
1907 $self->fix_auto_apply; 2033 $self->fix_auto_apply;
1908 $self->update_buttons; 2034 $self->update_buttons;
1909 Coro::cede; 2035 cf::cede_to_tick;
1910 $self->set_darkness_map; 2036 $self->set_darkness_map;
1911 Coro::cede; 2037 cf::cede_to_tick;
1912 $self->activate; 2038 $self->activate;
1913 } 2039 }
1914 2040
2041 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME);
2043
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
1916 } 2045 }
1917 2046
1918 $self->post_load; 2047 $self->post_load;
1919} 2048}
1920 2049
1929 2058
1930 $self 2059 $self
1931} 2060}
1932 2061
1933# find and load all maps in the 3x3 area around a map 2062# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2063sub load_neighbours {
1935 my ($map) = @_; 2064 my ($map) = @_;
1936 2065
1937 my @diag; # diagonal neighbours 2066 my @neigh; # diagonal neighbours
1938 2067
1939 for (0 .. 3) { 2068 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2069 my $neigh = $map->tile_path ($_)
1941 or next; 2070 or next;
1942 $neigh = find $neigh, $map 2071 $neigh = find $neigh, $map
1943 or next; 2072 or next;
1944 $neigh->load; 2073 $neigh->load;
1945 2074
2075 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2076 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2077 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2078 }
1949 2079
1950 for (@diag) { 2080 for (grep defined $_->[0], @neigh) {
2081 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2082 my $neigh = find $path, $origin
1952 or next; 2083 or next;
1953 $neigh->load; 2084 $neigh->load;
1954 } 2085 }
1955} 2086}
1956 2087
1961} 2092}
1962 2093
1963sub do_load_sync { 2094sub do_load_sync {
1964 my ($map) = @_; 2095 my ($map) = @_;
1965 2096
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main;
2099
1966 cf::sync_job { $map->load }; 2100 cf::sync_job { $map->load };
1967} 2101}
1968 2102
1969our %MAP_PREFETCH; 2103our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2104our $MAP_PREFETCHER = undef;
1971 2105
1972sub find_async { 2106sub find_async {
1973 my ($path, $origin) = @_; 2107 my ($path, $origin, $load) = @_;
1974 2108
1975 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
1976 2110
1977 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1979 } 2113 }
1980 2114
1981 undef $MAP_PREFETCH{$path}; 2115 $MAP_PREFETCH{$path} |= $load;
2116
1982 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2118 $Coro::current->{desc} = "map prefetcher";
2119
1983 while (%MAP_PREFETCH) { 2120 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2121 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2122 if (my $map = find $k) {
1986 $map->load; 2123 $map->load if $v;
1987 } 2124 }
1988 2125
1989 delete $MAP_PREFETCH{$path}; 2126 delete $MAP_PREFETCH{$k};
1990 } 2127 }
1991 } 2128 }
1992 undef $MAP_PREFETCHER; 2129 undef $MAP_PREFETCHER;
1993 }; 2130 };
1994 $MAP_PREFETCHER->prio (6); 2131 $MAP_PREFETCHER->prio (6);
1997} 2134}
1998 2135
1999sub save { 2136sub save {
2000 my ($self) = @_; 2137 my ($self) = @_;
2001 2138
2002 my $lock = cf::lock_acquire "map_data:" . $self->path; 2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2003 2140
2004 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2005 2142
2006 return unless $self->dirty; 2143 return unless $self->dirty;
2007 2144
2013 return if $self->{deny_save}; 2150 return if $self->{deny_save};
2014 2151
2015 local $self->{last_access} = $self->last_access;#d# 2152 local $self->{last_access} = $self->last_access;#d#
2016 2153
2017 cf::async { 2154 cf::async {
2155 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2019 }; 2157 };
2158
2159 cf::get_slot 0.02;
2020 2160
2021 if ($uniq) { 2161 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2023 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2024 } else { 2164 } else {
2030 my ($self) = @_; 2170 my ($self) = @_;
2031 2171
2032 # save first because save cedes 2172 # save first because save cedes
2033 $self->save; 2173 $self->save;
2034 2174
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2176
2037 return if $self->players; 2177 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2039 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2040 2180
2181 $self->in_memory (cf::MAP_SWAPPED);
2182
2183 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP;
2041 $self->clear; 2185 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2186}
2044 2187
2045sub reset_at { 2188sub reset_at {
2046 my ($self) = @_; 2189 my ($self) = @_;
2047 2190
2079 if $uniq; 2222 if $uniq;
2080 } 2223 }
2081 2224
2082 delete $cf::MAP{$self->path}; 2225 delete $cf::MAP{$self->path};
2083 2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2229 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2230
2088 $self->unlink_save; 2231 $self->unlink_save;
2089 $self->destroy; 2232 $self->destroy;
2090} 2233}
2091 2234
2092my $nuke_counter = "aaaa"; 2235my $nuke_counter = "aaaa";
2093 2236
2094sub nuke { 2237sub nuke {
2095 my ($self) = @_; 2238 my ($self) = @_;
2096 2239
2240 {
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2097 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2098 2244
2099 $self->unlink_save; 2245 $self->unlink_save;
2100 2246
2101 bless $self, "cf::map"; 2247 bless $self, "cf::map";
2102 delete $self->{deny_reset}; 2248 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2249 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2250 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2252
2107 $cf::MAP{$self->path} = $self; 2253 $cf::MAP{$self->path} = $self;
2254 }
2108 2255
2109 $self->reset; # polite request, might not happen 2256 $self->reset; # polite request, might not happen
2110} 2257}
2111 2258
2112=item $maps = cf::map::tmp_maps 2259=item $maps = cf::map::tmp_maps
2154 2301
2155sub unique_maps() { 2302sub unique_maps() {
2156 [ 2303 [
2157 map { 2304 map {
2158 utf8::decode $_; 2305 utf8::decode $_;
2159 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2160 ? normalise $_ 2309 : normalise $_
2161 : ()
2162 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2163 ] 2311 ]
2164} 2312}
2165 2313
2166package cf;
2167
2168=back 2314=back
2169 2315
2170=head3 cf::object 2316=head3 cf::object
2171 2317
2172=cut 2318=cut
2175 2321
2176=over 4 2322=over 4
2177 2323
2178=item $ob->inv_recursive 2324=item $ob->inv_recursive
2179 2325
2180Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2181 2328
2182=cut 2329=cut
2183 2330
2184sub inv_recursive_; 2331sub inv_recursive_;
2185sub inv_recursive_ { 2332sub inv_recursive_ {
2188 2335
2189sub inv_recursive { 2336sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2191} 2338}
2192 2339
2340=item $ref = $ob->ref
2341
2342Creates and returns a persistent reference to an object that can be stored as a string.
2343
2344=item $ob = cf::object::deref ($refstring)
2345
2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2347even if the object actually exists. May block.
2348
2349=cut
2350
2351sub deref {
2352 my ($ref) = @_;
2353
2354 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2355 my ($uuid, $name) = ($1, $2);
2356 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2357 or return;
2358 $pl->ob->uuid eq $uuid
2359 or return;
2360
2361 $pl->ob
2362 } else {
2363 warn "$ref: cannot resolve object reference\n";
2364 undef
2365 }
2366}
2367
2193package cf; 2368package cf;
2194 2369
2195=back 2370=back
2196 2371
2197=head3 cf::object::player 2372=head3 cf::object::player
2203Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2378Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2204can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2205dialogue with the given NPC character. 2380dialogue with the given NPC character.
2206 2381
2207=cut 2382=cut
2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2208 2397
2209# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2210# with dialog boxes. 2399# with dialog boxes.
2211#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2212sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2219 2408
2220 } else { 2409 } else {
2221 my $pl = $self->contr; 2410 my $pl = $self->contr;
2222 2411
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2412 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2415
2232 } else { 2416 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2235 } 2419 }
2236 } 2420 }
2421}
2422
2423=item $object->send_msg ($channel, $msg, $color, [extra...])
2424
2425=cut
2426
2427sub cf::object::send_msg {
2428 my $pl = shift->contr
2429 or return;
2430 $pl->send_msg (@_);
2237} 2431}
2238 2432
2239=item $player_object->may ("access") 2433=item $player_object->may ("access")
2240 2434
2241Returns wether the given player is authorized to access resource "access" 2435Returns wether the given player is authorized to access resource "access"
2254 2448
2255=item $player_object->enter_link 2449=item $player_object->enter_link
2256 2450
2257Freezes the player and moves him/her to a special map (C<{link}>). 2451Freezes the player and moves him/her to a special map (C<{link}>).
2258 2452
2259The player should be reasonably safe there for short amounts of time. You 2453The player should be reasonably safe there for short amounts of time (e.g.
2260I<MUST> call C<leave_link> as soon as possible, though. 2454for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link
2456map.
2261 2457
2262Will never block. 2458Will never block.
2263 2459
2264=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2265 2461
2320 # use -1 or undef as default coordinates, not 0, 0 2516 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2517 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2518 if $x <=0 && $y <= 0;
2323 2519
2324 $map->load; 2520 $map->load;
2325 $map->load_diag; 2521 $map->load_neighbours;
2326 2522
2327 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2328 $self->activate_recursive; 2525 $self->activate_recursive;
2329 2526
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2331 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2332} 2529}
2337her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2338that has to return the map if sucecssful, and then unfreezes the player on 2535that has to return the map if sucecssful, and then unfreezes the player on
2339the new (success) or old (failed) map position. In either case, $done will 2536the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process. 2537be called at the end of this process.
2341 2538
2539Note that $check will be called with a potentially non-loaded map, so if
2540it needs a loaded map it has to call C<< ->load >>.
2541
2342=cut 2542=cut
2343 2543
2344our $GOTOGEN; 2544our $GOTOGEN;
2345 2545
2346sub cf::object::player::goto { 2546sub cf::object::player::goto {
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2551
2352 $self->enter_link; 2552 $self->enter_link;
2353 2553
2354 (async { 2554 (async {
2555 $Coro::current->{desc} = "player::goto $path $x $y";
2556
2557 # *tag paths override both path and x|y
2558 if ($path =~ /^\*(.*)$/) {
2559 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2560 my $ob = $obs[rand @obs];
2561
2562 # see if we actually can go there
2563 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2564 $ob = $obs[rand @obs];
2565 } else {
2566 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2567 }
2568 # else put us there anyways for now #d#
2569
2570 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2571 } else {
2572 ($path, $x, $y) = (undef, undef, undef);
2573 }
2574 }
2575
2355 my $map = eval { 2576 my $map = eval {
2356 my $map = cf::map::find $path; 2577 my $map = defined $path ? cf::map::find $path : undef;
2357 2578
2358 if ($map) { 2579 if ($map) {
2359 $map = $map->customise_for ($self); 2580 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2581 $map = $check->($map) if $check && $map;
2361 } else { 2582 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2583 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2584 }
2364 2585
2365 $map 2586 $map
2366 }; 2587 };
2367 2588
2403} 2624}
2404 2625
2405sub prepare_random_map { 2626sub prepare_random_map {
2406 my ($exit) = @_; 2627 my ($exit) = @_;
2407 2628
2408 my $guard = cf::lock_acquire "exit_prepare:$exit";
2409
2410 # all this does is basically replace the /! path by 2629 # all this does is basically replace the /! path by
2411 # a new random map path (?random/...) with a seed 2630 # a new random map path (?random/...) with a seed
2412 # that depends on the exit object 2631 # that depends on the exit object
2413 2632
2414 my $rmp = parse_random_map_params $exit->msg; 2633 my $rmp = parse_random_map_params $exit->msg;
2416 if ($exit->map) { 2635 if ($exit->map) {
2417 $rmp->{region} = $exit->region->name; 2636 $rmp->{region} = $exit->region->name;
2418 $rmp->{origin_map} = $exit->map->path; 2637 $rmp->{origin_map} = $exit->map->path;
2419 $rmp->{origin_x} = $exit->x; 2638 $rmp->{origin_x} = $exit->x;
2420 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2640
2641 $exit->map->touch;
2421 } 2642 }
2422 2643
2423 $rmp->{random_seed} ||= $exit->random_seed; 2644 $rmp->{random_seed} ||= $exit->random_seed;
2424 2645
2425 my $data = cf::to_json $rmp; 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2426 my $md5 = Digest::MD5::md5_hex $data; 2647 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2648 my $meta = "$RANDOMDIR/$md5.meta";
2428 2649
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2650 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2651 aio_write $fh, 0, (length $data), $data, 0;
2431 undef $fh; 2652 undef $fh;
2432 aio_rename "$meta~", $meta; 2653 aio_rename "$meta~", $meta;
2433 2654
2655 my $slaying = "?random/$md5";
2656
2657 if ($exit->valid) {
2434 $exit->slaying ("?random/$md5"); 2658 $exit->slaying ("?random/$md5");
2435 $exit->msg (undef); 2659 $exit->msg (undef);
2660 }
2436 } 2661 }
2437} 2662}
2438 2663
2439sub cf::object::player::enter_exit { 2664sub cf::object::player::enter_exit {
2440 my ($self, $exit) = @_; 2665 my ($self, $exit) = @_;
2441 2666
2442 return unless $self->type == cf::PLAYER; 2667 return unless $self->type == cf::PLAYER;
2443 2668
2444 if ($exit->slaying eq "/!") {
2445 #TODO: this should de-fi-ni-te-ly not be a sync-job
2446 # the problem is that $exit might not survive long enough
2447 # so it needs to be done right now, right here
2448 cf::sync_job { prepare_random_map $exit };
2449 }
2450
2451 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2452 my $hp = $exit->stats->hp;
2453 my $sp = $exit->stats->sp;
2454
2455 $self->enter_link; 2669 $self->enter_link;
2456 2670
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2461 (async { 2671 (async {
2462 $self->deactivate_recursive; # just to be sure 2672 $Coro::current->{desc} = "enter_exit";
2673
2463 unless (eval { 2674 unless (eval {
2675 $self->deactivate_recursive; # just to be sure
2676
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2686 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp;
2688
2464 $self->goto ($slaying, $hp, $sp); 2689 $self->goto ($map, $x, $y);
2465 2690
2691 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED);
2694
2466 1; 2695 1
2467 }) { 2696 }) {
2468 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the crossfire server. "
2469 . "I'll try to bring you back to the map you were before. " 2698 . "I'll try to bring you back to the map you were before. "
2470 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2471 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2730the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2731the message unless the client supports the msg packet.
2503 2732
2504=cut 2733=cut
2505 2734
2735# non-persistent channels (usually the info channel)
2736our %CHANNEL = (
2737 "c/identify" => {
2738 id => "infobox",
2739 title => "Identify",
2740 reply => undef,
2741 tooltip => "Items recently identified",
2742 },
2743 "c/examine" => {
2744 id => "infobox",
2745 title => "Examine",
2746 reply => undef,
2747 tooltip => "Signs and other items you examined",
2748 },
2749 "c/book" => {
2750 id => "infobox",
2751 title => "Book",
2752 reply => undef,
2753 tooltip => "The contents of a note or book",
2754 },
2755 "c/lookat" => {
2756 id => "infobox",
2757 title => "Look",
2758 reply => undef,
2759 tooltip => "What you saw there",
2760 },
2761 "c/who" => {
2762 id => "infobox",
2763 title => "Players",
2764 reply => undef,
2765 tooltip => "Shows players who are currently online",
2766 },
2767 "c/body" => {
2768 id => "infobox",
2769 title => "Body Parts",
2770 reply => undef,
2771 tooltip => "Shows which body parts you posess and are available",
2772 },
2773 "c/uptime" => {
2774 id => "infobox",
2775 title => "Uptime",
2776 reply => undef,
2777 tooltip => "How long the server has been running since last restart",
2778 },
2779 "c/mapinfo" => {
2780 id => "infobox",
2781 title => "Map Info",
2782 reply => undef,
2783 tooltip => "Information related to the maps",
2784 },
2785 "c/party" => {
2786 id => "party",
2787 title => "Party",
2788 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party",
2790 },
2791);
2792
2506sub cf::client::send_msg { 2793sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2508 2795
2509 $msg = $self->pl->expand_cfpod ($msg); 2796 $msg = $self->pl->expand_cfpod ($msg);
2510 2797
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 2798 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 2799
2800 # check predefined channels, for the benefit of C
2801 if ($CHANNEL{$channel}) {
2802 $channel = $CHANNEL{$channel};
2803
2804 $self->ext_msg (channel_info => $channel)
2805 if $self->can_msg;
2806
2807 $channel = $channel->{id};
2808
2513 if (ref $channel) { 2809 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 2810 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 2811 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 2812 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 2813 $self->ext_msg (channel_info => $channel)
2814 if $self->can_msg;
2518 } 2815 }
2519 2816
2520 $channel = $channel->{id}; 2817 $channel = $channel->{id};
2521 } 2818 }
2522 2819
2523 return unless @extra || length $msg; 2820 return unless @extra || length $msg;
2524 2821
2525 if ($self->can_msg) { 2822 if ($self->can_msg) {
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2823 # default colour, mask it out
2824 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2825 if $color & cf::NDI_DEF;
2826
2827 my $pkt = "msg "
2828 . $self->{json_coder}->encode (
2829 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2830 );
2831
2832 # try lzf for large packets
2833 $pkt = "lzf " . Compress::LZF::compress $pkt
2834 if 1024 <= length $pkt and $self->{can_lzf};
2835
2836 # split very large packets
2837 if (8192 < length $pkt and $self->{can_lzf}) {
2838 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2839 $pkt = "frag";
2840 }
2841
2842 $self->send_packet ($pkt);
2527 } else { 2843 } else {
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537
2538 if ($color >= 0) { 2844 if ($color >= 0) {
2845 # replace some tags by gcfclient-compatible ones
2846 for ($msg) {
2847 1 while
2848 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2849 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2850 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2851 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2852 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2853 }
2854
2855 $color &= cf::NDI_COLOR_MASK;
2856
2857 utf8::encode $msg;
2858
2539 if (0 && $msg =~ /\[/) { 2859 if (0 && $msg =~ /\[/) {
2860 # COMMAND/INFO
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 2861 $self->send_packet ("drawextinfo $color 10 8 $msg")
2541 } else { 2862 } else {
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2863 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg") 2864 $self->send_packet ("drawinfo $color $msg")
2544 } 2865 }
2545 } 2866 }
2546 } 2867 }
2547} 2868}
2548 2869
2549=item $client->ext_event ($type, %msg) 2870=item $client->ext_msg ($type, @msg)
2550 2871
2551Sends an ext event to the client. 2872Sends an ext event to the client.
2552 2873
2553=cut 2874=cut
2554 2875
2555sub cf::client::ext_event($$%) { 2876sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 2877 my ($self, $type, @msg) = @_;
2557 2878
2558 return unless $self->extcmd; 2879 if ($self->extcmd == 2) {
2559 2880 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2881 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 2882 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2883 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2884 }
2885}
2886
2887=item $client->ext_reply ($msgid, @msg)
2888
2889Sends an ext reply to the client.
2890
2891=cut
2892
2893sub cf::client::ext_reply($$@) {
2894 my ($self, $id, @msg) = @_;
2895
2896 if ($self->extcmd == 2) {
2897 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2898 } elsif ($self->extcmd == 1) {
2899 #TODO: version 1, remove
2900 unshift @msg, msgtype => "reply", msgid => $id;
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2902 }
2562} 2903}
2563 2904
2564=item $success = $client->query ($flags, "text", \&cb) 2905=item $success = $client->query ($flags, "text", \&cb)
2565 2906
2566Queues a query to the client, calling the given callback with 2907Queues a query to the client, calling the given callback with
2621 my ($ns, $buf) = @_; 2962 my ($ns, $buf) = @_;
2622 2963
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2964 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 2965
2625 if (ref $msg) { 2966 if (ref $msg) {
2967 my ($type, $reply, @payload) =
2968 "ARRAY" eq ref $msg
2969 ? @$msg
2970 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2971
2972 my @reply;
2973
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2974 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 2975 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 2976 }
2977
2978 $ns->ext_reply ($reply, @reply)
2979 if $reply;
2980
2632 } else { 2981 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2982 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 2983 }
2635 2984
2636 cf::override; 2985 cf::override;
2683our $safe = new Safe "safe"; 3032our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3033our $safe_hole = new Safe::Hole;
2685 3034
2686$SIG{FPE} = 'IGNORE'; 3035$SIG{FPE} = 'IGNORE';
2687 3036
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3037$safe->permit_only (Opcode::opset qw(
3038 :base_core :base_mem :base_orig :base_math
3039 grepstart grepwhile mapstart mapwhile
3040 sort time
3041));
2689 3042
2690# here we export the classes and methods available to script code 3043# here we export the classes and methods available to script code
2691 3044
2692=pod 3045=pod
2693 3046
2694The following functions and methods are available within a safe environment: 3047The following functions and methods are available within a safe environment:
2695 3048
2696 cf::object 3049 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3050 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3051 insert remove name archname title slaying race decrease split
2699 3052
2700 cf::object::player 3053 cf::object::player
2701 player 3054 player
2702 3055
2703 cf::player 3056 cf::player
2708 3061
2709=cut 3062=cut
2710 3063
2711for ( 3064for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3065 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)], 3066 insert remove inv nrof name archname title slaying race
3067 decrease split destroy change_exp)],
2714 ["cf::object::player" => qw(player)], 3068 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3069 ["cf::player" => qw(peaceful)],
2716 ["cf::map" => qw(trigger)], 3070 ["cf::map" => qw(trigger)],
2717) { 3071) {
2718 no strict 'refs'; 3072 no strict 'refs';
2794# the server's init and main functions 3148# the server's init and main functions
2795 3149
2796sub load_facedata($) { 3150sub load_facedata($) {
2797 my ($path) = @_; 3151 my ($path) = @_;
2798 3152
3153 # HACK to clear player env face cache, we need some signal framework
3154 # for this (global event?)
3155 %ext::player_env::MUSIC_FACE_CACHE = ();
3156
3157 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3158
2799 warn "loading facedata from $path\n"; 3159 warn "loading facedata from $path\n";
2800 3160
2801 my $facedata; 3161 my $facedata;
2802 0 < aio_load $path, $facedata 3162 0 < aio_load $path, $facedata
2803 or die "$path: $!"; 3163 or die "$path: $!";
2805 $facedata = Coro::Storable::thaw $facedata; 3165 $facedata = Coro::Storable::thaw $facedata;
2806 3166
2807 $facedata->{version} == 2 3167 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3168 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 3169
3170 # patch in the exptable
3171 $facedata->{resource}{"res/exp_table"} = {
3172 type => FT_RSRC,
3173 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3174 };
3175 cf::cede_to_tick;
3176
2810 { 3177 {
2811 my $faces = $facedata->{faceinfo}; 3178 my $faces = $facedata->{faceinfo};
2812 3179
2813 while (my ($face, $info) = each %$faces) { 3180 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3181 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3182
2815 cf::face::set_visibility $idx, $info->{visibility}; 3183 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3184 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3185 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3186 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2819 3187
2820 cf::cede_to_tick; 3188 cf::cede_to_tick;
2821 } 3189 }
2822 3190
2823 while (my ($face, $info) = each %$faces) { 3191 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3192 next unless $info->{smooth};
3193
2825 my $idx = cf::face::find $face 3194 my $idx = cf::face::find $face
2826 or next; 3195 or next;
3196
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3197 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3198 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3199 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3200 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3201 warn "smooth face '$info->{smooth}' not found for face '$face'";
2848 3218
2849 { 3219 {
2850 # TODO: for gcfclient pleasure, we should give resources 3220 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index. 3221 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3222 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3223
2855 while (my ($name, $info) = each %$res) { 3224 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3225 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3226 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3227 my $data;
2863 3228
2864 if ($name =~ /\.jpg$/) { 3229 if ($info->{type} & 1) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3230 # prepend meta info
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3231
3232 my $meta = $enc->encode ({
3233 name => $name,
3234 %{ $info->{meta} || {} },
3235 });
3236
3237 $data = pack "(w/a*)*", $meta, $info->{data};
3238 } else {
3239 $data = $info->{data};
3240 }
3241
3242 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3243 cf::face::set_type $idx, $info->{type};
2867 } else { 3244 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3245 $RESOURCE{$name} = $info;
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3246 }
2874 3247
2875 cf::cede_to_tick; 3248 cf::cede_to_tick;
2876 } 3249 }
2877 } 3250 }
2878 3251
3252 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3253
2879 1 3254 1
2880} 3255}
2881 3256
3257cf::global->attach (on_resource_update => sub {
3258 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3259 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3260
3261 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3262 my $sound = $soundconf->{compat}[$_]
3263 or next;
3264
3265 my $face = cf::face::find "sound/$sound->[1]";
3266 cf::sound::set $sound->[0] => $face;
3267 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3268 }
3269
3270 while (my ($k, $v) = each %{$soundconf->{event}}) {
3271 my $face = cf::face::find "sound/$v";
3272 cf::sound::set $k => $face;
3273 }
3274 }
3275});
3276
3277register_exticmd fx_want => sub {
3278 my ($ns, $want) = @_;
3279
3280 while (my ($k, $v) = each %$want) {
3281 $ns->fx_want ($k, $v);
3282 }
3283};
3284
3285sub load_resource_file($) {
3286 my $guard = lock_acquire "load_resource_file";
3287
3288 my $status = load_resource_file_ $_[0];
3289 get_slot 0.1, 100;
3290 cf::arch::commit_load;
3291
3292 $status
3293}
3294
2882sub reload_regions { 3295sub reload_regions {
3296 # HACK to clear player env face cache, we need some signal framework
3297 # for this (global event?)
3298 %ext::player_env::MUSIC_FACE_CACHE = ();
3299
2883 load_resource_file "$MAPDIR/regions" 3300 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3301 or die "unable to load regions file\n";
2885 3302
2886 for (cf::region::list) { 3303 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3304 $_->{match} = qr/$_->{match}/
2895} 3312}
2896 3313
2897sub reload_archetypes { 3314sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes" 3315 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n"; 3316 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2903 load_resource_file "$DATADIR/archetypes"
2904 or die "unable to load archetypes\n";
2905} 3317}
2906 3318
2907sub reload_treasures { 3319sub reload_treasures {
2908 load_resource_file "$DATADIR/treasures" 3320 load_resource_file "$DATADIR/treasures"
2909 or die "unable to load treasurelists\n"; 3321 or die "unable to load treasurelists\n";
2910} 3322}
2911 3323
2912sub reload_resources { 3324sub reload_resources {
2913 warn "reloading resource files...\n"; 3325 warn "reloading resource files...\n";
2914 3326
3327 reload_facedata;
3328 reload_archetypes;
2915 reload_regions; 3329 reload_regions;
2916 reload_facedata;
2917 #reload_archetypes;#d#
2918 reload_archetypes;
2919 reload_treasures; 3330 reload_treasures;
2920 3331
2921 warn "finished reloading resource files\n"; 3332 warn "finished reloading resource files\n";
2922} 3333}
2923 3334
2924sub init { 3335sub init {
3336 my $guard = freeze_mainloop;
3337
3338 evthread_start IO::AIO::poll_fileno;
3339
2925 reload_resources; 3340 reload_resources;
2926} 3341}
2927 3342
2928sub cfg_load { 3343sub reload_config {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3344 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3345 or return;
2931 3346
2932 local $/; 3347 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3348 *CFG = YAML::Load <$fh>;
2934 3349
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3350 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2936 3351
2937 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3352 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2938 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3353 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2944 }; 3359 };
2945 warn $@ if $@; 3360 warn $@ if $@;
2946 } 3361 }
2947} 3362}
2948 3363
3364sub pidfile() {
3365 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3366 or die "$PIDFILE: $!";
3367 flock $fh, &Fcntl::LOCK_EX
3368 or die "$PIDFILE: flock: $!";
3369 $fh
3370}
3371
3372# make sure only one server instance is running at any one time
3373sub atomic {
3374 my $fh = pidfile;
3375
3376 my $pid = <$fh>;
3377 kill 9, $pid if $pid > 0;
3378
3379 seek $fh, 0, 0;
3380 print $fh $$;
3381}
3382
2949sub main { 3383sub main {
3384 atomic;
3385
2950 # we must not ever block the main coroutine 3386 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3387 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3388 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3389 (async {
2954 Event::one_event; 3390 $Coro::current->{desc} = "IDLE BUG HANDLER";
3391 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3392 })->prio (Coro::PRIO_MAX);
2956 }; 3393 };
2957 3394
2958 cfg_load; 3395 {
3396 my $guard = freeze_mainloop;
3397 reload_config;
2959 db_init; 3398 db_init;
2960 load_extensions; 3399 load_extensions;
2961 3400
2962 $TICK_WATCHER->start; 3401 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3402 }
3403
3404 utime time, time, $RUNTIMEFILE;
3405
3406 # no (long-running) fork's whatsoever before this point(!)
3407 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3408
2963 Event::loop; 3409 EV::loop;
2964} 3410}
2965 3411
2966############################################################################# 3412#############################################################################
2967# initialisation and cleanup 3413# initialisation and cleanup
2968 3414
2969# install some emergency cleanup handlers 3415# install some emergency cleanup handlers
2970BEGIN { 3416BEGIN {
3417 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3418 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3419 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3420 cf::cleanup "SIG$signal";
2979 },
2980 ); 3421 };
2981 } 3422 }
2982} 3423}
2983 3424
2984sub write_runtime { 3425sub write_runtime_sync {
2985 my $runtime = "$LOCALDIR/runtime";
2986
2987 # first touch the runtime file to show we are still running: 3426 # first touch the runtime file to show we are still running:
2988 # the fsync below can take a very very long time. 3427 # the fsync below can take a very very long time.
2989 3428
2990 IO::AIO::aio_utime $runtime, undef, undef; 3429 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2991 3430
2992 my $guard = cf::lock_acquire "write_runtime"; 3431 my $guard = cf::lock_acquire "write_runtime";
2993 3432
2994 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3433 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2995 or return; 3434 or return;
2996 3435
2997 my $value = $cf::RUNTIME + 90 + 10; 3436 my $value = $cf::RUNTIME + 90 + 10;
2998 # 10 is the runtime save interval, for a monotonic clock 3437 # 10 is the runtime save interval, for a monotonic clock
2999 # 60 allows for the watchdog to kill the server. 3438 # 60 allows for the watchdog to kill the server.
3009 aio_utime $fh, undef, undef; 3448 aio_utime $fh, undef, undef;
3010 3449
3011 close $fh 3450 close $fh
3012 or return; 3451 or return;
3013 3452
3014 aio_rename "$runtime~", $runtime 3453 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3015 and return; 3454 and return;
3016 3455
3017 warn "runtime file written.\n"; 3456 warn "runtime file written.\n";
3018 3457
3019 1 3458 1
3459}
3460
3461our $uuid_lock;
3462our $uuid_skip;
3463
3464sub write_uuid_sync($) {
3465 $uuid_skip ||= $_[0];
3466
3467 return if $uuid_lock;
3468 local $uuid_lock = 1;
3469
3470 my $uuid = "$LOCALDIR/uuid";
3471
3472 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3473 or return;
3474
3475 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3476 $uuid_skip = 0;
3477
3478 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3479 and return;
3480
3481 # always fsync - this file is important
3482 aio_fsync $fh
3483 and return;
3484
3485 close $fh
3486 or return;
3487
3488 aio_rename "$uuid~", $uuid
3489 and return;
3490
3491 warn "uuid file written ($value).\n";
3492
3493 1
3494
3495}
3496
3497sub write_uuid($$) {
3498 my ($skip, $sync) = @_;
3499
3500 $sync ? write_uuid_sync $skip
3501 : async { write_uuid_sync $skip };
3020} 3502}
3021 3503
3022sub emergency_save() { 3504sub emergency_save() {
3023 my $freeze_guard = cf::freeze_mainloop; 3505 my $freeze_guard = cf::freeze_mainloop;
3024 3506
3030 # and maps saved/destroyed asynchronously. 3512 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3513 warn "begin emergency player save\n";
3032 for my $login (keys %cf::PLAYER) { 3514 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3515 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3516 $pl->valid or next;
3517 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3518 $pl->save;
3036 } 3519 }
3037 warn "end emergency player save\n"; 3520 warn "end emergency player save\n";
3038 3521
3039 warn "begin emergency map save\n"; 3522 warn "begin emergency map save\n";
3045 warn "end emergency map save\n"; 3528 warn "end emergency map save\n";
3046 3529
3047 warn "begin emergency database checkpoint\n"; 3530 warn "begin emergency database checkpoint\n";
3048 BDB::db_env_txn_checkpoint $DB_ENV; 3531 BDB::db_env_txn_checkpoint $DB_ENV;
3049 warn "end emergency database checkpoint\n"; 3532 warn "end emergency database checkpoint\n";
3533
3534 warn "begin write uuid\n";
3535 write_uuid_sync 1;
3536 warn "end write uuid\n";
3050 }; 3537 };
3051 3538
3052 warn "leave emergency perl save\n"; 3539 warn "leave emergency perl save\n";
3053} 3540}
3054 3541
3055sub post_cleanup { 3542sub post_cleanup {
3056 my ($make_core) = @_; 3543 my ($make_core) = @_;
3057 3544
3058 warn Carp::longmess "post_cleanup backtrace" 3545 warn Carp::longmess "post_cleanup backtrace"
3059 if $make_core; 3546 if $make_core;
3547
3548 my $fh = pidfile;
3549 unlink $PIDFILE if <$fh> == $$;
3060} 3550}
3551
3552# a safer delete_package, copied from Symbol
3553sub clear_package($) {
3554 my $pkg = shift;
3555
3556 # expand to full symbol table name if needed
3557 unless ($pkg =~ /^main::.*::$/) {
3558 $pkg = "main$pkg" if $pkg =~ /^::/;
3559 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3560 $pkg .= '::' unless $pkg =~ /::$/;
3561 }
3562
3563 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3564 my $stem_symtab = *{$stem}{HASH};
3565
3566 defined $stem_symtab and exists $stem_symtab->{$leaf}
3567 or return;
3568
3569 # clear all symbols
3570 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3571 for my $name (keys %$leaf_symtab) {
3572 _gv_clear *{"$pkg$name"};
3573# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3574 }
3575 warn "cleared package #$pkg\n";#d#
3576}
3577
3578our $RELOAD; # how many times to reload
3061 3579
3062sub do_reload_perl() { 3580sub do_reload_perl() {
3063 # can/must only be called in main 3581 # can/must only be called in main
3064 if ($Coro::current != $Coro::main) { 3582 if ($Coro::current != $Coro::main) {
3065 warn "can only reload from main coroutine"; 3583 warn "can only reload from main coroutine";
3066 return; 3584 return;
3067 } 3585 }
3068 3586
3587 return if $RELOAD++;
3588
3589 while ($RELOAD) {
3069 warn "reloading..."; 3590 warn "reloading...";
3070 3591
3071 warn "entering sync_job"; 3592 warn "entering sync_job";
3072 3593
3073 cf::sync_job { 3594 cf::sync_job {
3074 cf::write_runtime; # external watchdog should not bark 3595 cf::write_runtime_sync; # external watchdog should not bark
3075 cf::emergency_save; 3596 cf::emergency_save;
3076 cf::write_runtime; # external watchdog should not bark 3597 cf::write_runtime_sync; # external watchdog should not bark
3077 3598
3078 warn "syncing database to disk"; 3599 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3600 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3601
3081 # if anything goes wrong in here, we should simply crash as we already saved 3602 # if anything goes wrong in here, we should simply crash as we already saved
3082 3603
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3604 warn "flushing outstanding aio requests";
3089 for (;;) {
3090 BDB::flush;
3091 IO::AIO::flush;
3092 Coro::cede;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3605 while (IO::AIO::nreqs || BDB::nreqs) {
3094 warn "iterate..."; 3606 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3095 }
3096
3097 ++$RELOAD;
3098
3099 warn "cancelling all extension coros";
3100 $_->cancel for values %EXT_CORO;
3101 %EXT_CORO = ();
3102
3103 warn "removing commands";
3104 %COMMAND = ();
3105
3106 warn "removing ext/exti commands";
3107 %EXTCMD = ();
3108 %EXTICMD = ();
3109
3110 warn "unloading/nuking all extensions";
3111 for my $pkg (@EXTS) {
3112 warn "... unloading $pkg";
3113
3114 if (my $cb = $pkg->can ("unload")) {
3115 eval {
3116 $cb->($pkg);
3117 1
3118 } or warn "$pkg unloaded, but with errors: $@";
3119 } 3607 }
3120 3608
3121 warn "... nuking $pkg"; 3609 warn "cancelling all extension coros";
3122 Symbol::delete_package $pkg; 3610 $_->cancel for values %EXT_CORO;
3123 } 3611 %EXT_CORO = ();
3124 3612
3125 warn "unloading all perl modules loaded from $LIBDIR"; 3613 warn "removing commands";
3126 while (my ($k, $v) = each %INC) { 3614 %COMMAND = ();
3127 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3128 3615
3616 warn "removing ext/exti commands";
3617 %EXTCMD = ();
3618 %EXTICMD = ();
3619
3620 warn "unloading/nuking all extensions";
3621 for my $pkg (@EXTS) {
3129 warn "... unloading $k"; 3622 warn "... unloading $pkg";
3130 delete $INC{$k};
3131 3623
3132 $k =~ s/\.pm$//;
3133 $k =~ s/\//::/g;
3134
3135 if (my $cb = $k->can ("unload_module")) { 3624 if (my $cb = $pkg->can ("unload")) {
3625 eval {
3136 $cb->(); 3626 $cb->($pkg);
3627 1
3628 } or warn "$pkg unloaded, but with errors: $@";
3629 }
3630
3631 warn "... clearing $pkg";
3632 clear_package $pkg;
3137 } 3633 }
3138 3634
3139 Symbol::delete_package $k; 3635 warn "unloading all perl modules loaded from $LIBDIR";
3636 while (my ($k, $v) = each %INC) {
3637 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3638
3639 warn "... unloading $k";
3640 delete $INC{$k};
3641
3642 $k =~ s/\.pm$//;
3643 $k =~ s/\//::/g;
3644
3645 if (my $cb = $k->can ("unload_module")) {
3646 $cb->();
3647 }
3648
3649 clear_package $k;
3140 } 3650 }
3141 3651
3142 warn "getting rid of safe::, as good as possible"; 3652 warn "getting rid of safe::, as good as possible";
3143 Symbol::delete_package "safe::$_" 3653 clear_package "safe::$_"
3144 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3654 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3145 3655
3146 warn "unloading cf.pm \"a bit\""; 3656 warn "unloading cf.pm \"a bit\"";
3147 delete $INC{"cf.pm"}; 3657 delete $INC{"cf.pm"};
3148 delete $INC{"cf/pod.pm"}; 3658 delete $INC{"cf/pod.pm"};
3149 3659
3150 # don't, removes xs symbols, too, 3660 # don't, removes xs symbols, too,
3151 # and global variables created in xs 3661 # and global variables created in xs
3152 #Symbol::delete_package __PACKAGE__; 3662 #clear_package __PACKAGE__;
3153 3663
3154 warn "unload completed, starting to reload now"; 3664 warn "unload completed, starting to reload now";
3155 3665
3156 warn "reloading cf.pm"; 3666 warn "reloading cf.pm";
3157 require cf; 3667 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3668 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3159 3669
3160 warn "loading config and database again"; 3670 warn "loading config and database again";
3161 cf::cfg_load; 3671 cf::reload_config;
3162 3672
3163 warn "loading extensions"; 3673 warn "loading extensions";
3164 cf::load_extensions; 3674 cf::load_extensions;
3165 3675
3166 warn "reattaching attachments to objects/players"; 3676 warn "reattaching attachments to objects/players";
3167 _global_reattach; # objects, sockets 3677 _global_reattach; # objects, sockets
3168 warn "reattaching attachments to maps"; 3678 warn "reattaching attachments to maps";
3169 reattach $_ for values %MAP; 3679 reattach $_ for values %MAP;
3170 warn "reattaching attachments to players"; 3680 warn "reattaching attachments to players";
3171 reattach $_ for values %PLAYER; 3681 reattach $_ for values %PLAYER;
3172 3682
3173 warn "leaving sync_job"; 3683 warn "leaving sync_job";
3174 3684
3175 1 3685 1
3176 } or do { 3686 } or do {
3177 warn $@; 3687 warn $@;
3178 warn "error while reloading, exiting."; 3688 cf::cleanup "error while reloading, exiting.";
3179 exit 1;
3180 }; 3689 };
3181 3690
3182 warn "reloaded"; 3691 warn "reloaded";
3692 --$RELOAD;
3693 }
3183}; 3694};
3184 3695
3185our $RELOAD_WATCHER; # used only during reload 3696our $RELOAD_WATCHER; # used only during reload
3186 3697
3187sub reload_perl() { 3698sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3699 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3700 # coro crashes during coro_state_free->destroy here.
3190 3701
3191 $RELOAD_WATCHER ||= Event->timer ( 3702 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3192 reentrant => 0,
3193 after => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => sub {
3196 do_reload_perl; 3703 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3704 undef $RELOAD_WATCHER;
3198 },
3199 ); 3705 };
3200} 3706}
3201 3707
3202register_command "reload" => sub { 3708register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3709 my ($who, $arg) = @_;
3204 3710
3205 if ($who->flag (FLAG_WIZ)) { 3711 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3712 $who->message ("reloading server.");
3713 async {
3714 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3715 reload_perl;
3716 };
3208 } 3717 }
3209}; 3718};
3210 3719
3211unshift @INC, $LIBDIR; 3720unshift @INC, $LIBDIR;
3212 3721
3214 3723
3215our @WAIT_FOR_TICK; 3724our @WAIT_FOR_TICK;
3216our @WAIT_FOR_TICK_BEGIN; 3725our @WAIT_FOR_TICK_BEGIN;
3217 3726
3218sub wait_for_tick { 3727sub wait_for_tick {
3219 return unless $TICK_WATCHER->is_active;
3220 return if $Coro::current == $Coro::main; 3728 return if tick_inhibit || $Coro::current == $Coro::main;
3221 3729
3222 my $signal = new Coro::Signal; 3730 my $signal = new Coro::Signal;
3223 push @WAIT_FOR_TICK, $signal; 3731 push @WAIT_FOR_TICK, $signal;
3224 $signal->wait; 3732 $signal->wait;
3225} 3733}
3226 3734
3227sub wait_for_tick_begin { 3735sub wait_for_tick_begin {
3228 return unless $TICK_WATCHER->is_active;
3229 return if $Coro::current == $Coro::main; 3736 return if tick_inhibit || $Coro::current == $Coro::main;
3230 3737
3231 my $signal = new Coro::Signal; 3738 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3739 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3740 $signal->wait;
3234} 3741}
3235 3742
3236 my $min = 1e6;#d# 3743sub tick {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3744 if ($Coro::current != $Coro::main) {
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3745 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 3746 unless ++$bug_warning > 10;
3248 return; 3747 return;
3249 } 3748 }
3250 3749
3251 $NOW = $tick_start = Event::time;
3252
3253 cf::server_tick; # one server iteration 3750 cf::server_tick; # one server iteration
3254 3751
3255 0 && sync_job {#d# 3752 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3256 for(1..10) { 3753 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3257 my $t = Event::time; 3754 Coro::async_pool {
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3755 $Coro::current->{desc} = "runtime saver";
3259 or die; 3756 write_runtime_sync
3260 3757 or warn "ERROR: unable to write runtime file: $!";
3261 $map->width (50);
3262 $map->height (50);
3263 $map->alloc;
3264 $map->_load_objects ("/tmp/x.map", 1);
3265 my $t = Event::time - $t;
3266
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3758 };
3759 }
3277 3760
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3761 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 3762 $sig->send;
3294 } 3763 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 3764 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 3765 $sig->send;
3297 } 3766 }
3298 3767
3299 $NOW = Event::time; 3768 $LOAD = ($NOW - $TICK_START) / $TICK;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3769 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 3770
3310 _post_tick; 3771 if (0) {
3311 3772 if ($NEXT_TICK) {
3312 3773 my $jitter = $TICK_START - $NEXT_TICK;
3774 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3775 warn "jitter $JITTER\n";#d#
3776 }
3313 }, 3777 }
3314); 3778}
3315 3779
3316{ 3780{
3317 BDB::max_poll_time $TICK * 0.1; 3781 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 3782
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 3783 BDB::min_parallel 8;
3327 3784 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 3785 $AnyEvent::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 3786
3343 unless ($DB_ENV) { 3787 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 3788 $DB_ENV = BDB::db_env_create;
3789 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3790 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3791 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3792 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3793 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 3794
3346 cf::sync_job { 3795 cf::sync_job {
3347 eval { 3796 eval {
3348 BDB::db_env_open 3797 BDB::db_env_open
3349 $DB_ENV, 3798 $DB_ENV,
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3800 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3801 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 3802 0666;
3354 3803
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3804 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 3805 };
3360 3806
3361 cf::cleanup "db_env_open(db): $@" if $@; 3807 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 3808 };
3363 } 3809 }
3810
3811 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3812 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3813 };
3814 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3815 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3816 };
3817 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3818 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3819 };
3364} 3820}
3365 3821
3366{ 3822{
3823 # configure IO::AIO
3824
3367 IO::AIO::min_parallel 8; 3825 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 3826 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 3827 undef $AnyEvent::AIO::WATCHER;
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 3828}
3380 3829
3381my $_log_backtrace; 3830my $_log_backtrace;
3382 3831
3383sub _log_backtrace { 3832sub _log_backtrace {
3386 $msg =~ s/\n//; 3835 $msg =~ s/\n//;
3387 3836
3388 # limit the # of concurrent backtraces 3837 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 3838 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 3839 ++$_log_backtrace;
3840 my $perl_bt = Carp::longmess $msg;
3391 async { 3841 async {
3842 $Coro::current->{desc} = "abt $msg";
3843
3392 my @bt = fork_call { 3844 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 3845 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3846 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3847 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 3848 or die "addr2line: $!";
3404 } 3856 }
3405 3857
3406 @funcs 3858 @funcs
3407 }; 3859 };
3408 3860
3409 LOG llevInfo, "[ABT] $msg\n"; 3861 LOG llevInfo, "[ABT] $perl_bt\n";
3862 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3410 LOG llevInfo, "[ABT] $_\n" for @bt; 3863 LOG llevInfo, "[ABT] $_\n" for @bt;
3411 --$_log_backtrace; 3864 --$_log_backtrace;
3412 }; 3865 };
3413 } else { 3866 } else {
3414 LOG llevInfo, "[ABT] $msg\n"; 3867 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines