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.289 by root, Sat Jun 30 03:00:54 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;
60use Digest::MD5 ();
61
62AnyEvent::detect;
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 74
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 76
50our %COMMAND = (); 77our %COMMAND = ();
51our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
57our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
58 85
59our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
60our @EVENT; 87our @EVENT;
61 88
62our $CONFDIR = confdir; 89our $CONFDIR = confdir;
63our $DATADIR = datadir; 90our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
73 104
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 107our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
81 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 113our $DB_ENV;
84 114
85our %CFG; 115our %CFG;
86 116
87our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 118our $RUNTIME;
119our $NOW;
89 120
90our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
93 124
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 127
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
100 132
101binmode STDOUT; 133binmode STDOUT;
102binmode STDERR; 134binmode STDERR;
103 135
104# read virtual server time, if available 136# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
109} 141}
110 142
111mkdir $_ 143mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
157 189
158The raw value load value from the last tick. 190The raw value load value from the last tick.
159 191
160=item %cf::CFG 192=item %cf::CFG
161 193
162Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 195from wherever your confdir points to.
164 196
165=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
166 198
167These 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
168returns directly I<after> the tick processing (and consequently, can only wake one process 200returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 201per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 202
203=item @cf::INVOKE_RESULTS
204
205This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call.
208
171=back 209=back
172 210
173=cut 211=cut
174 212
175BEGIN { 213BEGIN {
179 $msg .= "\n" 217 $msg .= "\n"
180 unless $msg =~ /\n$/; 218 unless $msg =~ /\n$/;
181 219
182 $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;
183 221
184 utf8::encode $msg;
185 LOG llevError, $msg; 222 LOG llevError, $msg;
186 }; 223 };
187} 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#?
188 240
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 251for my $pkg (qw(
200 cf::global cf::attachable 252 cf::global cf::attachable
201 cf::object cf::object::player 253 cf::object cf::object::player
202 cf::client cf::player 254 cf::client cf::player
203 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
204 cf::map cf::party cf::region 257 cf::party cf::region
205)) { 258)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 260}
209 261
210$Event::DIED = sub { 262$EV::DIED = sub {
211 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
212}; 264};
213 265
214############################################################################# 266#############################################################################
215 267
238 $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;
239 $d 291 $d
240 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
241} 293}
242 294
243=item $ref = cf::from_json $json 295=item $ref = cf::decode_json $json
244 296
245Converts a JSON string into the corresponding perl data structure. 297Converts a JSON string into the corresponding perl data structure.
246 298
247=item $json = cf::to_json $ref 299=item $json = cf::encode_json $ref
248 300
249Converts a perl data structure into its JSON representation. 301Converts a perl data structure into its JSON representation.
250 302
251=cut 303=cut
252 304
253our $json_coder = JSON::XS->new->convert_blessed->utf8->max_size (1e6); # accept ~1mb max 305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 306
255sub to_json ($) { $json_coder->encode ($_[0]) } 307sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[0]) } 308sub decode_json($) { $json_coder->decode ($_[0]) }
257 309
258=item cf::lock_wait $string 310=item cf::lock_wait $string
259 311
260Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
261 313
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 318for example when the coroutine gets canceled), the lock is automatically
267returned. 319returned.
268 320
321Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro.
323
269Lock 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
270uses map_find and cf::map::load uses map_load). 325uses map_find and cf::map::load uses map_load).
271 326
272=item $locked = cf::lock_active $string 327=item $locked = cf::lock_active $string
273 328
274Return 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.
275 330
276=cut 331=cut
277 332
278our %LOCK; 333our %LOCK;
334our %LOCKER;#d#
279 335
280sub lock_wait($) { 336sub lock_wait($) {
281 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#
282 343
283 # wait for lock, if any 344 # wait for lock, if any
284 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
285 push @{ $LOCK{$key} }, $Coro::current; 346 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 347 Coro::schedule;
292 353
293 # wait, to be sure we are not locked 354 # wait, to be sure we are not locked
294 lock_wait $key; 355 lock_wait $key;
295 356
296 $LOCK{$key} = []; 357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
297 359
298 Coro::guard { 360 Coro::guard {
361 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 362 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 363 $_->ready for @{ delete $LOCK{$key} };
301 } 364 }
302} 365}
303 366
306 369
307 ! ! $LOCK{$key} 370 ! ! $LOCK{$key}
308} 371}
309 372
310sub freeze_mainloop { 373sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 374 tick_inhibit_inc;
312 375
313 my $guard = Coro::guard { 376 Coro::guard \&tick_inhibit_dec;
314 $TICK_WATCHER->start; 377}
378
379=item cf::periodic $interval, $cb
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
392}
393
394=item cf::get_slot $time[, $priority[, $name]]
395
396Allocate $time seconds of blocking CPU time at priority C<$priority>:
397This call blocks and returns only when you have at least C<$time> seconds
398of cpu time till the next tick. The slot is only valid till the next cede.
399
400The optional C<$name> can be used to identify the job to run. It might be
401used for statistical purposes and should identify the same time-class.
402
403Useful for short background jobs.
404
405=cut
406
407our @SLOT_QUEUE;
408our $SLOT_QUEUE;
409
410$SLOT_QUEUE->cancel if $SLOT_QUEUE;
411$SLOT_QUEUE = Coro::async {
412 $Coro::current->desc ("timeslot manager");
413
414 my $signal = new Coro::Signal;
415
416 while () {
417 next_job:
418 my $avail = cf::till_tick;
419 if ($avail > 0.01) {
420 for (0 .. $#SLOT_QUEUE) {
421 if ($SLOT_QUEUE[$_][0] < $avail) {
422 my $job = splice @SLOT_QUEUE, $_, 1, ();
423 $job->[2]->send;
424 Coro::cede;
425 goto next_job;
426 }
427 }
428 }
429
430 if (@SLOT_QUEUE) {
431 # we do not use wait_for_tick() as it returns immediately when tick is inactive
432 push @cf::WAIT_FOR_TICK, $signal;
433 $signal->wait;
434 } else {
435 Coro::schedule;
436 }
315 }; 437 }
316 $TICK_WATCHER->stop; 438};
317 $guard 439
440sub get_slot($;$$) {
441 return if tick_inhibit || $Coro::current == $Coro::main;
442
443 my ($time, $pri, $name) = @_;
444
445 $time = $TICK * .6 if $time > $TICK * .6;
446 my $sig = new Coro::Signal;
447
448 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
449 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
450 $SLOT_QUEUE->ready;
451 $sig->wait;
318} 452}
319 453
320=item cf::async { BLOCK } 454=item cf::async { BLOCK }
321 455
322Currently the same as Coro::async_pool, meaning you cannot use 456Currently the same as Coro::async_pool, meaning you cannot use
327 461
328BEGIN { *async = \&Coro::async_pool } 462BEGIN { *async = \&Coro::async_pool }
329 463
330=item cf::sync_job { BLOCK } 464=item cf::sync_job { BLOCK }
331 465
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 466The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 467is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 469acceptable.
336 470
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 472the given BLOCK in another coroutine while waiting for the result. The
343 477
344sub sync_job(&) { 478sub sync_job(&) {
345 my ($job) = @_; 479 my ($job) = @_;
346 480
347 if ($Coro::current == $Coro::main) { 481 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 482 my $time = EV::time;
349 483
350 # this is the main coro, too bad, we have to block 484 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 485 # till the operation succeeds, freezing the server :/
352 486
353 # TODO: use suspend/resume instead 487 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 488
355 my $freeze_guard = freeze_mainloop; 489 my $freeze_guard = freeze_mainloop;
356 490
357 my $busy = 1; 491 my $busy = 1;
358 my @res; 492 my @res;
359 493
360 (async { 494 (async {
495 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 496 @res = eval { $job->() };
362 warn $@ if $@; 497 warn $@ if $@;
363 undef $busy; 498 undef $busy;
364 })->prio (Coro::PRIO_MAX); 499 })->prio (Coro::PRIO_MAX);
365 500
366 while ($busy) { 501 while ($busy) {
367 Coro::cede or Event::one_event; 502 if (Coro::nready) {
503 Coro::cede_notself;
504 } else {
505 EV::loop EV::LOOP_ONESHOT;
368 } 506 }
507 }
369 508
370 $time = Event::time - $time; 509 my $time = EV::time - $time;
371 510
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 511 $TICK_START += $time; # do not account sync jobs to server load
376 512
377 wantarray ? @res : $res[0] 513 wantarray ? @res : $res[0]
378 } else { 514 } else {
379 # we are in another coroutine, how wonderful, everything just works 515 # we are in another coroutine, how wonderful, everything just works
380 516
405=item fork_call { }, $args 541=item fork_call { }, $args
406 542
407Executes the given code block with the given arguments in a seperate 543Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 544process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 545Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 546never block itself or use any form of event handling.
411 547
412=cut 548=cut
413 549
414sub fork_call(&@) { 550sub fork_call(&@) {
415 my ($cb, @args) = @_; 551 my ($cb, @args) = @_;
416 552
417# 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,
418# or die "socketpair: $!"; 554 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 555 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 556
422 if (my $pid = fork) { 557 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 558 reset_signals;
435 local $SIG{__WARN__}; 559 &$cb
436 local $SIG{__DIE__}; 560 }, @args;
437 eval {
438 close $fh1;
439 561
440 my @res = eval { $cb->(@args) }; 562 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 563}
442 };
443 564
444 warn $@ if $@; 565=item $coin = coin_from_name $name
445 _exit 0; 566
446 } 567=cut
568
569our %coin_alias = (
570 "silver" => "silvercoin",
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
447} 590}
448 591
449=item $value = cf::db_get $family => $key 592=item $value = cf::db_get $family => $key
450 593
451Returns a single value from the environment database. 594Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 596=item cf::db_put $family => $key => $value
454 597
455Stores 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
456data 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).
457 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
458=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}
459 624
460our $DB; 625our $DB;
461 626
462sub db_init { 627sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 628 cf::sync_job {
467 eval { 629 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 630 };
477} 631}
478 632
479sub db_get($$) { 633sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 634 my $key = "$_[0]/$_[1]";
481 635
531 if (1) { 685 if (1) {
532 $md5 = 686 $md5 =
533 join "\x00", 687 join "\x00",
534 $processversion, 688 $processversion,
535 map { 689 map {
536 Coro::cede; 690 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 691 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 692 } 0.. $#$src;
539 693
540 694
541 my $dbmd5 = db_get cache => "$id/md5"; 695 my $dbmd5 = db_get cache => "$id/md5";
579 733
580############################################################################# 734#############################################################################
581 735
582=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
583 737
584Many 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
585attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
587 741
588In 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>
589C<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
590Crossfire TRT). 744Deliantra).
591 745
592=over 4 746=over 4
593 747
594=item $attachable->attach ($attachment, key => $value...) 748=item $attachable->attach ($attachment, key => $value...)
595 749
639=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
640 794
641Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
643 797
644Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
645that 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.
646 800
647These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
648 802
649=over 4 803=over 4
847 "; 1001 ";
848 die if $@; 1002 die if $@;
849} 1003}
850 1004
851our $override; 1005our $override;
852our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 1006our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
853 1007
854sub override { 1008sub override {
855 $override = 1; 1009 $override = 1;
856 @invoke_results = (); 1010 @INVOKE_RESULTS = (@_);
857} 1011}
858 1012
859sub do_invoke { 1013sub do_invoke {
860 my $event = shift; 1014 my $event = shift;
861 my $callbacks = shift; 1015 my $callbacks = shift;
862 1016
863 @invoke_results = (); 1017 @INVOKE_RESULTS = ();
864 1018
865 local $override; 1019 local $override;
866 1020
867 for (@$callbacks) { 1021 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1022 eval { &{$_->[1]} };
877 } 1031 }
878 1032
879 0 1033 0
880} 1034}
881 1035
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1037
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1039
886Generate an object-specific event with the given arguments. 1040Generate an object-specific event with the given arguments.
887 1041
888This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 1042This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
889removed in future versions), and there is no public API to access override 1043removed in future versions), and there is no public API to access override
890results (if you must, access C<@cf::invoke_results> directly). 1044results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1045
892=back 1046=back
893 1047
894=cut 1048=cut
895 1049
896############################################################################# 1050#############################################################################
897# object support 1051# object support
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#
1086sub _can_merge {
1087 my ($ob1, $ob2) = @_;
1088
1089 ++$SLOW_MERGES;#d#
1090
1091 # we do the slow way here
1092 return _object_equal $ob1, $ob2
1093}
898 1094
899sub reattach { 1095sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1097 my ($obj) = @_;
902 1098
1099 # no longer needed after getting rid of delete_package?
903 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
904 1101
905 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
906 1103
907 @$registry = (); 1104 @$registry = ();
908 1105
923cf::attachable->attach ( 1120cf::attachable->attach (
924 prio => -1000000, 1121 prio => -1000000,
925 on_instantiate => sub { 1122 on_instantiate => sub {
926 my ($obj, $data) = @_; 1123 my ($obj, $data) = @_;
927 1124
928 $data = from_json $data; 1125 $data = decode_json $data;
929 1126
930 for (@$data) { 1127 for (@$data) {
931 my ($name, $args) = @$_; 1128 my ($name, $args) = @$_;
932 1129
933 $obj->attach ($name, %{$args || {} }); 1130 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1146sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1147 my ($filename, $rdata, $objs) = @_;
951 1148
952 sync_job { 1149 sync_job {
953 if (length $$rdata) { 1150 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
956 1154
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1159 aio_close $fh;
962 1160
963 if (@$objs) { 1161 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1167 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
971 } 1169 }
972 } else { 1170 } else {
973 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
974 } 1172 }
979 } 1177 }
980 } else { 1178 } else {
981 aio_unlink $filename; 1179 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1180 aio_unlink "$filename.pst";
983 } 1181 }
984 } 1182 };
985} 1183}
986 1184
987sub object_freezer_as_string { 1185sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1186 my ($rdata, $objs) = @_;
989 1187
1001 or return; 1199 or return;
1002 1200
1003 unless (aio_stat "$filename.pst") { 1201 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1202 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1203 or return;
1204
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1205 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs};
1007 } 1207 }
1008 1208
1209 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1210 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1211 $decname, length $data, scalar @{$av || []};
1212
1011 return ($data, $av); 1213 ($data, $av)
1012} 1214}
1013 1215
1014=head2 COMMAND CALLBACKS 1216=head2 COMMAND CALLBACKS
1015 1217
1016=over 4 1218=over 4
1086 cf::override; 1288 cf::override;
1087 }, 1289 },
1088 on_extcmd => sub { 1290 on_extcmd => sub {
1089 my ($pl, $buf) = @_; 1291 my ($pl, $buf) = @_;
1090 1292
1091 my $msg = eval { from_json $buf }; 1293 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1294
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1303 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1304 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1305 }
1306
1307 $pl->ext_reply ($reply, @reply)
1308 if $reply;
1309
1099 } else { 1310 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1312 }
1102 1313
1103 cf::override; 1314 cf::override;
1130 1341
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1344
1134 $ext{source} = 1345 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1137 . $source 1348 . $source
1138 . "\n};\n1"; 1349 . "\n};\n1";
1139 1350
1140 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1367 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1368 : "$v->{base}: extension inactive.\n";
1158 1369
1159 if (exists $v->{meta}{mandatory}) { 1370 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1371 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1372 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1373 }
1164 1374
1165 warn $msg; 1375 warn $msg;
1166 } 1376 }
1167 1377
1181 1391
1182=back 1392=back
1183 1393
1184=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1185 1395
1186Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1187 1397
1188=cut 1398=cut
1189 1399
1190package cf::player; 1400package cf::player;
1191 1401
1192use Coro::AIO; 1402use Coro::AIO;
1193 1403
1194=head3 cf::player 1404=head3 cf::player
1195 1405
1196=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}
1197 1421
1198=item cf::player::find $login 1422=item cf::player::find $login
1199 1423
1200Returns the given player object, loading it if necessary (might block). 1424Returns the given player object, loading it if necessary (might block).
1201 1425
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1461 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1462 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1463 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1464 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1465
1242 my $pl = load_pl path $login 1466 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1245 } 1475 }
1246 } 1476 }
1247} 1477}
1248 1478
1257 return if $pl->{deny_save}; 1487 return if $pl->{deny_save};
1258 1488
1259 aio_mkdir playerdir $pl, 0770; 1489 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1490 $pl->{last_save} = $cf::RUNTIME;
1261 1491
1492 cf::get_slot 0.01;
1493
1262 $pl->save_pl ($path); 1494 $pl->save_pl ($path);
1263 Coro::cede; 1495 cf::cede_to_tick;
1264} 1496}
1265 1497
1266sub new($) { 1498sub new($) {
1267 my ($login) = @_; 1499 my ($login) = @_;
1268 1500
1274 $cf::PLAYER{$login} = $self; 1506 $cf::PLAYER{$login} = $self;
1275 1507
1276 $self 1508 $self
1277} 1509}
1278 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
1279=item $pl->quit_character 1521=item $pl->quit_character
1280 1522
1281Nukes the player without looking back. If logged in, the connection will 1523Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1524be destroyed. May block for a long time.
1283 1525
1287 my ($pl) = @_; 1529 my ($pl) = @_;
1288 1530
1289 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1290 1532
1291 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1292 $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
1293 1535
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1298 1542
1299 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
1336 or return []; 1580 or return [];
1337 1581
1338 my @logins; 1582 my @logins;
1339 1583
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1593 }
1344 1594
1345 utf8::decode $login; 1595 utf8::decode $login;
1346 push @logins, $login; 1596 push @logins, $login;
1347 } 1597 }
1348 1598
1375 } 1625 }
1376 1626
1377 \@paths 1627 \@paths
1378} 1628}
1379 1629
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1631
1382Expand crossfire pod fragments into protocol xml. 1632Expand deliantra pod fragments into protocol xml.
1383 1633
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1406
1407 # create single paragraphs (very hackish)
1408 s/(?<=\S)\n(?=\w)/ /g;
1409
1410 $_
1411}
1412
1413=item $player->ext_reply ($msgid, %msg) 1634=item $player->ext_reply ($msgid, @msg)
1414 1635
1415Sends an ext reply to the player. 1636Sends an ext reply to the player.
1416 1637
1417=cut 1638=cut
1418 1639
1419sub ext_reply($$%) { 1640sub ext_reply($$@) {
1420 my ($self, $id, %msg) = @_; 1641 my ($self, $id, @msg) = @_;
1421 1642
1422 $msg{msgid} = $id; 1643 $self->ns->ext_reply ($id, @msg)
1423 $self->send ("ext " . cf::to_json \%msg);
1424} 1644}
1425 1645
1426=item $player->ext_event ($type, %msg) 1646=item $player->ext_msg ($type, @msg)
1427 1647
1428Sends an ext event to the client. 1648Sends an ext event to the client.
1429 1649
1430=cut 1650=cut
1431 1651
1432sub ext_event($$%) { 1652sub ext_msg($$@) {
1433 my ($self, $type, %msg) = @_; 1653 my ($self, $type, @msg) = @_;
1434 1654
1435 $self->ns->ext_event ($type, %msg); 1655 $self->ns->ext_msg ($type, @msg);
1436} 1656}
1437 1657
1438=head3 cf::region 1658=head3 cf::region
1439 1659
1440=over 4 1660=over 4
1453 my ($path) = @_; 1673 my ($path) = @_;
1454 1674
1455 my ($match, $specificity); 1675 my ($match, $specificity);
1456 1676
1457 for my $region (list) { 1677 for my $region (list) {
1458 if ($region->match && $path =~ $region->match) { 1678 if ($region->{match} && $path =~ $region->{match}) {
1459 ($match, $specificity) = ($region, $region->specificity) 1679 ($match, $specificity) = ($region, $region->specificity)
1460 if $region->specificity > $specificity; 1680 if $region->specificity > $specificity;
1461 } 1681 }
1462 } 1682 }
1463 1683
1484our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1485our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1486 1706
1487sub generate_random_map { 1707sub generate_random_map {
1488 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
1489 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1490 $self->_create_random_map ( 1713 $self->_create_random_map (
1491 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1492 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1493 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1583 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1584 return $self; 1807 return $self;
1585 } 1808 }
1586 } 1809 }
1587 1810
1588 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1589 () 1812 ()
1590} 1813}
1591 1814
1592sub init { 1815sub init {
1593 my ($self) = @_; 1816 my ($self) = @_;
1615 1838
1616# the temporary/swap location 1839# the temporary/swap location
1617sub save_path { 1840sub save_path {
1618 my ($self) = @_; 1841 my ($self) = @_;
1619 1842
1620 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1621 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1622} 1845}
1623 1846
1624# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1625sub uniq_path { 1848sub uniq_path {
1626 my ($self) = @_; 1849 my ($self) = @_;
1627 1850
1628 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1629 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1630} 1853}
1631 1854
1632# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1633# all maps in C++... 1856# all maps in C++...
1656 1879
1657sub load_header_from($) { 1880sub load_header_from($) {
1658 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1659 1882
1660 utf8::encode $path; 1883 utf8::encode $path;
1661 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1662 # or return;
1663
1664 $self->_load_header ($path)
1665 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;
1666 1892
1667 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1668 1894
1669 1 1895 1
1670} 1896}
1724sub find { 1950sub find {
1725 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1726 1952
1727 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1728 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1729 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1730 1957
1731 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1732 my $guard = cf::lock_acquire "map_find:$path"; 1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1733 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1734 or return; 1963 or return;
1735 1964
1736 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1737 1966
1739 or return; 1968 or return;
1740 1969
1741 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1742 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1743 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1744 $map->reset; 1975 $map->reset;
1745 undef $guard;
1746 return find $path; 1976 return find $path;
1747 } 1977 }
1748 1978
1749 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1750 } 1980 }
1759 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1760 1990
1761 my $path = $self->{path}; 1991 my $path = $self->{path};
1762 1992
1763 { 1993 {
1764 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1765 1995
1996 return unless $self->valid;
1766 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1767 1998
1768 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1769 2000
1770 $self->alloc; 2001 $self->alloc;
1771 2002
1772 $self->pre_load; 2003 $self->pre_load;
1773 Coro::cede; 2004 cf::cede_to_tick;
1774 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1775 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1776 or return; 2009 or return;
1777 2010
1778 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1779 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1780 2013
1781 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1782 utf8::encode $uniq; 2015 utf8::encode $uniq;
1783 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1784 $self->clear_unique_items; 2018 $self->clear_unique_items;
1785 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1786 } 2022 }
1787 } 2023 }
1788 2024
1789 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1790 # now do the right thing for maps 2028 # now do the right thing for maps
1791 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1792 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1793 unless $self->difficulty; 2031 unless $self->difficulty;
1794 Coro::cede; 2032 cf::cede_to_tick;
1795 2033
1796 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1797 $self->decay_objects; 2035 $self->decay_objects;
1798 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1799 $self->update_buttons; 2037 $self->update_buttons;
1800 Coro::cede; 2038 cf::cede_to_tick;
1801 $self->set_darkness_map; 2039 $self->set_darkness_map;
1802 Coro::cede; 2040 cf::cede_to_tick;
1803 $self->activate; 2041 $self->activate;
1804 } 2042 }
1805 2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
2046
1806 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1807 } 2048 }
1808 2049
1809 $self->post_load; 2050 $self->post_load;
1810} 2051}
1811 2052
1820 2061
1821 $self 2062 $self
1822} 2063}
1823 2064
1824# 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
1825sub load_diag { 2066sub load_neighbours {
1826 my ($map) = @_; 2067 my ($map) = @_;
1827 2068
1828 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1829 2070
1830 for (0 .. 3) { 2071 for (0 .. 3) {
1831 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1832 or next; 2073 or next;
1833 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1834 or next; 2075 or next;
1835 $neigh->load; 2076 $neigh->load;
1836 2077
2078 push @neigh,
1837 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1838 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1839 } 2081 }
1840 2082
1841 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1842 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1843 or next; 2086 or next;
1844 $neigh->load; 2087 $neigh->load;
1845 } 2088 }
1846} 2089}
1847 2090
1852} 2095}
1853 2096
1854sub do_load_sync { 2097sub do_load_sync {
1855 my ($map) = @_; 2098 my ($map) = @_;
1856 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1857 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1858} 2104}
1859 2105
1860our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1861our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1862 2108
1863sub find_async { 2109sub find_async {
1864 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1865 2111
1866 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1867 2113
1868 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1869 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1870 } 2116 }
1871 2117
1872 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1873 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1874 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1875 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1876 my $map = find $path 2125 if (my $map = find $k) {
1877 or next;
1878 $map->load; 2126 $map->load if $v;
2127 }
1879 2128
1880 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1881 } 2130 }
1882 } 2131 }
1883 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1884 }; 2133 };
1885 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1888} 2137}
1889 2138
1890sub save { 2139sub save {
1891 my ($self) = @_; 2140 my ($self) = @_;
1892 2141
1893 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1894 2143
1895 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1896 2145
1897 return unless $self->dirty; 2146 return unless $self->dirty;
1898 2147
1904 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1905 2154
1906 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1907 2156
1908 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1909 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1910 }; 2160 };
2161
2162 cf::get_slot 0.02;
1911 2163
1912 if ($uniq) { 2164 if ($uniq) {
1913 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1914 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1915 } else { 2167 } else {
1921 my ($self) = @_; 2173 my ($self) = @_;
1922 2174
1923 # save first because save cedes 2175 # save first because save cedes
1924 $self->save; 2176 $self->save;
1925 2177
1926 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
1927 2179
1928 return if $self->players; 2180 return if $self->players;
1929 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
1930 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1931 2183
2184 $self->in_memory (cf::MAP_SWAPPED);
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1932 $self->clear; 2188 $self->clear;
1933 $self->in_memory (cf::MAP_SWAPPED);
1934} 2189}
1935 2190
1936sub reset_at { 2191sub reset_at {
1937 my ($self) = @_; 2192 my ($self) = @_;
1938 2193
1970 if $uniq; 2225 if $uniq;
1971 } 2226 }
1972 2227
1973 delete $cf::MAP{$self->path}; 2228 delete $cf::MAP{$self->path};
1974 2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
1975 $self->clear; 2232 $self->clear;
1976
1977 $_->clear_links_to ($self) for values %cf::MAP;
1978 2233
1979 $self->unlink_save; 2234 $self->unlink_save;
1980 $self->destroy; 2235 $self->destroy;
1981} 2236}
1982 2237
1983my $nuke_counter = "aaaa"; 2238my $nuke_counter = "aaaa";
1984 2239
1985sub nuke { 2240sub nuke {
1986 my ($self) = @_; 2241 my ($self) = @_;
1987 2242
2243 {
2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245
1988 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1989 2247
1990 $self->unlink_save; 2248 $self->unlink_save;
1991 2249
1992 bless $self, "cf::map"; 2250 bless $self, "cf::map";
1993 delete $self->{deny_reset}; 2251 delete $self->{deny_reset};
1994 $self->{deny_save} = 1; 2252 $self->{deny_save} = 1;
1995 $self->reset_timeout (1); 2253 $self->reset_timeout (1);
1996 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1997 2255
1998 $cf::MAP{$self->path} = $self; 2256 $cf::MAP{$self->path} = $self;
2257 }
1999 2258
2000 $self->reset; # polite request, might not happen 2259 $self->reset; # polite request, might not happen
2001} 2260}
2002 2261
2003=item $maps = cf::map::tmp_maps 2262=item $maps = cf::map::tmp_maps
2045 2304
2046sub unique_maps() { 2305sub unique_maps() {
2047 [ 2306 [
2048 map { 2307 map {
2049 utf8::decode $_; 2308 utf8::decode $_;
2050 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2051 ? normalise $_ 2312 : normalise $_
2052 : ()
2053 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2054 ] 2314 ]
2055} 2315}
2056 2316
2057package cf;
2058
2059=back 2317=back
2060 2318
2061=head3 cf::object 2319=head3 cf::object
2062 2320
2063=cut 2321=cut
2066 2324
2067=over 4 2325=over 4
2068 2326
2069=item $ob->inv_recursive 2327=item $ob->inv_recursive
2070 2328
2071Returns 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.
2072 2331
2073=cut 2332=cut
2074 2333
2075sub inv_recursive_; 2334sub inv_recursive_;
2076sub inv_recursive_ { 2335sub inv_recursive_ {
2079 2338
2080sub inv_recursive { 2339sub inv_recursive {
2081 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2082} 2341}
2083 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
2084package cf; 2371package cf;
2085 2372
2086=back 2373=back
2087 2374
2088=head3 cf::object::player 2375=head3 cf::object::player
2094Sends 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>
2095can 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
2096dialogue with the given NPC character. 2383dialogue with the given NPC character.
2097 2384
2098=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};
2099 2400
2100# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2101# with dialog boxes. 2402# with dialog boxes.
2102#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
2103sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2110 2411
2111 } else { 2412 } else {
2112 my $pl = $self->contr; 2413 my $pl = $self->contr;
2113 2414
2114 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2115 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2116 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2117 $diag->{id},
2118 msgtype => "reply",
2119 msg => $diag->{pl}->expand_cfpod ($msg),
2120 add_topics => []
2121 );
2122 2418
2123 } else { 2419 } else {
2124 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2125 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2126 } 2422 }
2127 } 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 (@_);
2128} 2434}
2129 2435
2130=item $player_object->may ("access") 2436=item $player_object->may ("access")
2131 2437
2132Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2145 2451
2146=item $player_object->enter_link 2452=item $player_object->enter_link
2147 2453
2148Freezes 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}>).
2149 2455
2150The 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.
2151I<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.
2152 2460
2153Will never block. 2461Will never block.
2154 2462
2155=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2156 2464
2211 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2212 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2213 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2214 2522
2215 $map->load; 2523 $map->load;
2216 $map->load_diag; 2524 $map->load_neighbours;
2217 2525
2218 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2219 $self->activate_recursive; 2528 $self->activate_recursive;
2220 2529
2221 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2222 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2223} 2532}
2224 2533
2225=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2226 2535
2227Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2228her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2229that 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
2230the new (success) or old (failed) map position. 2539the new (success) or old (failed) map position. In either case, $done will
2540be called at the end of this process.
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 >>.
2231 2544
2232=cut 2545=cut
2233 2546
2234our $GOTOGEN; 2547our $GOTOGEN;
2235 2548
2236sub cf::object::player::goto { 2549sub cf::object::player::goto {
2237 my ($self, $path, $x, $y, $check) = @_; 2550 my ($self, $path, $x, $y, $check, $done) = @_;
2238 2551
2239 # do generation counting so two concurrent goto's will be executed in-order 2552 # do generation counting so two concurrent goto's will be executed in-order
2240 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2241 2554
2242 $self->enter_link; 2555 $self->enter_link;
2243 2556
2244 (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
2245 my $map = eval { 2579 my $map = eval {
2246 my $map = cf::map::find $path; 2580 my $map = defined $path ? cf::map::find $path : undef;
2247 2581
2248 if ($map) { 2582 if ($map) {
2249 $map = $map->customise_for ($self); 2583 $map = $map->customise_for ($self);
2250 $map = $check->($map) if $check && $map; 2584 $map = $check->($map) if $check && $map;
2251 } else { 2585 } else {
2252 $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);
2253 } 2587 }
2254 2588
2255 $map 2589 $map
2256 }; 2590 };
2257 2591
2262 2596
2263 if ($gen == $self->{_goto_generation}) { 2597 if ($gen == $self->{_goto_generation}) {
2264 delete $self->{_goto_generation}; 2598 delete $self->{_goto_generation};
2265 $self->leave_link ($map, $x, $y); 2599 $self->leave_link ($map, $x, $y);
2266 } 2600 }
2601
2602 $done->() if $done;
2267 })->prio (1); 2603 })->prio (1);
2268} 2604}
2269 2605
2270=item $player_object->enter_exit ($exit_object) 2606=item $player_object->enter_exit ($exit_object)
2271 2607
2291} 2627}
2292 2628
2293sub prepare_random_map { 2629sub prepare_random_map {
2294 my ($exit) = @_; 2630 my ($exit) = @_;
2295 2631
2296 my $guard = cf::lock_acquire "exit_prepare:$exit";
2297
2298 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2299 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2300 # that depends on the exit object 2634 # that depends on the exit object
2301 2635
2302 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2304 if ($exit->map) { 2638 if ($exit->map) {
2305 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2306 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2307 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2308 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2309 } 2645 }
2310 2646
2311 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2312 2648
2313 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2314 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2315 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2316 2652
2317 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2318 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2319 undef $fh; 2655 undef $fh;
2320 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2321 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2322 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2323 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2324 } 2664 }
2325} 2665}
2326 2666
2327sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2328 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2329 2669
2330 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2331 2671
2332 if ($exit->slaying eq "/!") {
2333 #TODO: this should de-fi-ni-te-ly not be a sync-job
2334 # the problem is that $exit might not survive long enough
2335 # so it needs to be done right now, right here
2336 cf::sync_job { prepare_random_map $exit };
2337 }
2338
2339 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2340 my $hp = $exit->stats->hp;
2341 my $sp = $exit->stats->sp;
2342
2343 $self->enter_link; 2672 $self->enter_link;
2344 2673
2345 (async { 2674 (async {
2346 $self->deactivate_recursive; # just to be sure 2675 $Coro::current->{desc} = "enter_exit";
2676
2347 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
2348 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2349 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
2350 1; 2698 1
2351 }) { 2699 }) {
2352 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2353 . "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. "
2354 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2355 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2356 2704
2357 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2376 2724
2377 utf8::encode $text; 2725 utf8::encode $text;
2378 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2726 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2379} 2727}
2380 2728
2381=item $client->send_msg ($color, $type, $msg, [extra...]) 2729=item $client->send_msg ($channel, $msg, $color, [extra...])
2382 2730
2383Send a drawinfo or msg packet to the client, formatting the msg for the 2731Send a drawinfo or msg packet to the client, formatting the msg for the
2384client if neccessary. C<$type> should be a string identifying the type of 2732client if neccessary. C<$type> should be a string identifying the type of
2385the 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
2386the message unless the client supports the msg packet. 2734the message unless the client supports the msg packet.
2387 2735
2388=cut 2736=cut
2389 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
2390sub cf::client::send_msg { 2802sub cf::client::send_msg {
2391 my ($self, $color, $type, $msg, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2392 2804
2393 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2807
2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
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
2819 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825 }
2826
2827 $channel = $channel->{id};
2828 }
2829
2830 return unless @extra || length $msg;
2394 2831
2395 if ($self->can_msg) { 2832 if ($self->can_msg) {
2396 $self->send_packet ("msg " . cf::to_json [$color, $type, $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);
2397 } else { 2853 } else {
2398 # replace some tags by gcfclient-compatible ones
2399 for ($msg) {
2400 1 while
2401 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2402 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2403 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2404 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2405 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2406 }
2407
2408 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
2409 if (0 && $msg =~ /\[/) { 2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2410 $self->send_packet ("drawextinfo $color 4 0 $msg") 2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2411 } else { 2872 } else {
2412 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2413 $self->send_packet ("drawinfo $color $msg") 2874 $self->send_packet ("drawinfo $color $msg")
2414 } 2875 }
2415 } 2876 }
2416 } 2877 }
2417} 2878}
2418 2879
2419=item $client->ext_event ($type, %msg) 2880=item $client->ext_msg ($type, @msg)
2420 2881
2421Sends an ext event to the client. 2882Sends an ext event to the client.
2422 2883
2423=cut 2884=cut
2424 2885
2425sub cf::client::ext_event($$%) { 2886sub cf::client::ext_msg($$@) {
2426 my ($self, $type, %msg) = @_; 2887 my ($self, $type, @msg) = @_;
2427 2888
2889 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove
2428 $msg{msgtype} = "event_$type"; 2892 push @msg, msgtype => "event_$type";
2429 $self->send_packet ("ext " . cf::to_json \%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 }
2430} 2913}
2431 2914
2432=item $success = $client->query ($flags, "text", \&cb) 2915=item $success = $client->query ($flags, "text", \&cb)
2433 2916
2434Queues a query to the client, calling the given callback with 2917Queues a query to the client, calling the given callback with
2457 2940
2458 1 2941 1
2459} 2942}
2460 2943
2461cf::client->attach ( 2944cf::client->attach (
2945 on_connect => sub {
2946 my ($ns) = @_;
2947
2948 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2949 },
2462 on_reply => sub { 2950 on_reply => sub {
2463 my ($ns, $msg) = @_; 2951 my ($ns, $msg) = @_;
2464 2952
2465 # this weird shuffling is so that direct followup queries 2953 # this weird shuffling is so that direct followup queries
2466 # get handled first 2954 # get handled first
2481 } 2969 }
2482 }, 2970 },
2483 on_exticmd => sub { 2971 on_exticmd => sub {
2484 my ($ns, $buf) = @_; 2972 my ($ns, $buf) = @_;
2485 2973
2486 my $msg = eval { from_json $buf }; 2974 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2487 2975
2488 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
2489 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2984 if (my $cb = $EXTICMD{$type}) {
2490 if (my %reply = $cb->($ns, $msg)) { 2985 @reply = $cb->($ns, @payload);
2491 $reply{msgid} = $msg->{msgid};
2492 $ns->send ("ext " . cf::to_json \%reply);
2493 }
2494 } 2986 }
2987
2988 $ns->ext_reply ($reply, @reply)
2989 if $reply;
2990
2495 } else { 2991 } else {
2496 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";
2497 } 2993 }
2498 2994
2499 cf::override; 2995 cf::override;
2546our $safe = new Safe "safe"; 3042our $safe = new Safe "safe";
2547our $safe_hole = new Safe::Hole; 3043our $safe_hole = new Safe::Hole;
2548 3044
2549$SIG{FPE} = 'IGNORE'; 3045$SIG{FPE} = 'IGNORE';
2550 3046
2551$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));
2552 3052
2553# here we export the classes and methods available to script code 3053# here we export the classes and methods available to script code
2554 3054
2555=pod 3055=pod
2556 3056
2557The following functions and methods are available within a safe environment: 3057The following functions and methods are available within a safe environment:
2558 3058
2559 cf::object contr pay_amount pay_player map 3059 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split
3062
2560 cf::object::player player 3063 cf::object::player
2561 cf::player peaceful 3064 player
2562 cf::map trigger 3065
3066 cf::player
3067 peaceful
3068
3069 cf::map
3070 trigger
2563 3071
2564=cut 3072=cut
2565 3073
2566for ( 3074for (
2567 ["cf::object" => qw(contr pay_amount pay_player map)], 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)],
2568 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
2569 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
2570 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
2571) { 3081) {
2572 no strict 'refs'; 3082 no strict 'refs';
2648# the server's init and main functions 3158# the server's init and main functions
2649 3159
2650sub load_facedata($) { 3160sub load_facedata($) {
2651 my ($path) = @_; 3161 my ($path) = @_;
2652 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
2653 warn "loading facedata from $path\n"; 3169 warn "loading facedata from $path\n";
2654 3170
2655 my $facedata; 3171 my $facedata;
2656 0 < aio_load $path, $facedata 3172 0 < aio_load $path, $facedata
2657 or die "$path: $!"; 3173 or die "$path: $!";
2659 $facedata = Coro::Storable::thaw $facedata; 3175 $facedata = Coro::Storable::thaw $facedata;
2660 3176
2661 $facedata->{version} == 2 3177 $facedata->{version} == 2
2662 or cf::cleanup "$path: version mismatch, cannot proceed."; 3178 or cf::cleanup "$path: version mismatch, cannot proceed.";
2663 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
2664 { 3187 {
2665 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
2666 3189
2667 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
2668 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
2669 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3193 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap};
2670 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2671 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2672 Coro::cede; 3197
3198 cf::cede_to_tick;
2673 } 3199 }
2674 3200
2675 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2676 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
2677 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
2678 or next; 3205 or next;
3206
2679 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth;
2680 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2681 } else { 3210 } else {
2682 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
2683 } 3212 }
2684 Coro::cede; 3213
3214 cf::cede_to_tick;
2685 } 3215 }
2686 } 3216 }
2687 3217
2688 { 3218 {
2689 my $anims = $facedata->{animinfo}; 3219 my $anims = $facedata->{animinfo};
2690 3220
2691 while (my ($anim, $info) = each %$anims) { 3221 while (my ($anim, $info) = each %$anims) {
2692 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3222 cf::anim::set $anim, $info->{frames}, $info->{facings};
2693 Coro::cede; 3223 cf::cede_to_tick;
2694 } 3224 }
2695 3225
2696 cf::anim::invalidate_all; # d'oh 3226 cf::anim::invalidate_all; # d'oh
2697 } 3227 }
2698 3228
3229 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource};
3233
3234 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238
3239 if ($info->{type} & 1) {
3240 # prepend meta info
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};
3254 } else {
3255 $RESOURCE{$name} = $info;
3256 }
3257
3258 cf::cede_to_tick;
3259 }
3260 }
3261
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263
2699 1 3264 1
2700} 3265}
2701 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
2702sub 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
2703 load_resource_file "$MAPDIR/regions" 3310 load_resource_file "$MAPDIR/regions"
2704 or die "unable to load regions file\n"; 3311 or die "unable to load regions file\n";
3312
3313 for (cf::region::list) {
3314 $_->{match} = qr/$_->{match}/
3315 if exists $_->{match};
3316 }
2705} 3317}
2706 3318
2707sub reload_facedata { 3319sub reload_facedata {
2708 load_facedata "$DATADIR/facedata" 3320 load_facedata "$DATADIR/facedata"
2709 or die "unable to load facedata\n"; 3321 or die "unable to load facedata\n";
2710} 3322}
2711 3323
2712sub reload_archetypes { 3324sub reload_archetypes {
2713 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
2714 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
2715 #d# NEED to laod twice to resolve forward references
2716 # this really needs to be done in an extra post-pass
2717 # (which needs to be synchronous, so solve it differently)
2718 load_resource_file "$DATADIR/archetypes"
2719 or die "unable to load archetypes\n";
2720} 3327}
2721 3328
2722sub reload_treasures { 3329sub reload_treasures {
2723 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
2724 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
2725} 3332}
2726 3333
2727sub reload_resources { 3334sub reload_resources {
2728 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
2729 3336
3337 reload_facedata;
3338 reload_archetypes;
2730 reload_regions; 3339 reload_regions;
2731 reload_facedata;
2732 #reload_archetypes;#d#
2733 reload_archetypes;
2734 reload_treasures; 3340 reload_treasures;
2735 3341
2736 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
2737} 3343}
2738 3344
2739sub init { 3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
2740 reload_resources; 3350 reload_resources;
2741} 3351}
2742 3352
2743sub cfg_load { 3353sub reload_config {
2744 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
2745 or return; 3355 or return;
2746 3356
2747 local $/; 3357 local $/;
2748 *CFG = YAML::Syck::Load <$fh>; 3358 *CFG = YAML::Load <$fh>;
2749 3359
2750 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2751 3361
2752 $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};
2753 $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};
2759 }; 3369 };
2760 warn $@ if $@; 3370 warn $@ if $@;
2761 } 3371 }
2762} 3372}
2763 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
2764sub main { 3393sub main {
3394 atomic;
3395
2765 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
2766 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
2767 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#
2768 (async { 3399 (async {
2769 Event::one_event; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT;
2770 })->prio (Coro::PRIO_MAX); 3402 })->prio (Coro::PRIO_MAX);
2771 }; 3403 };
2772 3404
2773 cfg_load; 3405 {
3406 my $guard = freeze_mainloop;
3407 reload_config;
2774 db_init; 3408 db_init;
2775 load_extensions; 3409 load_extensions;
2776 3410
2777 $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
2778 Event::loop; 3419 EV::loop;
2779} 3420}
2780 3421
2781############################################################################# 3422#############################################################################
2782# initialisation and cleanup 3423# initialisation and cleanup
2783 3424
2784# install some emergency cleanup handlers 3425# install some emergency cleanup handlers
2785BEGIN { 3426BEGIN {
3427 our %SIGWATCHER = ();
2786 for my $signal (qw(INT HUP TERM)) { 3428 for my $signal (qw(INT HUP TERM)) {
2787 Event->signal ( 3429 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2788 reentrant => 0,
2789 data => WF_AUTOCANCEL,
2790 signal => $signal,
2791 prio => 0,
2792 cb => sub {
2793 cf::cleanup "SIG$signal"; 3430 cf::cleanup "SIG$signal";
2794 },
2795 ); 3431 };
2796 } 3432 }
2797} 3433}
2798 3434
2799sub write_runtime { 3435sub write_runtime_sync {
2800 my $runtime = "$LOCALDIR/runtime";
2801
2802 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
2803 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
2804 3438
2805 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2806 3440
2807 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
2808 3442
2809 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2810 or return; 3444 or return;
2811 3445
2812 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
2813 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
2814 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
2824 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
2825 3459
2826 close $fh 3460 close $fh
2827 or return; 3461 or return;
2828 3462
2829 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2830 and return; 3464 and return;
2831 3465
2832 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
2833 3467
2834 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 };
2835} 3512}
2836 3513
2837sub emergency_save() { 3514sub emergency_save() {
2838 my $freeze_guard = cf::freeze_mainloop; 3515 my $freeze_guard = cf::freeze_mainloop;
2839 3516
2845 # and maps saved/destroyed asynchronously. 3522 # and maps saved/destroyed asynchronously.
2846 warn "begin emergency player save\n"; 3523 warn "begin emergency player save\n";
2847 for my $login (keys %cf::PLAYER) { 3524 for my $login (keys %cf::PLAYER) {
2848 my $pl = $cf::PLAYER{$login} or next; 3525 my $pl = $cf::PLAYER{$login} or next;
2849 $pl->valid or next; 3526 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2850 $pl->save; 3528 $pl->save;
2851 } 3529 }
2852 warn "end emergency player save\n"; 3530 warn "end emergency player save\n";
2853 3531
2854 warn "begin emergency map save\n"; 3532 warn "begin emergency map save\n";
2860 warn "end emergency map save\n"; 3538 warn "end emergency map save\n";
2861 3539
2862 warn "begin emergency database checkpoint\n"; 3540 warn "begin emergency database checkpoint\n";
2863 BDB::db_env_txn_checkpoint $DB_ENV; 3541 BDB::db_env_txn_checkpoint $DB_ENV;
2864 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";
2865 }; 3547 };
2866 3548
2867 warn "leave emergency perl save\n"; 3549 warn "leave emergency perl save\n";
2868} 3550}
2869 3551
2870sub post_cleanup { 3552sub post_cleanup {
2871 my ($make_core) = @_; 3553 my ($make_core) = @_;
2872 3554
2873 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
2874 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
2875} 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
2876 3589
2877sub do_reload_perl() { 3590sub do_reload_perl() {
2878 # can/must only be called in main 3591 # can/must only be called in main
2879 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
2880 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
2881 return; 3594 return;
2882 } 3595 }
2883 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
2884 warn "reloading..."; 3600 warn "reloading...";
2885 3601
2886 warn "entering sync_job"; 3602 warn "entering sync_job";
2887 3603
2888 cf::sync_job { 3604 cf::sync_job {
2889 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
2890 cf::emergency_save; 3606 cf::emergency_save;
2891 cf::write_runtime; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
2892 3608
2893 warn "syncing database to disk"; 3609 warn "syncing database to disk";
2894 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
2895 3611
2896 # 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
2897 3613
2898 warn "cancelling all WF_AUTOCANCEL watchers";
2899 for (Event::all_watchers) {
2900 $_->cancel if $_->data & WF_AUTOCANCEL;
2901 }
2902
2903 warn "flushing outstanding aio requests"; 3614 warn "flushing outstanding aio requests";
2904 for (;;) {
2905 BDB::flush;
2906 IO::AIO::flush;
2907 Coro::cede;
2908 last unless IO::AIO::nreqs || BDB::nreqs; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
2909 warn "iterate..."; 3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2910 }
2911
2912 ++$RELOAD;
2913
2914 warn "cancelling all extension coros";
2915 $_->cancel for values %EXT_CORO;
2916 %EXT_CORO = ();
2917
2918 warn "removing commands";
2919 %COMMAND = ();
2920
2921 warn "removing ext/exti commands";
2922 %EXTCMD = ();
2923 %EXTICMD = ();
2924
2925 warn "unloading/nuking all extensions";
2926 for my $pkg (@EXTS) {
2927 warn "... unloading $pkg";
2928
2929 if (my $cb = $pkg->can ("unload")) {
2930 eval {
2931 $cb->($pkg);
2932 1
2933 } or warn "$pkg unloaded, but with errors: $@";
2934 } 3617 }
2935 3618
2936 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
2937 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
2938 } 3621 %EXT_CORO = ();
2939 3622
2940 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
2941 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
2942 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2943 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
2944 warn "... unloading $k"; 3632 warn "... unloading $pkg";
2945 delete $INC{$k};
2946 3633
2947 $k =~ s/\.pm$//;
2948 $k =~ s/\//::/g;
2949
2950 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
2951 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
2952 } 3643 }
2953 3644
2954 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;
2955 } 3660 }
2956 3661
2957 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
2958 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
2959 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);
2960 3665
2961 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
2962 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
2963 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
2964 3669
2965 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
2966 # and global variables created in xs 3671 # and global variables created in xs
2967 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
2968 3673
2969 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
2970 3675
2971 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
2972 require cf; 3677 require cf;
2973 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2974 3679
2975 warn "loading config and database again"; 3680 warn "loading config and database again";
2976 cf::cfg_load; 3681 cf::reload_config;
2977 3682
2978 warn "loading extensions"; 3683 warn "loading extensions";
2979 cf::load_extensions; 3684 cf::load_extensions;
2980 3685
2981 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
2982 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
2983 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
2984 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
2985 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
2986 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
2987 3692
2988 warn "leaving sync_job"; 3693 warn "leaving sync_job";
2989 3694
2990 1 3695 1
2991 } or do { 3696 } or do {
2992 warn $@; 3697 warn $@;
2993 warn "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
2994 exit 1;
2995 }; 3699 };
2996 3700
2997 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
2998}; 3704};
2999 3705
3000our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
3001 3707
3002sub reload_perl() { 3708sub reload_perl() {
3003 # doing reload synchronously and two reloads happen back-to-back, 3709 # doing reload synchronously and two reloads happen back-to-back,
3004 # coro crashes during coro_state_free->destroy here. 3710 # coro crashes during coro_state_free->destroy here.
3005 3711
3006 $RELOAD_WATCHER ||= Event->timer ( 3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3007 reentrant => 0,
3008 after => 0,
3009 data => WF_AUTOCANCEL,
3010 cb => sub {
3011 do_reload_perl; 3713 do_reload_perl;
3012 undef $RELOAD_WATCHER; 3714 undef $RELOAD_WATCHER;
3013 },
3014 ); 3715 };
3015} 3716}
3016 3717
3017register_command "reload" => sub { 3718register_command "reload" => sub {
3018 my ($who, $arg) = @_; 3719 my ($who, $arg) = @_;
3019 3720
3020 if ($who->flag (FLAG_WIZ)) { 3721 if ($who->flag (FLAG_WIZ)) {
3021 $who->message ("reloading server."); 3722 $who->message ("reloading server.");
3723 async {
3724 $Coro::current->{desc} = "perl_reload";
3022 async { reload_perl }; 3725 reload_perl;
3726 };
3023 } 3727 }
3024}; 3728};
3025 3729
3026unshift @INC, $LIBDIR; 3730unshift @INC, $LIBDIR;
3027 3731
3029 3733
3030our @WAIT_FOR_TICK; 3734our @WAIT_FOR_TICK;
3031our @WAIT_FOR_TICK_BEGIN; 3735our @WAIT_FOR_TICK_BEGIN;
3032 3736
3033sub wait_for_tick { 3737sub wait_for_tick {
3034 return unless $TICK_WATCHER->is_active;
3035 return if $Coro::current == $Coro::main; 3738 return if tick_inhibit || $Coro::current == $Coro::main;
3036 3739
3037 my $signal = new Coro::Signal; 3740 my $signal = new Coro::Signal;
3038 push @WAIT_FOR_TICK, $signal; 3741 push @WAIT_FOR_TICK, $signal;
3039 $signal->wait; 3742 $signal->wait;
3040} 3743}
3041 3744
3042sub wait_for_tick_begin { 3745sub wait_for_tick_begin {
3043 return unless $TICK_WATCHER->is_active;
3044 return if $Coro::current == $Coro::main; 3746 return if tick_inhibit || $Coro::current == $Coro::main;
3045 3747
3046 my $signal = new Coro::Signal; 3748 my $signal = new Coro::Signal;
3047 push @WAIT_FOR_TICK_BEGIN, $signal; 3749 push @WAIT_FOR_TICK_BEGIN, $signal;
3048 $signal->wait; 3750 $signal->wait;
3049} 3751}
3050 3752
3051 my $min = 1e6;#d# 3753sub tick {
3052 my $avg = 10;
3053$TICK_WATCHER = Event->timer (
3054 reentrant => 0,
3055 parked => 1,
3056 prio => 0,
3057 at => $NEXT_TICK || $TICK,
3058 data => WF_AUTOCANCEL,
3059 cb => sub {
3060 if ($Coro::current != $Coro::main) { 3754 if ($Coro::current != $Coro::main) {
3061 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"
3062 unless ++$bug_warning > 10; 3756 unless ++$bug_warning > 10;
3063 return; 3757 return;
3064 } 3758 }
3065 3759
3066 $NOW = $tick_start = Event::time;
3067
3068 cf::server_tick; # one server iteration 3760 cf::server_tick; # one server iteration
3069 3761
3070 0 && sync_job {#d# 3762 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3071 for(1..10) { 3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3072 my $t = Event::time; 3764 Coro::async_pool {
3073 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3765 $Coro::current->{desc} = "runtime saver";
3074 or die; 3766 write_runtime_sync
3075 3767 or warn "ERROR: unable to write runtime file: $!";
3076 $map->width (50);
3077 $map->height (50);
3078 $map->alloc;
3079 $map->_load_objects ("/tmp/x.map", 1);
3080 my $t = Event::time - $t;
3081
3082 #next unless $t < 0.0013;#d#
3083 if ($t < $min) {
3084 $min = $t;
3085 }
3086 $avg = $avg * 0.99 + $t * 0.01;
3087 }
3088 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3089 exit 0;
3090 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3091 }; 3768 };
3769 }
3092 3770
3093 $RUNTIME += $TICK;
3094 $NEXT_TICK += $TICK;
3095
3096 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3097 $NEXT_RUNTIME_WRITE = $NOW + 10;
3098 Coro::async_pool {
3099 write_runtime
3100 or warn "ERROR: unable to write runtime file: $!";
3101 };
3102 }
3103
3104# my $AFTER = Event::time;
3105# warn $AFTER - $NOW;#d#
3106
3107 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3108 $sig->send; 3772 $sig->send;
3109 } 3773 }
3110 while (my $sig = shift @WAIT_FOR_TICK) { 3774 while (my $sig = shift @WAIT_FOR_TICK) {
3111 $sig->send; 3775 $sig->send;
3112 } 3776 }
3113 3777
3114 $NOW = Event::time; 3778 $LOAD = ($NOW - $TICK_START) / $TICK;
3115
3116 # if we are delayed by four ticks or more, skip them all
3117 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3118
3119 $TICK_WATCHER->at ($NEXT_TICK);
3120 $TICK_WATCHER->start;
3121
3122 $LOAD = ($NOW - $tick_start) / $TICK;
3123 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3779 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3124 3780
3125 _post_tick; 3781 if (0) {
3126 3782 if ($NEXT_TICK) {
3127 3783 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d#
3786 }
3128 }, 3787 }
3129); 3788}
3130 3789
3131{ 3790{
3132 BDB::max_poll_time $TICK * 0.1; 3791 # configure BDB
3133 $BDB_POLL_WATCHER = Event->io ( 3792
3134 reentrant => 0,
3135 fd => BDB::poll_fileno,
3136 poll => 'r',
3137 prio => 0,
3138 data => WF_AUTOCANCEL,
3139 cb => \&BDB::poll_cb,
3140 );
3141 BDB::min_parallel 8; 3793 BDB::min_parallel 8;
3142 3794 BDB::max_poll_reqs $TICK * 0.1;
3143 BDB::set_sync_prepare { 3795 $AnyEvent::BDB::WATCHER->priority (1);
3144 my $status;
3145 my $current = $Coro::current;
3146 (
3147 sub {
3148 $status = $!;
3149 $current->ready; undef $current;
3150 },
3151 sub {
3152 Coro::schedule while defined $current;
3153 $! = $status;
3154 },
3155 )
3156 };
3157 3796
3158 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3159 $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);
3160 3804
3161 cf::sync_job { 3805 cf::sync_job {
3162 eval { 3806 eval {
3163 BDB::db_env_open 3807 BDB::db_env_open
3164 $DB_ENV, 3808 $DB_ENV,
3166 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
3167 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3811 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3168 0666; 3812 0666;
3169 3813
3170 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3814 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3171
3172 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3173 $DB_ENV->set_lk_detect;
3174 }; 3815 };
3175 3816
3176 cf::cleanup "db_env_open(db): $@" if $@; 3817 cf::cleanup "db_env_open(db): $@" if $@;
3177 }; 3818 };
3178 } 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 };
3179} 3830}
3180 3831
3181{ 3832{
3833 # configure IO::AIO
3834
3182 IO::AIO::min_parallel 8; 3835 IO::AIO::min_parallel 8;
3183
3184 undef $Coro::AIO::WATCHER;
3185 IO::AIO::max_poll_time $TICK * 0.1; 3836 IO::AIO::max_poll_time $TICK * 0.1;
3186 $AIO_POLL_WATCHER = Event->io ( 3837 undef $AnyEvent::AIO::WATCHER;
3187 reentrant => 0,
3188 data => WF_AUTOCANCEL,
3189 fd => IO::AIO::poll_fileno,
3190 poll => 'r',
3191 prio => 6,
3192 cb => \&IO::AIO::poll_cb,
3193 );
3194} 3838}
3195 3839
3196my $_log_backtrace; 3840my $_log_backtrace;
3197 3841
3198sub _log_backtrace { 3842sub _log_backtrace {
3201 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3202 3846
3203 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3204 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3205 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3206 async { 3851 async {
3852 $Coro::current->{desc} = "abt $msg";
3853
3207 my @bt = fork_call { 3854 my @bt = fork_call {
3208 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
3209 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3856 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3210 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 |"
3211 or die "addr2line: $!"; 3858 or die "addr2line: $!";
3219 } 3866 }
3220 3867
3221 @funcs 3868 @funcs
3222 }; 3869 };
3223 3870
3224 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3225 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3226 --$_log_backtrace; 3874 --$_log_backtrace;
3227 }; 3875 };
3228 } else { 3876 } else {
3229 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines