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.291 by root, Tue Jul 3 00:54:44 2007 UTC vs.
Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines