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.320 by root, Tue Jul 24 22:49:40 2007 UTC vs.
Revision 1.447 by root, Fri Sep 19 01:39:45 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";
660 730
661############################################################################# 731#############################################################################
662 732
663=head2 ATTACHABLE OBJECTS 733=head2 ATTACHABLE OBJECTS
664 734
665Many objects in crossfire are so-called attachable objects. That means you can 735Many objects in deliantra are so-called attachable objects. That means you can
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
720=item cf::CLASS::attachment $name, ... 790=item cf::CLASS::attachment $name, ...
721 791
722Register an attachment by C<$name> through which attachable objects of the 792Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 793given CLASS can refer to this attachment.
724 794
725Some classes such as crossfire maps and objects can specify attachments 795Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 796that are attached at load/instantiate time, thus the need for a name.
727 797
728These calls expect any number of the following handler/hook descriptions: 798These calls expect any number of the following handler/hook descriptions:
729 799
730=over 4 800=over 4
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
1186 my ($type, $reply, @payload) = 1293 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1294 "ARRAY" eq ref $msg
1188 ? @$msg 1295 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1296 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1297
1298 my @reply;
1299
1191 if (my $cb = $EXTCMD{$type}) { 1300 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1301 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1302 }
1303
1304 $pl->ext_reply ($reply, @reply)
1305 if $reply;
1306
1197 } else { 1307 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1308 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1309 }
1200 1310
1201 cf::override; 1311 cf::override;
1228 1338
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1341
1232 $ext{source} = 1342 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1235 . $source 1345 . $source
1236 . "\n};\n1"; 1346 . "\n};\n1";
1237 1347
1238 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
1254 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1255 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1256 1366
1257 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1258 warn $msg; 1368 warn $msg;
1259 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1260 exit 1;
1261 } 1370 }
1262 1371
1263 warn $msg; 1372 warn $msg;
1264 } 1373 }
1265 1374
1279 1388
1280=back 1389=back
1281 1390
1282=head2 CORE EXTENSIONS 1391=head2 CORE EXTENSIONS
1283 1392
1284Functions and methods that extend core crossfire objects. 1393Functions and methods that extend core deliantra objects.
1285 1394
1286=cut 1395=cut
1287 1396
1288package cf::player; 1397package cf::player;
1289 1398
1290use Coro::AIO; 1399use Coro::AIO;
1291 1400
1292=head3 cf::player 1401=head3 cf::player
1293 1402
1294=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}
1295 1418
1296=item cf::player::find $login 1419=item cf::player::find $login
1297 1420
1298Returns the given player object, loading it if necessary (might block). 1421Returns the given player object, loading it if necessary (might block).
1299 1422
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1458 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1459 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1460 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1461 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1462
1340 my $pl = load_pl path $login 1463 my $f = new_from_file cf::object::thawer path $login
1341 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;
1342 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1343 } 1472 }
1344 } 1473 }
1345} 1474}
1346 1475
1355 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1356 1485
1357 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1359 1488
1489 cf::get_slot 0.01;
1490
1360 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1361 Coro::cede; 1492 cf::cede_to_tick;
1362} 1493}
1363 1494
1364sub new($) { 1495sub new($) {
1365 my ($login) = @_; 1496 my ($login) = @_;
1366 1497
1372 $cf::PLAYER{$login} = $self; 1503 $cf::PLAYER{$login} = $self;
1373 1504
1374 $self 1505 $self
1375} 1506}
1376 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
1377=item $pl->quit_character 1518=item $pl->quit_character
1378 1519
1379Nukes the player without looking back. If logged in, the connection will 1520Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1521be destroyed. May block for a long time.
1381 1522
1385 my ($pl) = @_; 1526 my ($pl) = @_;
1386 1527
1387 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1388 1529
1389 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1390 $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
1391 1532
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1396 1539
1397 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
1434 or return []; 1577 or return [];
1435 1578
1436 my @logins; 1579 my @logins;
1437 1580
1438 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") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1590 }
1442 1591
1443 utf8::decode $login; 1592 utf8::decode $login;
1444 push @logins, $login; 1593 push @logins, $login;
1445 } 1594 }
1446 1595
1473 } 1622 }
1474 1623
1475 \@paths 1624 \@paths
1476} 1625}
1477 1626
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1628
1480Expand crossfire pod fragments into protocol xml. 1629Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1630
1528=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1529 1632
1530Sends an ext reply to the player. 1633Sends an ext reply to the player.
1531 1634
1532=cut 1635=cut
1533 1636
1534sub ext_reply($$@) { 1637sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1638 my ($self, $id, @msg) = @_;
1536 1639
1537 if ($self->ns->extcmd == 2) { 1640 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1641}
1545 1642
1546=item $player->ext_msg ($type, @msg) 1643=item $player->ext_msg ($type, @msg)
1547 1644
1548Sends an ext event to the client. 1645Sends an ext event to the client.
1604our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1606 1703
1607sub generate_random_map { 1704sub generate_random_map {
1608 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
1609 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1710 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1735 1835
1736# the temporary/swap location 1836# the temporary/swap location
1737sub save_path { 1837sub save_path {
1738 my ($self) = @_; 1838 my ($self) = @_;
1739 1839
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1742} 1842}
1743 1843
1744# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1745sub uniq_path { 1845sub uniq_path {
1746 my ($self) = @_; 1846 my ($self) = @_;
1747 1847
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1750} 1850}
1751 1851
1752# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1753# all maps in C++... 1853# all maps in C++...
1776 1876
1777sub load_header_from($) { 1877sub load_header_from($) {
1778 my ($self, $path) = @_; 1878 my ($self, $path) = @_;
1779 1879
1780 utf8::encode $path; 1880 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1881 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 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;
1786 1889
1787 $self->{load_path} = $path; 1890 $self->{load_path} = $path;
1788 1891
1789 1 1892 1
1790} 1893}
1844sub find { 1947sub find {
1845 my ($path, $origin) = @_; 1948 my ($path, $origin) = @_;
1846 1949
1847 $path = normalise $path, $origin && $origin->path; 1950 $path = normalise $path, $origin && $origin->path;
1848 1951
1952 cf::lock_wait "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1850 1954
1851 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1852 my $guard = cf::lock_acquire "map_find:$path"; 1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1853 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1854 or return; 1960 or return;
1855 1961
1856 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1857 1963
1859 or return; 1965 or return;
1860 1966
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1971 undef $guard1;
1864 $map->reset; 1972 $map->reset;
1865 undef $guard;
1866 return find $path; 1973 return find $path;
1867 } 1974 }
1868 1975
1869 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
1870 } 1977 }
1879 local $self->{deny_reset} = 1; # loading can take a long time 1986 local $self->{deny_reset} = 1; # loading can take a long time
1880 1987
1881 my $path = $self->{path}; 1988 my $path = $self->{path};
1882 1989
1883 { 1990 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 1991 my $guard = cf::lock_acquire "map_data:$path";
1885 1992
1993 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 1994 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 1995
1888 $self->in_memory (cf::MAP_LOADING); 1996 $self->in_memory (cf::MAP_LOADING);
1889 1997
1890 $self->alloc; 1998 $self->alloc;
1891 1999
1892 $self->pre_load; 2000 $self->pre_load;
1893 Coro::cede; 2001 cf::cede_to_tick;
1894 2002
2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2005 $self->_load_objects ($f)
1896 or return; 2006 or return;
1897 2007
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
1899 if delete $self->{load_original}; 2009 if delete $self->{load_original};
1900 2010
1901 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2012 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2013 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2015 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2016 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs;
2018 }
1906 } 2019 }
1907 } 2020 }
1908 2021
1909 Coro::cede; 2022 $f->resolve_delayed_derefs;
2023
2024 cf::cede_to_tick;
1910 # now do the right thing for maps 2025 # now do the right thing for maps
1911 $self->link_multipart_objects; 2026 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2027 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2028 unless $self->difficulty;
1914 Coro::cede; 2029 cf::cede_to_tick;
1915 2030
1916 unless ($self->{deny_activate}) { 2031 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2032 $self->decay_objects;
1918 $self->fix_auto_apply; 2033 $self->fix_auto_apply;
1919 $self->update_buttons; 2034 $self->update_buttons;
1920 Coro::cede; 2035 cf::cede_to_tick;
1921 $self->set_darkness_map; 2036 $self->set_darkness_map;
1922 Coro::cede; 2037 cf::cede_to_tick;
1923 $self->activate; 2038 $self->activate;
1924 } 2039 }
1925 2040
2041 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME);
2043
1926 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
1927 } 2045 }
1928 2046
1929 $self->post_load; 2047 $self->post_load;
1930} 2048}
1931 2049
1940 2058
1941 $self 2059 $self
1942} 2060}
1943 2061
1944# 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
1945sub load_diag { 2063sub load_neighbours {
1946 my ($map) = @_; 2064 my ($map) = @_;
1947 2065
1948 my @diag; # diagonal neighbours 2066 my @neigh; # diagonal neighbours
1949 2067
1950 for (0 .. 3) { 2068 for (0 .. 3) {
1951 my $neigh = $map->tile_path ($_) 2069 my $neigh = $map->tile_path ($_)
1952 or next; 2070 or next;
1953 $neigh = find $neigh, $map 2071 $neigh = find $neigh, $map
1954 or next; 2072 or next;
1955 $neigh->load; 2073 $neigh->load;
1956 2074
2075 push @neigh,
1957 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2076 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1958 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2077 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1959 } 2078 }
1960 2079
1961 for (@diag) { 2080 for (grep defined $_->[0], @neigh) {
2081 my ($path, $origin) = @$_;
1962 my $neigh = find @$_ 2082 my $neigh = find $path, $origin
1963 or next; 2083 or next;
1964 $neigh->load; 2084 $neigh->load;
1965 } 2085 }
1966} 2086}
1967 2087
1972} 2092}
1973 2093
1974sub do_load_sync { 2094sub do_load_sync {
1975 my ($map) = @_; 2095 my ($map) = @_;
1976 2096
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main;
2099
1977 cf::sync_job { $map->load }; 2100 cf::sync_job { $map->load };
1978} 2101}
1979 2102
1980our %MAP_PREFETCH; 2103our %MAP_PREFETCH;
1981our $MAP_PREFETCHER = undef; 2104our $MAP_PREFETCHER = undef;
1982 2105
1983sub find_async { 2106sub find_async {
1984 my ($path, $origin) = @_; 2107 my ($path, $origin, $load) = @_;
1985 2108
1986 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
1987 2110
1988 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
1989 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1990 } 2113 }
1991 2114
1992 undef $MAP_PREFETCH{$path}; 2115 $MAP_PREFETCH{$path} |= $load;
2116
1993 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2118 $Coro::current->{desc} = "map prefetcher";
2119
1994 while (%MAP_PREFETCH) { 2120 while (%MAP_PREFETCH) {
1995 for my $path (keys %MAP_PREFETCH) { 2121 while (my ($k, $v) = each %MAP_PREFETCH) {
1996 if (my $map = find $path) { 2122 if (my $map = find $k) {
1997 $map->load; 2123 $map->load if $v;
1998 } 2124 }
1999 2125
2000 delete $MAP_PREFETCH{$path}; 2126 delete $MAP_PREFETCH{$k};
2001 } 2127 }
2002 } 2128 }
2003 undef $MAP_PREFETCHER; 2129 undef $MAP_PREFETCHER;
2004 }; 2130 };
2005 $MAP_PREFETCHER->prio (6); 2131 $MAP_PREFETCHER->prio (6);
2008} 2134}
2009 2135
2010sub save { 2136sub save {
2011 my ($self) = @_; 2137 my ($self) = @_;
2012 2138
2013 my $lock = cf::lock_acquire "map_data:" . $self->path; 2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
2014 2140
2015 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
2016 2142
2017 return unless $self->dirty; 2143 return unless $self->dirty;
2018 2144
2024 return if $self->{deny_save}; 2150 return if $self->{deny_save};
2025 2151
2026 local $self->{last_access} = $self->last_access;#d# 2152 local $self->{last_access} = $self->last_access;#d#
2027 2153
2028 cf::async { 2154 cf::async {
2155 $Coro::current->{desc} = "map player save";
2029 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2030 }; 2157 };
2158
2159 cf::get_slot 0.02;
2031 2160
2032 if ($uniq) { 2161 if ($uniq) {
2033 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2034 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2035 } else { 2164 } else {
2041 my ($self) = @_; 2170 my ($self) = @_;
2042 2171
2043 # save first because save cedes 2172 # save first because save cedes
2044 $self->save; 2173 $self->save;
2045 2174
2046 my $lock = cf::lock_acquire "map_data:" . $self->path; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2047 2176
2048 return if $self->players; 2177 return if $self->players;
2049 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2050 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2051 2180
2181 $self->in_memory (cf::MAP_SWAPPED);
2182
2183 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP;
2052 $self->clear; 2185 $self->clear;
2053 $self->in_memory (cf::MAP_SWAPPED);
2054} 2186}
2055 2187
2056sub reset_at { 2188sub reset_at {
2057 my ($self) = @_; 2189 my ($self) = @_;
2058 2190
2090 if $uniq; 2222 if $uniq;
2091 } 2223 }
2092 2224
2093 delete $cf::MAP{$self->path}; 2225 delete $cf::MAP{$self->path};
2094 2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
2095 $self->clear; 2229 $self->clear;
2096
2097 $_->clear_links_to ($self) for values %cf::MAP;
2098 2230
2099 $self->unlink_save; 2231 $self->unlink_save;
2100 $self->destroy; 2232 $self->destroy;
2101} 2233}
2102 2234
2103my $nuke_counter = "aaaa"; 2235my $nuke_counter = "aaaa";
2104 2236
2105sub nuke { 2237sub nuke {
2106 my ($self) = @_; 2238 my ($self) = @_;
2107 2239
2240 {
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2108 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2109 2244
2110 $self->unlink_save; 2245 $self->unlink_save;
2111 2246
2112 bless $self, "cf::map"; 2247 bless $self, "cf::map";
2113 delete $self->{deny_reset}; 2248 delete $self->{deny_reset};
2114 $self->{deny_save} = 1; 2249 $self->{deny_save} = 1;
2115 $self->reset_timeout (1); 2250 $self->reset_timeout (1);
2116 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2117 2252
2118 $cf::MAP{$self->path} = $self; 2253 $cf::MAP{$self->path} = $self;
2254 }
2119 2255
2120 $self->reset; # polite request, might not happen 2256 $self->reset; # polite request, might not happen
2121} 2257}
2122 2258
2123=item $maps = cf::map::tmp_maps 2259=item $maps = cf::map::tmp_maps
2165 2301
2166sub unique_maps() { 2302sub unique_maps() {
2167 [ 2303 [
2168 map { 2304 map {
2169 utf8::decode $_; 2305 utf8::decode $_;
2170 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2171 ? normalise $_ 2309 : normalise $_
2172 : ()
2173 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2174 ] 2311 ]
2175} 2312}
2176 2313
2177package cf;
2178
2179=back 2314=back
2180 2315
2181=head3 cf::object 2316=head3 cf::object
2182 2317
2183=cut 2318=cut
2186 2321
2187=over 4 2322=over 4
2188 2323
2189=item $ob->inv_recursive 2324=item $ob->inv_recursive
2190 2325
2191Returns 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.
2192 2328
2193=cut 2329=cut
2194 2330
2195sub inv_recursive_; 2331sub inv_recursive_;
2196sub inv_recursive_ { 2332sub inv_recursive_ {
2199 2335
2200sub inv_recursive { 2336sub inv_recursive {
2201 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2202} 2338}
2203 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
2204package cf; 2368package cf;
2205 2369
2206=back 2370=back
2207 2371
2208=head3 cf::object::player 2372=head3 cf::object::player
2214Sends 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>
2215can 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
2216dialogue with the given NPC character. 2380dialogue with the given NPC character.
2217 2381
2218=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};
2219 2397
2220# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2221# with dialog boxes. 2399# with dialog boxes.
2222#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
2223sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2235 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2236 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2237 2415
2238 } else { 2416 } else {
2239 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2240 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2241 } 2419 }
2242 } 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 (@_);
2243} 2431}
2244 2432
2245=item $player_object->may ("access") 2433=item $player_object->may ("access")
2246 2434
2247Returns wether the given player is authorized to access resource "access" 2435Returns wether the given player is authorized to access resource "access"
2260 2448
2261=item $player_object->enter_link 2449=item $player_object->enter_link
2262 2450
2263Freezes 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}>).
2264 2452
2265The 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.
2266I<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.
2267 2457
2268Will never block. 2458Will never block.
2269 2459
2270=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2271 2461
2326 # use -1 or undef as default coordinates, not 0, 0 2516 # use -1 or undef as default coordinates, not 0, 0
2327 ($x, $y) = ($map->enter_x, $map->enter_y) 2517 ($x, $y) = ($map->enter_x, $map->enter_y)
2328 if $x <=0 && $y <= 0; 2518 if $x <=0 && $y <= 0;
2329 2519
2330 $map->load; 2520 $map->load;
2331 $map->load_diag; 2521 $map->load_neighbours;
2332 2522
2333 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2334 $self->activate_recursive; 2525 $self->activate_recursive;
2335 2526
2336 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2337 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2338} 2529}
2343her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2344that 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
2345the 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
2346be called at the end of this process. 2537be called at the end of this process.
2347 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
2348=cut 2542=cut
2349 2543
2350our $GOTOGEN; 2544our $GOTOGEN;
2351 2545
2352sub cf::object::player::goto { 2546sub cf::object::player::goto {
2356 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2357 2551
2358 $self->enter_link; 2552 $self->enter_link;
2359 2553
2360 (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
2361 my $map = eval { 2576 my $map = eval {
2362 my $map = cf::map::find $path; 2577 my $map = defined $path ? cf::map::find $path : undef;
2363 2578
2364 if ($map) { 2579 if ($map) {
2365 $map = $map->customise_for ($self); 2580 $map = $map->customise_for ($self);
2366 $map = $check->($map) if $check && $map; 2581 $map = $check->($map) if $check && $map;
2367 } else { 2582 } else {
2368 $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);
2369 } 2584 }
2370 2585
2371 $map 2586 $map
2372 }; 2587 };
2373 2588
2409} 2624}
2410 2625
2411sub prepare_random_map { 2626sub prepare_random_map {
2412 my ($exit) = @_; 2627 my ($exit) = @_;
2413 2628
2414 my $guard = cf::lock_acquire "exit_prepare:$exit";
2415
2416 # all this does is basically replace the /! path by 2629 # all this does is basically replace the /! path by
2417 # a new random map path (?random/...) with a seed 2630 # a new random map path (?random/...) with a seed
2418 # that depends on the exit object 2631 # that depends on the exit object
2419 2632
2420 my $rmp = parse_random_map_params $exit->msg; 2633 my $rmp = parse_random_map_params $exit->msg;
2422 if ($exit->map) { 2635 if ($exit->map) {
2423 $rmp->{region} = $exit->region->name; 2636 $rmp->{region} = $exit->region->name;
2424 $rmp->{origin_map} = $exit->map->path; 2637 $rmp->{origin_map} = $exit->map->path;
2425 $rmp->{origin_x} = $exit->x; 2638 $rmp->{origin_x} = $exit->x;
2426 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2640
2641 $exit->map->touch;
2427 } 2642 }
2428 2643
2429 $rmp->{random_seed} ||= $exit->random_seed; 2644 $rmp->{random_seed} ||= $exit->random_seed;
2430 2645
2431 my $data = cf::to_json $rmp; 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2432 my $md5 = Digest::MD5::md5_hex $data; 2647 my $md5 = Digest::MD5::md5_hex $data;
2433 my $meta = "$RANDOMDIR/$md5.meta"; 2648 my $meta = "$RANDOMDIR/$md5.meta";
2434 2649
2435 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2650 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2436 aio_write $fh, 0, (length $data), $data, 0; 2651 aio_write $fh, 0, (length $data), $data, 0;
2437 undef $fh; 2652 undef $fh;
2438 aio_rename "$meta~", $meta; 2653 aio_rename "$meta~", $meta;
2439 2654
2655 my $slaying = "?random/$md5";
2656
2657 if ($exit->valid) {
2440 $exit->slaying ("?random/$md5"); 2658 $exit->slaying ("?random/$md5");
2441 $exit->msg (undef); 2659 $exit->msg (undef);
2660 }
2442 } 2661 }
2443} 2662}
2444 2663
2445sub cf::object::player::enter_exit { 2664sub cf::object::player::enter_exit {
2446 my ($self, $exit) = @_; 2665 my ($self, $exit) = @_;
2447 2666
2448 return unless $self->type == cf::PLAYER; 2667 return unless $self->type == cf::PLAYER;
2449 2668
2450 if ($exit->slaying eq "/!") {
2451 #TODO: this should de-fi-ni-te-ly not be a sync-job
2452 # the problem is that $exit might not survive long enough
2453 # so it needs to be done right now, right here
2454 cf::sync_job { prepare_random_map $exit };
2455 }
2456
2457 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2458 my $hp = $exit->stats->hp;
2459 my $sp = $exit->stats->sp;
2460
2461 $self->enter_link; 2669 $self->enter_link;
2462 2670
2463 # if exit is damned, update players death & WoR home-position
2464 $self->contr->savebed ($slaying, $hp, $sp)
2465 if $exit->flag (FLAG_DAMNED);
2466
2467 (async { 2671 (async {
2468 $self->deactivate_recursive; # just to be sure 2672 $Coro::current->{desc} = "enter_exit";
2673
2469 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
2470 $self->goto ($slaying, $hp, $sp); 2689 $self->goto ($map, $x, $y);
2471 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
2472 1; 2695 1
2473 }) { 2696 }) {
2474 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the deliantra server. "
2475 . "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. "
2476 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2477 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
2478 2701
2479 warn "ERROR in enter_exit: $@"; 2702 warn "ERROR in enter_exit: $@";
2507the 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
2508the message unless the client supports the msg packet. 2731the message unless the client supports the msg packet.
2509 2732
2510=cut 2733=cut
2511 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
2512sub cf::client::send_msg { 2793sub cf::client::send_msg {
2513 my ($self, $channel, $msg, $color, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2514 2795
2515 $msg = $self->pl->expand_cfpod ($msg); 2796 $msg = $self->pl->expand_cfpod ($msg)
2797 unless $color & cf::NDI_VERBATIM;
2516 2798
2517 $color &= ~cf::NDI_UNIQUE; # just in case... 2799 $color &= cf::NDI_CLIENT_MASK; # just in case...
2518 2800
2801 # check predefined channels, for the benefit of C
2802 if ($CHANNEL{$channel}) {
2803 $channel = $CHANNEL{$channel};
2804
2805 $self->ext_msg (channel_info => $channel)
2806 if $self->can_msg;
2807
2808 $channel = $channel->{id};
2809
2519 if (ref $channel) { 2810 } elsif (ref $channel) {
2520 # send meta info to client, if not yet sent 2811 # send meta info to client, if not yet sent
2521 unless (exists $self->{channel}{$channel->{id}}) { 2812 unless (exists $self->{channel}{$channel->{id}}) {
2522 $self->{channel}{$channel->{id}} = $channel; 2813 $self->{channel}{$channel->{id}} = $channel;
2523 $self->ext_msg (channel_info => $channel); 2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2524 } 2816 }
2525 2817
2526 $channel = $channel->{id}; 2818 $channel = $channel->{id};
2527 } 2819 }
2528 2820
2529 return unless @extra || length $msg; 2821 return unless @extra || length $msg;
2530 2822
2531 if ($self->can_msg) { 2823 if ($self->can_msg) {
2532 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 2824 # default colour, mask it out
2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2826 if $color & cf::NDI_DEF;
2827
2828 my $pkt = "msg "
2829 . $self->{json_coder}->encode (
2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 );
2832
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt);
2533 } else { 2844 } else {
2534 # replace some tags by gcfclient-compatible ones
2535 for ($msg) {
2536 1 while
2537 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2538 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2539 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2540 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2541 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2542 }
2543
2544 if ($color >= 0) { 2845 if ($color >= 0) {
2846 # replace some tags by gcfclient-compatible ones
2847 for ($msg) {
2848 1 while
2849 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2850 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2851 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2852 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2853 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2854 }
2855
2856 $color &= cf::NDI_COLOR_MASK;
2857
2858 utf8::encode $msg;
2859
2545 if (0 && $msg =~ /\[/) { 2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2546 $self->send_packet ("drawextinfo $color 4 0 $msg") 2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2547 } else { 2863 } else {
2548 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2549 $self->send_packet ("drawinfo $color $msg") 2865 $self->send_packet ("drawinfo $color $msg")
2550 } 2866 }
2551 } 2867 }
2559=cut 2875=cut
2560 2876
2561sub cf::client::ext_msg($$@) { 2877sub cf::client::ext_msg($$@) {
2562 my ($self, $type, @msg) = @_; 2878 my ($self, $type, @msg) = @_;
2563 2879
2564 my $extcmd = $self->extcmd;
2565
2566 if ($extcmd == 2) { 2880 if ($self->extcmd == 2) {
2567 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2568 } elsif ($extcmd == 1) { # TODO: remove 2882 } elsif ($self->extcmd == 1) { # TODO: remove
2569 push @msg, msgtype => "event_$type"; 2883 push @msg, msgtype => "event_$type";
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2885 }
2886}
2887
2888=item $client->ext_reply ($msgid, @msg)
2889
2890Sends an ext reply to the client.
2891
2892=cut
2893
2894sub cf::client::ext_reply($$@) {
2895 my ($self, $id, @msg) = @_;
2896
2897 if ($self->extcmd == 2) {
2898 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2899 } elsif ($self->extcmd == 1) {
2900 #TODO: version 1, remove
2901 unshift @msg, msgtype => "reply", msgid => $id;
2570 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2902 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2571 } 2903 }
2572} 2904}
2573 2905
2574=item $success = $client->query ($flags, "text", \&cb) 2906=item $success = $client->query ($flags, "text", \&cb)
2636 my ($type, $reply, @payload) = 2968 my ($type, $reply, @payload) =
2637 "ARRAY" eq ref $msg 2969 "ARRAY" eq ref $msg
2638 ? @$msg 2970 ? @$msg
2639 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 2971 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2640 2972
2973 my @reply;
2974
2641 if (my $cb = $EXTICMD{$type}) { 2975 if (my $cb = $EXTICMD{$type}) {
2642 my @reply = $cb->($ns, @payload); 2976 @reply = $cb->($ns, @payload);
2643
2644 $ns->ext_reply ($reply, @reply)
2645 if $reply;
2646 } 2977 }
2978
2979 $ns->ext_reply ($reply, @reply)
2980 if $reply;
2981
2647 } else { 2982 } else {
2648 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2983 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2649 } 2984 }
2650 2985
2651 cf::override; 2986 cf::override;
2698our $safe = new Safe "safe"; 3033our $safe = new Safe "safe";
2699our $safe_hole = new Safe::Hole; 3034our $safe_hole = new Safe::Hole;
2700 3035
2701$SIG{FPE} = 'IGNORE'; 3036$SIG{FPE} = 'IGNORE';
2702 3037
2703$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3038$safe->permit_only (Opcode::opset qw(
3039 :base_core :base_mem :base_orig :base_math
3040 grepstart grepwhile mapstart mapwhile
3041 sort time
3042));
2704 3043
2705# here we export the classes and methods available to script code 3044# here we export the classes and methods available to script code
2706 3045
2707=pod 3046=pod
2708 3047
2709The following functions and methods are available within a safe environment: 3048The following functions and methods are available within a safe environment:
2710 3049
2711 cf::object 3050 cf::object
2712 contr pay_amount pay_player map x y force_find force_add 3051 contr pay_amount pay_player map x y force_find force_add destroy
2713 insert remove 3052 insert remove name archname title slaying race decrease split
2714 3053
2715 cf::object::player 3054 cf::object::player
2716 player 3055 player
2717 3056
2718 cf::player 3057 cf::player
2723 3062
2724=cut 3063=cut
2725 3064
2726for ( 3065for (
2727 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2728 insert remove)], 3067 insert remove inv nrof name archname title slaying race
3068 decrease split destroy change_exp)],
2729 ["cf::object::player" => qw(player)], 3069 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3070 ["cf::player" => qw(peaceful)],
2731 ["cf::map" => qw(trigger)], 3071 ["cf::map" => qw(trigger)],
2732) { 3072) {
2733 no strict 'refs'; 3073 no strict 'refs';
2809# the server's init and main functions 3149# the server's init and main functions
2810 3150
2811sub load_facedata($) { 3151sub load_facedata($) {
2812 my ($path) = @_; 3152 my ($path) = @_;
2813 3153
3154 # HACK to clear player env face cache, we need some signal framework
3155 # for this (global event?)
3156 %ext::player_env::MUSIC_FACE_CACHE = ();
3157
3158 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3159
2814 warn "loading facedata from $path\n"; 3160 warn "loading facedata from $path\n";
2815 3161
2816 my $facedata; 3162 my $facedata;
2817 0 < aio_load $path, $facedata 3163 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3164 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3166 $facedata = Coro::Storable::thaw $facedata;
2821 3167
2822 $facedata->{version} == 2 3168 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3169 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3170
3171 # patch in the exptable
3172 $facedata->{resource}{"res/exp_table"} = {
3173 type => FT_RSRC,
3174 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3175 };
3176 cf::cede_to_tick;
3177
2825 { 3178 {
2826 my $faces = $facedata->{faceinfo}; 3179 my $faces = $facedata->{faceinfo};
2827 3180
2828 while (my ($face, $info) = each %$faces) { 3181 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3182 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183
2830 cf::face::set_visibility $idx, $info->{visibility}; 3184 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3185 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3188
2835 cf::cede_to_tick; 3189 cf::cede_to_tick;
2836 } 3190 }
2837 3191
2838 while (my ($face, $info) = each %$faces) { 3192 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3193 next unless $info->{smooth};
3194
2840 my $idx = cf::face::find $face 3195 my $idx = cf::face::find $face
2841 or next; 3196 or next;
3197
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3198 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3199 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3201 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3202 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3219
2864 { 3220 {
2865 # TODO: for gcfclient pleasure, we should give resources 3221 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3222 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3223 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 if (my $soundconf = delete $res->{"res/sound.conf"}) {
2871 $soundconf = $enc->decode (delete $soundconf->{data});
2872 # todo
2873 }
2874 3224
2875 while (my ($name, $info) = each %$res) { 3225 while (my ($name, $info) = each %$res) {
2876 my $meta = $enc->encode ({ 3226 if (defined $info->{type}) {
2877 name => $name,
2878 %{ $info->{meta} || {} },
2879 });
2880
2881 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3227 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3228 my $data;
2882 3229
2883 if ($info->{type} & 1) { 3230 if ($info->{type} & 1) {
2884 # prepend meta info 3231 # prepend meta info
2885 3232
3233 my $meta = $enc->encode ({
3234 name => $name,
3235 %{ $info->{meta} || {} },
3236 });
3237
2886 my $data = pack "(w/a*)*", $meta, $info->{data}; 3238 $data = pack "(w/a*)*", $meta, $info->{data};
2887 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3239 } else {
3240 $data = $info->{data};
3241 }
2888 3242
2889 cf::face::set_data $idx, 0, $data, $chk; 3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type};
2890 } else { 3245 } else {
2891 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3246 $RESOURCE{$name} = $info;
2892 } 3247 }
2893 3248
2894 cf::face::set_type $idx, $info->{type};
2895
2896 cf::cede_to_tick; 3249 cf::cede_to_tick;
2897 } 3250 }
2898 } 3251 }
2899 3252
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3254
2900 1 3255 1
2901} 3256}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
2902 3277
2903register_exticmd fx_want => sub { 3278register_exticmd fx_want => sub {
2904 my ($ns, $want) = @_; 3279 my ($ns, $want) = @_;
2905 3280
2906 while (my ($k, $v) = each %$want) { 3281 while (my ($k, $v) = each %$want) {
2907 $ns->fx_want ($k, $v); 3282 $ns->fx_want ($k, $v);
2908 } 3283 }
2909}; 3284};
2910 3285
3286sub load_resource_file($) {
3287 my $guard = lock_acquire "load_resource_file";
3288
3289 my $status = load_resource_file_ $_[0];
3290 get_slot 0.1, 100;
3291 cf::arch::commit_load;
3292
3293 $status
3294}
3295
2911sub reload_regions { 3296sub reload_regions {
3297 # HACK to clear player env face cache, we need some signal framework
3298 # for this (global event?)
3299 %ext::player_env::MUSIC_FACE_CACHE = ();
3300
2912 load_resource_file "$MAPDIR/regions" 3301 load_resource_file "$MAPDIR/regions"
2913 or die "unable to load regions file\n"; 3302 or die "unable to load regions file\n";
2914 3303
2915 for (cf::region::list) { 3304 for (cf::region::list) {
2916 $_->{match} = qr/$_->{match}/ 3305 $_->{match} = qr/$_->{match}/
2924} 3313}
2925 3314
2926sub reload_archetypes { 3315sub reload_archetypes {
2927 load_resource_file "$DATADIR/archetypes" 3316 load_resource_file "$DATADIR/archetypes"
2928 or die "unable to load archetypes\n"; 3317 or die "unable to load archetypes\n";
2929 #d# NEED to laod twice to resolve forward references
2930 # this really needs to be done in an extra post-pass
2931 # (which needs to be synchronous, so solve it differently)
2932 load_resource_file "$DATADIR/archetypes"
2933 or die "unable to load archetypes\n";
2934} 3318}
2935 3319
2936sub reload_treasures { 3320sub reload_treasures {
2937 load_resource_file "$DATADIR/treasures" 3321 load_resource_file "$DATADIR/treasures"
2938 or die "unable to load treasurelists\n"; 3322 or die "unable to load treasurelists\n";
2939} 3323}
2940 3324
2941sub reload_resources { 3325sub reload_resources {
2942 warn "reloading resource files...\n"; 3326 warn "reloading resource files...\n";
2943 3327
3328 reload_facedata;
3329 reload_archetypes;
2944 reload_regions; 3330 reload_regions;
2945 reload_facedata;
2946 #reload_archetypes;#d#
2947 reload_archetypes;
2948 reload_treasures; 3331 reload_treasures;
2949 3332
2950 warn "finished reloading resource files\n"; 3333 warn "finished reloading resource files\n";
2951} 3334}
2952 3335
2953sub init { 3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
2954 reload_resources; 3341 reload_resources;
2955} 3342}
2956 3343
2957sub cfg_load { 3344sub reload_config {
2958 open my $fh, "<:utf8", "$CONFDIR/config" 3345 open my $fh, "<:utf8", "$CONFDIR/config"
2959 or return; 3346 or return;
2960 3347
2961 local $/; 3348 local $/;
2962 *CFG = YAML::Syck::Load <$fh>; 3349 *CFG = YAML::Load <$fh>;
2963 3350
2964 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2965 3352
2966 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2967 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2973 }; 3360 };
2974 warn $@ if $@; 3361 warn $@ if $@;
2975 } 3362 }
2976} 3363}
2977 3364
3365sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!";
3368 flock $fh, &Fcntl::LOCK_EX
3369 or die "$PIDFILE: flock: $!";
3370 $fh
3371}
3372
3373# make sure only one server instance is running at any one time
3374sub atomic {
3375 my $fh = pidfile;
3376
3377 my $pid = <$fh>;
3378 kill 9, $pid if $pid > 0;
3379
3380 seek $fh, 0, 0;
3381 print $fh $$;
3382}
3383
2978sub main { 3384sub main {
3385 atomic;
3386
2979 # we must not ever block the main coroutine 3387 # we must not ever block the main coroutine
2980 local $Coro::idle = sub { 3388 local $Coro::idle = sub {
2981 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2982 (async { 3390 (async {
2983 Event::one_event; 3391 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT;
2984 })->prio (Coro::PRIO_MAX); 3393 })->prio (Coro::PRIO_MAX);
2985 }; 3394 };
2986 3395
2987 cfg_load; 3396 {
3397 my $guard = freeze_mainloop;
3398 reload_config;
2988 db_init; 3399 db_init;
2989 load_extensions; 3400 load_extensions;
2990 3401
2991 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE;
3406
3407 # no (long-running) fork's whatsoever before this point(!)
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409
2992 Event::loop; 3410 EV::loop;
2993} 3411}
2994 3412
2995############################################################################# 3413#############################################################################
2996# initialisation and cleanup 3414# initialisation and cleanup
2997 3415
2998# install some emergency cleanup handlers 3416# install some emergency cleanup handlers
2999BEGIN { 3417BEGIN {
3418 our %SIGWATCHER = ();
3000 for my $signal (qw(INT HUP TERM)) { 3419 for my $signal (qw(INT HUP TERM)) {
3001 Event->signal ( 3420 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3002 reentrant => 0,
3003 data => WF_AUTOCANCEL,
3004 signal => $signal,
3005 prio => 0,
3006 cb => sub {
3007 cf::cleanup "SIG$signal"; 3421 cf::cleanup "SIG$signal";
3008 },
3009 ); 3422 };
3010 } 3423 }
3011} 3424}
3012 3425
3013sub write_runtime { 3426sub write_runtime_sync {
3014 my $runtime = "$LOCALDIR/runtime";
3015
3016 # first touch the runtime file to show we are still running: 3427 # first touch the runtime file to show we are still running:
3017 # the fsync below can take a very very long time. 3428 # the fsync below can take a very very long time.
3018 3429
3019 IO::AIO::aio_utime $runtime, undef, undef; 3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3020 3431
3021 my $guard = cf::lock_acquire "write_runtime"; 3432 my $guard = cf::lock_acquire "write_runtime";
3022 3433
3023 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3024 or return; 3435 or return;
3025 3436
3026 my $value = $cf::RUNTIME + 90 + 10; 3437 my $value = $cf::RUNTIME + 90 + 10;
3027 # 10 is the runtime save interval, for a monotonic clock 3438 # 10 is the runtime save interval, for a monotonic clock
3028 # 60 allows for the watchdog to kill the server. 3439 # 60 allows for the watchdog to kill the server.
3038 aio_utime $fh, undef, undef; 3449 aio_utime $fh, undef, undef;
3039 3450
3040 close $fh 3451 close $fh
3041 or return; 3452 or return;
3042 3453
3043 aio_rename "$runtime~", $runtime 3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3044 and return; 3455 and return;
3045 3456
3046 warn "runtime file written.\n"; 3457 warn "runtime file written.\n";
3047 3458
3048 1 3459 1
3460}
3461
3462our $uuid_lock;
3463our $uuid_skip;
3464
3465sub write_uuid_sync($) {
3466 $uuid_skip ||= $_[0];
3467
3468 return if $uuid_lock;
3469 local $uuid_lock = 1;
3470
3471 my $uuid = "$LOCALDIR/uuid";
3472
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return;
3475
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3477 $uuid_skip = 0;
3478
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return;
3481
3482 # always fsync - this file is important
3483 aio_fsync $fh
3484 and return;
3485
3486 close $fh
3487 or return;
3488
3489 aio_rename "$uuid~", $uuid
3490 and return;
3491
3492 warn "uuid file written ($value).\n";
3493
3494 1
3495
3496}
3497
3498sub write_uuid($$) {
3499 my ($skip, $sync) = @_;
3500
3501 $sync ? write_uuid_sync $skip
3502 : async { write_uuid_sync $skip };
3049} 3503}
3050 3504
3051sub emergency_save() { 3505sub emergency_save() {
3052 my $freeze_guard = cf::freeze_mainloop; 3506 my $freeze_guard = cf::freeze_mainloop;
3053 3507
3059 # and maps saved/destroyed asynchronously. 3513 # and maps saved/destroyed asynchronously.
3060 warn "begin emergency player save\n"; 3514 warn "begin emergency player save\n";
3061 for my $login (keys %cf::PLAYER) { 3515 for my $login (keys %cf::PLAYER) {
3062 my $pl = $cf::PLAYER{$login} or next; 3516 my $pl = $cf::PLAYER{$login} or next;
3063 $pl->valid or next; 3517 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3064 $pl->save; 3519 $pl->save;
3065 } 3520 }
3066 warn "end emergency player save\n"; 3521 warn "end emergency player save\n";
3067 3522
3068 warn "begin emergency map save\n"; 3523 warn "begin emergency map save\n";
3074 warn "end emergency map save\n"; 3529 warn "end emergency map save\n";
3075 3530
3076 warn "begin emergency database checkpoint\n"; 3531 warn "begin emergency database checkpoint\n";
3077 BDB::db_env_txn_checkpoint $DB_ENV; 3532 BDB::db_env_txn_checkpoint $DB_ENV;
3078 warn "end emergency database checkpoint\n"; 3533 warn "end emergency database checkpoint\n";
3534
3535 warn "begin write uuid\n";
3536 write_uuid_sync 1;
3537 warn "end write uuid\n";
3079 }; 3538 };
3080 3539
3081 warn "leave emergency perl save\n"; 3540 warn "leave emergency perl save\n";
3082} 3541}
3083 3542
3084sub post_cleanup { 3543sub post_cleanup {
3085 my ($make_core) = @_; 3544 my ($make_core) = @_;
3086 3545
3087 warn Carp::longmess "post_cleanup backtrace" 3546 warn Carp::longmess "post_cleanup backtrace"
3088 if $make_core; 3547 if $make_core;
3548
3549 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$;
3089} 3551}
3552
3553# a safer delete_package, copied from Symbol
3554sub clear_package($) {
3555 my $pkg = shift;
3556
3557 # expand to full symbol table name if needed
3558 unless ($pkg =~ /^main::.*::$/) {
3559 $pkg = "main$pkg" if $pkg =~ /^::/;
3560 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3561 $pkg .= '::' unless $pkg =~ /::$/;
3562 }
3563
3564 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3565 my $stem_symtab = *{$stem}{HASH};
3566
3567 defined $stem_symtab and exists $stem_symtab->{$leaf}
3568 or return;
3569
3570 # clear all symbols
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 }
3576 warn "cleared package #$pkg\n";#d#
3577}
3578
3579our $RELOAD; # how many times to reload
3090 3580
3091sub do_reload_perl() { 3581sub do_reload_perl() {
3092 # can/must only be called in main 3582 # can/must only be called in main
3093 if ($Coro::current != $Coro::main) { 3583 if ($Coro::current != $Coro::main) {
3094 warn "can only reload from main coroutine"; 3584 warn "can only reload from main coroutine";
3095 return; 3585 return;
3096 } 3586 }
3097 3587
3588 return if $RELOAD++;
3589
3590 while ($RELOAD) {
3098 warn "reloading..."; 3591 warn "reloading...";
3099 3592
3100 warn "entering sync_job"; 3593 warn "entering sync_job";
3101 3594
3102 cf::sync_job { 3595 cf::sync_job {
3103 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3104 cf::emergency_save; 3597 cf::emergency_save;
3105 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3106 3599
3107 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3108 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3109 3602
3110 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
3111 3604
3112 warn "cancelling all WF_AUTOCANCEL watchers";
3113 for (Event::all_watchers) {
3114 $_->cancel if $_->data & WF_AUTOCANCEL;
3115 }
3116
3117 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
3118 for (;;) {
3119 BDB::flush;
3120 IO::AIO::flush;
3121 Coro::cede;
3122 last unless IO::AIO::nreqs || BDB::nreqs; 3606 while (IO::AIO::nreqs || BDB::nreqs) {
3123 warn "iterate..."; 3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3124 }
3125
3126 ++$RELOAD;
3127
3128 warn "cancelling all extension coros";
3129 $_->cancel for values %EXT_CORO;
3130 %EXT_CORO = ();
3131
3132 warn "removing commands";
3133 %COMMAND = ();
3134
3135 warn "removing ext/exti commands";
3136 %EXTCMD = ();
3137 %EXTICMD = ();
3138
3139 warn "unloading/nuking all extensions";
3140 for my $pkg (@EXTS) {
3141 warn "... unloading $pkg";
3142
3143 if (my $cb = $pkg->can ("unload")) {
3144 eval {
3145 $cb->($pkg);
3146 1
3147 } or warn "$pkg unloaded, but with errors: $@";
3148 } 3608 }
3149 3609
3150 warn "... nuking $pkg"; 3610 warn "cancelling all extension coros";
3151 Symbol::delete_package $pkg; 3611 $_->cancel for values %EXT_CORO;
3152 } 3612 %EXT_CORO = ();
3153 3613
3154 warn "unloading all perl modules loaded from $LIBDIR"; 3614 warn "removing commands";
3155 while (my ($k, $v) = each %INC) { 3615 %COMMAND = ();
3156 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3157 3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3158 warn "... unloading $k"; 3623 warn "... unloading $pkg";
3159 delete $INC{$k};
3160 3624
3161 $k =~ s/\.pm$//;
3162 $k =~ s/\//::/g;
3163
3164 if (my $cb = $k->can ("unload_module")) { 3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3165 $cb->(); 3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 }
3631
3632 warn "... clearing $pkg";
3633 clear_package $pkg;
3166 } 3634 }
3167 3635
3168 Symbol::delete_package $k; 3636 warn "unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639
3640 warn "... unloading $k";
3641 delete $INC{$k};
3642
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) {
3647 $cb->();
3648 }
3649
3650 clear_package $k;
3169 } 3651 }
3170 3652
3171 warn "getting rid of safe::, as good as possible"; 3653 warn "getting rid of safe::, as good as possible";
3172 Symbol::delete_package "safe::$_" 3654 clear_package "safe::$_"
3173 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3174 3656
3175 warn "unloading cf.pm \"a bit\""; 3657 warn "unloading cf.pm \"a bit\"";
3176 delete $INC{"cf.pm"}; 3658 delete $INC{"cf.pm"};
3177 delete $INC{"cf/pod.pm"}; 3659 delete $INC{"cf/pod.pm"};
3178 3660
3179 # don't, removes xs symbols, too, 3661 # don't, removes xs symbols, too,
3180 # and global variables created in xs 3662 # and global variables created in xs
3181 #Symbol::delete_package __PACKAGE__; 3663 #clear_package __PACKAGE__;
3182 3664
3183 warn "unload completed, starting to reload now"; 3665 warn "unload completed, starting to reload now";
3184 3666
3185 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
3186 require cf; 3668 require cf;
3187 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3188 3670
3189 warn "loading config and database again"; 3671 warn "loading config and database again";
3190 cf::cfg_load; 3672 cf::reload_config;
3191 3673
3192 warn "loading extensions"; 3674 warn "loading extensions";
3193 cf::load_extensions; 3675 cf::load_extensions;
3194 3676
3195 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3196 _global_reattach; # objects, sockets 3678 _global_reattach; # objects, sockets
3197 warn "reattaching attachments to maps"; 3679 warn "reattaching attachments to maps";
3198 reattach $_ for values %MAP; 3680 reattach $_ for values %MAP;
3199 warn "reattaching attachments to players"; 3681 warn "reattaching attachments to players";
3200 reattach $_ for values %PLAYER; 3682 reattach $_ for values %PLAYER;
3201 3683
3202 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3203 3685
3204 1 3686 1
3205 } or do { 3687 } or do {
3206 warn $@; 3688 warn $@;
3207 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3208 exit 1;
3209 }; 3690 };
3210 3691
3211 warn "reloaded"; 3692 warn "reloaded";
3693 --$RELOAD;
3694 }
3212}; 3695};
3213 3696
3214our $RELOAD_WATCHER; # used only during reload 3697our $RELOAD_WATCHER; # used only during reload
3215 3698
3216sub reload_perl() { 3699sub reload_perl() {
3217 # doing reload synchronously and two reloads happen back-to-back, 3700 # doing reload synchronously and two reloads happen back-to-back,
3218 # coro crashes during coro_state_free->destroy here. 3701 # coro crashes during coro_state_free->destroy here.
3219 3702
3220 $RELOAD_WATCHER ||= Event->timer ( 3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3221 reentrant => 0,
3222 after => 0,
3223 data => WF_AUTOCANCEL,
3224 cb => sub {
3225 do_reload_perl; 3704 do_reload_perl;
3226 undef $RELOAD_WATCHER; 3705 undef $RELOAD_WATCHER;
3227 },
3228 ); 3706 };
3229} 3707}
3230 3708
3231register_command "reload" => sub { 3709register_command "reload" => sub {
3232 my ($who, $arg) = @_; 3710 my ($who, $arg) = @_;
3233 3711
3234 if ($who->flag (FLAG_WIZ)) { 3712 if ($who->flag (FLAG_WIZ)) {
3235 $who->message ("reloading server."); 3713 $who->message ("reloading server.");
3714 async {
3715 $Coro::current->{desc} = "perl_reload";
3236 async { reload_perl }; 3716 reload_perl;
3717 };
3237 } 3718 }
3238}; 3719};
3239 3720
3240unshift @INC, $LIBDIR; 3721unshift @INC, $LIBDIR;
3241 3722
3243 3724
3244our @WAIT_FOR_TICK; 3725our @WAIT_FOR_TICK;
3245our @WAIT_FOR_TICK_BEGIN; 3726our @WAIT_FOR_TICK_BEGIN;
3246 3727
3247sub wait_for_tick { 3728sub wait_for_tick {
3248 return unless $TICK_WATCHER->is_active;
3249 return if $Coro::current == $Coro::main; 3729 return if tick_inhibit || $Coro::current == $Coro::main;
3250 3730
3251 my $signal = new Coro::Signal; 3731 my $signal = new Coro::Signal;
3252 push @WAIT_FOR_TICK, $signal; 3732 push @WAIT_FOR_TICK, $signal;
3253 $signal->wait; 3733 $signal->wait;
3254} 3734}
3255 3735
3256sub wait_for_tick_begin { 3736sub wait_for_tick_begin {
3257 return unless $TICK_WATCHER->is_active;
3258 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3259 3738
3260 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3261 push @WAIT_FOR_TICK_BEGIN, $signal; 3740 push @WAIT_FOR_TICK_BEGIN, $signal;
3262 $signal->wait; 3741 $signal->wait;
3263} 3742}
3264 3743
3265 my $min = 1e6;#d# 3744sub tick {
3266 my $avg = 10;
3267$TICK_WATCHER = Event->timer (
3268 reentrant => 0,
3269 parked => 1,
3270 prio => 0,
3271 at => $NEXT_TICK || $TICK,
3272 data => WF_AUTOCANCEL,
3273 cb => sub {
3274 if ($Coro::current != $Coro::main) { 3745 if ($Coro::current != $Coro::main) {
3275 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3746 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3276 unless ++$bug_warning > 10; 3747 unless ++$bug_warning > 10;
3277 return; 3748 return;
3278 } 3749 }
3279 3750
3280 $NOW = $tick_start = Event::time;
3281
3282 cf::server_tick; # one server iteration 3751 cf::server_tick; # one server iteration
3283 3752
3284 0 && sync_job {#d# 3753 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3285 for(1..10) { 3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3286 my $t = Event::time; 3755 Coro::async_pool {
3287 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3756 $Coro::current->{desc} = "runtime saver";
3288 or die; 3757 write_runtime_sync
3289 3758 or warn "ERROR: unable to write runtime file: $!";
3290 $map->width (50);
3291 $map->height (50);
3292 $map->alloc;
3293 $map->_load_objects ("/tmp/x.map", 1);
3294 my $t = Event::time - $t;
3295
3296 #next unless $t < 0.0013;#d#
3297 if ($t < $min) {
3298 $min = $t;
3299 }
3300 $avg = $avg * 0.99 + $t * 0.01;
3301 }
3302 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3303 exit 0;
3304 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3305 }; 3759 };
3760 }
3306 3761
3307 $RUNTIME += $TICK;
3308 $NEXT_TICK += $TICK;
3309
3310 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3311 $NEXT_RUNTIME_WRITE = $NOW + 10;
3312 Coro::async_pool {
3313 write_runtime
3314 or warn "ERROR: unable to write runtime file: $!";
3315 };
3316 }
3317
3318# my $AFTER = Event::time;
3319# warn $AFTER - $NOW;#d#
3320
3321 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3322 $sig->send; 3763 $sig->send;
3323 } 3764 }
3324 while (my $sig = shift @WAIT_FOR_TICK) { 3765 while (my $sig = shift @WAIT_FOR_TICK) {
3325 $sig->send; 3766 $sig->send;
3326 } 3767 }
3327 3768
3328 $NOW = Event::time; 3769 $LOAD = ($NOW - $TICK_START) / $TICK;
3329
3330 # if we are delayed by four ticks or more, skip them all
3331 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3332
3333 $TICK_WATCHER->at ($NEXT_TICK);
3334 $TICK_WATCHER->start;
3335
3336 $LOAD = ($NOW - $tick_start) / $TICK;
3337 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3338 3771
3339 _post_tick; 3772 if (0) {
3340 3773 if ($NEXT_TICK) {
3341 3774 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d#
3777 }
3342 }, 3778 }
3343); 3779}
3344 3780
3345{ 3781{
3346 BDB::max_poll_time $TICK * 0.1; 3782 # configure BDB
3347 $BDB_POLL_WATCHER = Event->io ( 3783
3348 reentrant => 0,
3349 fd => BDB::poll_fileno,
3350 poll => 'r',
3351 prio => 0,
3352 data => WF_AUTOCANCEL,
3353 cb => \&BDB::poll_cb,
3354 );
3355 BDB::min_parallel 8; 3784 BDB::min_parallel 8;
3356 3785 BDB::max_poll_reqs $TICK * 0.1;
3357 BDB::set_sync_prepare { 3786 $AnyEvent::BDB::WATCHER->priority (1);
3358 my $status;
3359 my $current = $Coro::current;
3360 (
3361 sub {
3362 $status = $!;
3363 $current->ready; undef $current;
3364 },
3365 sub {
3366 Coro::schedule while defined $current;
3367 $! = $status;
3368 },
3369 )
3370 };
3371 3787
3372 unless ($DB_ENV) { 3788 unless ($DB_ENV) {
3373 $DB_ENV = BDB::db_env_create; 3789 $DB_ENV = BDB::db_env_create;
3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3792 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3793 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3794 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3374 3795
3375 cf::sync_job { 3796 cf::sync_job {
3376 eval { 3797 eval {
3377 BDB::db_env_open 3798 BDB::db_env_open
3378 $DB_ENV, 3799 $DB_ENV,
3380 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3801 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3381 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3802 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3382 0666; 3803 0666;
3383 3804
3384 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3805 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3385
3386 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3387 $DB_ENV->set_lk_detect;
3388 }; 3806 };
3389 3807
3390 cf::cleanup "db_env_open(db): $@" if $@; 3808 cf::cleanup "db_env_open(db): $@" if $@;
3391 }; 3809 };
3392 } 3810 }
3811
3812 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3813 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3814 };
3815 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3816 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3817 };
3818 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3819 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3820 };
3393} 3821}
3394 3822
3395{ 3823{
3824 # configure IO::AIO
3825
3396 IO::AIO::min_parallel 8; 3826 IO::AIO::min_parallel 8;
3397
3398 undef $Coro::AIO::WATCHER;
3399 IO::AIO::max_poll_time $TICK * 0.1; 3827 IO::AIO::max_poll_time $TICK * 0.1;
3400 $AIO_POLL_WATCHER = Event->io ( 3828 undef $AnyEvent::AIO::WATCHER;
3401 reentrant => 0,
3402 data => WF_AUTOCANCEL,
3403 fd => IO::AIO::poll_fileno,
3404 poll => 'r',
3405 prio => 6,
3406 cb => \&IO::AIO::poll_cb,
3407 );
3408} 3829}
3409 3830
3410my $_log_backtrace; 3831my $_log_backtrace;
3411 3832
3412sub _log_backtrace { 3833sub _log_backtrace {
3415 $msg =~ s/\n//; 3836 $msg =~ s/\n//;
3416 3837
3417 # limit the # of concurrent backtraces 3838 # limit the # of concurrent backtraces
3418 if ($_log_backtrace < 2) { 3839 if ($_log_backtrace < 2) {
3419 ++$_log_backtrace; 3840 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg;
3420 async { 3842 async {
3843 $Coro::current->{desc} = "abt $msg";
3844
3421 my @bt = fork_call { 3845 my @bt = fork_call {
3422 @addr = map { sprintf "%x", $_ } @addr; 3846 @addr = map { sprintf "%x", $_ } @addr;
3423 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3847 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3424 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3848 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3425 or die "addr2line: $!"; 3849 or die "addr2line: $!";
3433 } 3857 }
3434 3858
3435 @funcs 3859 @funcs
3436 }; 3860 };
3437 3861
3438 LOG llevInfo, "[ABT] $msg\n"; 3862 LOG llevInfo, "[ABT] $perl_bt\n";
3863 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3439 LOG llevInfo, "[ABT] $_\n" for @bt; 3864 LOG llevInfo, "[ABT] $_\n" for @bt;
3440 --$_log_backtrace; 3865 --$_log_backtrace;
3441 }; 3866 };
3442 } else { 3867 } else {
3443 LOG llevInfo, "[ABT] $msg\n"; 3868 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines