ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines