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.294 by root, Tue Jul 3 06:00:48 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 s/^\s+//;
1420 s/\s+$//;
1421
1422 $_
1423}
1424
1425sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode}
1428}
1429
1430=item $player->ext_reply ($msgid, %msg) 1631=item $player->ext_reply ($msgid, @msg)
1431 1632
1432Sends an ext reply to the player. 1633Sends an ext reply to the player.
1433 1634
1434=cut 1635=cut
1435 1636
1436sub ext_reply($$%) { 1637sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1638 my ($self, $id, @msg) = @_;
1438 1639
1439 $msg{msgid} = $id; 1640 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1641}
1442 1642
1443=item $player->ext_event ($type, %msg) 1643=item $player->ext_msg ($type, @msg)
1444 1644
1445Sends an ext event to the client. 1645Sends an ext event to the client.
1446 1646
1447=cut 1647=cut
1448 1648
1449sub ext_event($$%) { 1649sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1650 my ($self, $type, @msg) = @_;
1451 1651
1452 $self->ns->ext_event ($type, %msg); 1652 $self->ns->ext_msg ($type, @msg);
1453} 1653}
1454 1654
1455=head3 cf::region 1655=head3 cf::region
1456 1656
1457=over 4 1657=over 4
1470 my ($path) = @_; 1670 my ($path) = @_;
1471 1671
1472 my ($match, $specificity); 1672 my ($match, $specificity);
1473 1673
1474 for my $region (list) { 1674 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1675 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1676 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1677 if $region->specificity > $specificity;
1478 } 1678 }
1479 } 1679 }
1480 1680
1501our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1502our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1503 1703
1504sub generate_random_map { 1704sub generate_random_map {
1505 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
1506 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1507 $self->_create_random_map ( 1710 $self->_create_random_map (
1508 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1509 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1510 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1600 $self->init; # pass $1 etc. 1803 $self->init; # pass $1 etc.
1601 return $self; 1804 return $self;
1602 } 1805 }
1603 } 1806 }
1604 1807
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1808 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1809 ()
1607} 1810}
1608 1811
1609sub init { 1812sub init {
1610 my ($self) = @_; 1813 my ($self) = @_;
1632 1835
1633# the temporary/swap location 1836# the temporary/swap location
1634sub save_path { 1837sub save_path {
1635 my ($self) = @_; 1838 my ($self) = @_;
1636 1839
1637 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1638 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1639} 1842}
1640 1843
1641# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1642sub uniq_path { 1845sub uniq_path {
1643 my ($self) = @_; 1846 my ($self) = @_;
1644 1847
1645 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1646 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1647} 1850}
1648 1851
1649# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1650# all maps in C++... 1853# all maps in C++...
1673 1876
1674sub load_header_from($) { 1877sub load_header_from($) {
1675 my ($self, $path) = @_; 1878 my ($self, $path) = @_;
1676 1879
1677 utf8::encode $path; 1880 utf8::encode $path;
1678 #aio_open $path, O_RDONLY, 0 1881 my $f = new_from_file cf::object::thawer $path
1679 # or return;
1680
1681 $self->_load_header ($path)
1682 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;
1683 1889
1684 $self->{load_path} = $path; 1890 $self->{load_path} = $path;
1685 1891
1686 1 1892 1
1687} 1893}
1741sub find { 1947sub find {
1742 my ($path, $origin) = @_; 1948 my ($path, $origin) = @_;
1743 1949
1744 $path = normalise $path, $origin && $origin->path; 1950 $path = normalise $path, $origin && $origin->path;
1745 1951
1952 cf::lock_wait "map_data:$path";#d#remove
1746 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1747 1954
1748 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1749 my $guard = cf::lock_acquire "map_find:$path"; 1957 my $guard2 = cf::lock_acquire "map_find:$path";
1958
1750 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1751 or return; 1960 or return;
1752 1961
1753 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1754 1963
1756 or return; 1965 or return;
1757 1966
1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1760 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1971 undef $guard1;
1761 $map->reset; 1972 $map->reset;
1762 undef $guard;
1763 return find $path; 1973 return find $path;
1764 } 1974 }
1765 1975
1766 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
1767 } 1977 }
1776 local $self->{deny_reset} = 1; # loading can take a long time 1986 local $self->{deny_reset} = 1; # loading can take a long time
1777 1987
1778 my $path = $self->{path}; 1988 my $path = $self->{path};
1779 1989
1780 { 1990 {
1781 my $guard = cf::lock_acquire "map_load:$path"; 1991 my $guard = cf::lock_acquire "map_data:$path";
1782 1992
1993 return unless $self->valid;
1783 return if $self->in_memory != cf::MAP_SWAPPED; 1994 return unless $self->in_memory == cf::MAP_SWAPPED;
1784 1995
1785 $self->in_memory (cf::MAP_LOADING); 1996 $self->in_memory (cf::MAP_LOADING);
1786 1997
1787 $self->alloc; 1998 $self->alloc;
1788 1999
1789 $self->pre_load; 2000 $self->pre_load;
1790 Coro::cede; 2001 cf::cede_to_tick;
1791 2002
2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2004 $f->skip_block;
1792 $self->_load_objects ($self->{load_path}, 1) 2005 $self->_load_objects ($f)
1793 or return; 2006 or return;
1794 2007
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
1796 if delete $self->{load_original}; 2009 if delete $self->{load_original};
1797 2010
1798 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq; 2012 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) { 2013 unless (aio_stat $uniq) {
2014 if (my $f = new_from_file cf::object::thawer $uniq) {
1801 $self->clear_unique_items; 2015 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0); 2016 $self->_load_objects ($f);
2017 $f->resolve_delayed_derefs;
2018 }
1803 } 2019 }
1804 } 2020 }
1805 2021
1806 Coro::cede; 2022 $f->resolve_delayed_derefs;
2023
2024 cf::cede_to_tick;
1807 # now do the right thing for maps 2025 # now do the right thing for maps
1808 $self->link_multipart_objects; 2026 $self->link_multipart_objects;
1809 $self->difficulty ($self->estimate_difficulty) 2027 $self->difficulty ($self->estimate_difficulty)
1810 unless $self->difficulty; 2028 unless $self->difficulty;
1811 Coro::cede; 2029 cf::cede_to_tick;
1812 2030
1813 unless ($self->{deny_activate}) { 2031 unless ($self->{deny_activate}) {
1814 $self->decay_objects; 2032 $self->decay_objects;
1815 $self->fix_auto_apply; 2033 $self->fix_auto_apply;
1816 $self->update_buttons; 2034 $self->update_buttons;
1817 Coro::cede; 2035 cf::cede_to_tick;
1818 $self->set_darkness_map; 2036 $self->set_darkness_map;
1819 Coro::cede; 2037 cf::cede_to_tick;
1820 $self->activate; 2038 $self->activate;
1821 } 2039 }
1822 2040
2041 $self->{last_save} = $cf::RUNTIME;
2042 $self->last_access ($cf::RUNTIME);
2043
1823 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
1824 } 2045 }
1825 2046
1826 $self->post_load; 2047 $self->post_load;
1827} 2048}
1828 2049
1837 2058
1838 $self 2059 $self
1839} 2060}
1840 2061
1841# 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
1842sub load_diag { 2063sub load_neighbours {
1843 my ($map) = @_; 2064 my ($map) = @_;
1844 2065
1845 my @diag; # diagonal neighbours 2066 my @neigh; # diagonal neighbours
1846 2067
1847 for (0 .. 3) { 2068 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 2069 my $neigh = $map->tile_path ($_)
1849 or next; 2070 or next;
1850 $neigh = find $neigh, $map 2071 $neigh = find $neigh, $map
1851 or next; 2072 or next;
1852 $neigh->load; 2073 $neigh->load;
1853 2074
2075 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2076 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2077 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 2078 }
1857 2079
1858 for (@diag) { 2080 for (grep defined $_->[0], @neigh) {
2081 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 2082 my $neigh = find $path, $origin
1860 or next; 2083 or next;
1861 $neigh->load; 2084 $neigh->load;
1862 } 2085 }
1863} 2086}
1864 2087
1869} 2092}
1870 2093
1871sub do_load_sync { 2094sub do_load_sync {
1872 my ($map) = @_; 2095 my ($map) = @_;
1873 2096
2097 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2098 if $Coro::current == $Coro::main;
2099
1874 cf::sync_job { $map->load }; 2100 cf::sync_job { $map->load };
1875} 2101}
1876 2102
1877our %MAP_PREFETCH; 2103our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 2104our $MAP_PREFETCHER = undef;
1879 2105
1880sub find_async { 2106sub find_async {
1881 my ($path, $origin) = @_; 2107 my ($path, $origin, $load) = @_;
1882 2108
1883 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
1884 2110
1885 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1887 } 2113 }
1888 2114
1889 undef $MAP_PREFETCH{$path}; 2115 $MAP_PREFETCH{$path} |= $load;
2116
1890 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2118 $Coro::current->{desc} = "map prefetcher";
2119
1891 while (%MAP_PREFETCH) { 2120 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 2121 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 2122 if (my $map = find $k) {
1894 or next;
1895 $map->load; 2123 $map->load if $v;
2124 }
1896 2125
1897 delete $MAP_PREFETCH{$path}; 2126 delete $MAP_PREFETCH{$k};
1898 } 2127 }
1899 } 2128 }
1900 undef $MAP_PREFETCHER; 2129 undef $MAP_PREFETCHER;
1901 }; 2130 };
1902 $MAP_PREFETCHER->prio (6); 2131 $MAP_PREFETCHER->prio (6);
1905} 2134}
1906 2135
1907sub save { 2136sub save {
1908 my ($self) = @_; 2137 my ($self) = @_;
1909 2138
1910 my $lock = cf::lock_acquire "map_data:" . $self->path; 2139 my $lock = cf::lock_acquire "map_data:$self->{path}";
1911 2140
1912 $self->{last_save} = $cf::RUNTIME; 2141 $self->{last_save} = $cf::RUNTIME;
1913 2142
1914 return unless $self->dirty; 2143 return unless $self->dirty;
1915 2144
1921 return if $self->{deny_save}; 2150 return if $self->{deny_save};
1922 2151
1923 local $self->{last_access} = $self->last_access;#d# 2152 local $self->{last_access} = $self->last_access;#d#
1924 2153
1925 cf::async { 2154 cf::async {
2155 $Coro::current->{desc} = "map player save";
1926 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
1927 }; 2157 };
2158
2159 cf::get_slot 0.02;
1928 2160
1929 if ($uniq) { 2161 if ($uniq) {
1930 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1931 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1932 } else { 2164 } else {
1938 my ($self) = @_; 2170 my ($self) = @_;
1939 2171
1940 # save first because save cedes 2172 # save first because save cedes
1941 $self->save; 2173 $self->save;
1942 2174
1943 my $lock = cf::lock_acquire "map_data:" . $self->path; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
1944 2176
1945 return if $self->players; 2177 return if $self->players;
1946 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
1947 return if $self->{deny_save}; 2179 return if $self->{deny_save};
1948 2180
2181 $self->in_memory (cf::MAP_SWAPPED);
2182
2183 $self->deactivate;
2184 $_->clear_links_to ($self) for values %cf::MAP;
1949 $self->clear; 2185 $self->clear;
1950 $self->in_memory (cf::MAP_SWAPPED);
1951} 2186}
1952 2187
1953sub reset_at { 2188sub reset_at {
1954 my ($self) = @_; 2189 my ($self) = @_;
1955 2190
1987 if $uniq; 2222 if $uniq;
1988 } 2223 }
1989 2224
1990 delete $cf::MAP{$self->path}; 2225 delete $cf::MAP{$self->path};
1991 2226
2227 $self->deactivate;
2228 $_->clear_links_to ($self) for values %cf::MAP;
1992 $self->clear; 2229 $self->clear;
1993
1994 $_->clear_links_to ($self) for values %cf::MAP;
1995 2230
1996 $self->unlink_save; 2231 $self->unlink_save;
1997 $self->destroy; 2232 $self->destroy;
1998} 2233}
1999 2234
2000my $nuke_counter = "aaaa"; 2235my $nuke_counter = "aaaa";
2001 2236
2002sub nuke { 2237sub nuke {
2003 my ($self) = @_; 2238 my ($self) = @_;
2004 2239
2240 {
2241 my $lock = cf::lock_acquire "map_data:$self->{path}";
2242
2005 delete $cf::MAP{$self->path}; 2243 delete $cf::MAP{$self->path};
2006 2244
2007 $self->unlink_save; 2245 $self->unlink_save;
2008 2246
2009 bless $self, "cf::map"; 2247 bless $self, "cf::map";
2010 delete $self->{deny_reset}; 2248 delete $self->{deny_reset};
2011 $self->{deny_save} = 1; 2249 $self->{deny_save} = 1;
2012 $self->reset_timeout (1); 2250 $self->reset_timeout (1);
2013 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2251 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014 2252
2015 $cf::MAP{$self->path} = $self; 2253 $cf::MAP{$self->path} = $self;
2254 }
2016 2255
2017 $self->reset; # polite request, might not happen 2256 $self->reset; # polite request, might not happen
2018} 2257}
2019 2258
2020=item $maps = cf::map::tmp_maps 2259=item $maps = cf::map::tmp_maps
2062 2301
2063sub unique_maps() { 2302sub unique_maps() {
2064 [ 2303 [
2065 map { 2304 map {
2066 utf8::decode $_; 2305 utf8::decode $_;
2067 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2068 ? normalise $_ 2309 : normalise $_
2069 : ()
2070 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2071 ] 2311 ]
2072} 2312}
2073 2313
2074package cf;
2075
2076=back 2314=back
2077 2315
2078=head3 cf::object 2316=head3 cf::object
2079 2317
2080=cut 2318=cut
2083 2321
2084=over 4 2322=over 4
2085 2323
2086=item $ob->inv_recursive 2324=item $ob->inv_recursive
2087 2325
2088Returns 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.
2089 2328
2090=cut 2329=cut
2091 2330
2092sub inv_recursive_; 2331sub inv_recursive_;
2093sub inv_recursive_ { 2332sub inv_recursive_ {
2096 2335
2097sub inv_recursive { 2336sub inv_recursive {
2098 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2099} 2338}
2100 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
2101package cf; 2368package cf;
2102 2369
2103=back 2370=back
2104 2371
2105=head3 cf::object::player 2372=head3 cf::object::player
2111Sends 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>
2112can 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
2113dialogue with the given NPC character. 2380dialogue with the given NPC character.
2114 2381
2115=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};
2116 2397
2117# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2118# with dialog boxes. 2399# with dialog boxes.
2119#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
2120sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2127 2408
2128 } else { 2409 } else {
2129 my $pl = $self->contr; 2410 my $pl = $self->contr;
2130 2411
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2412 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2415
2140 } else { 2416 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2143 } 2419 }
2144 } 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 (@_);
2145} 2431}
2146 2432
2147=item $player_object->may ("access") 2433=item $player_object->may ("access")
2148 2434
2149Returns wether the given player is authorized to access resource "access" 2435Returns wether the given player is authorized to access resource "access"
2162 2448
2163=item $player_object->enter_link 2449=item $player_object->enter_link
2164 2450
2165Freezes 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}>).
2166 2452
2167The 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.
2168I<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.
2169 2457
2170Will never block. 2458Will never block.
2171 2459
2172=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2173 2461
2228 # use -1 or undef as default coordinates, not 0, 0 2516 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2517 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2518 if $x <=0 && $y <= 0;
2231 2519
2232 $map->load; 2520 $map->load;
2233 $map->load_diag; 2521 $map->load_neighbours;
2234 2522
2235 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2236 $self->activate_recursive; 2525 $self->activate_recursive;
2237 2526
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2240} 2529}
2241 2530
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2531=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2532
2244Moves 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
2245her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2246that 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
2247the 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 >>.
2248 2541
2249=cut 2542=cut
2250 2543
2251our $GOTOGEN; 2544our $GOTOGEN;
2252 2545
2253sub cf::object::player::goto { 2546sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2547 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2548
2256 # 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
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2550 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2551
2259 $self->enter_link; 2552 $self->enter_link;
2260 2553
2261 (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
2262 my $map = eval { 2576 my $map = eval {
2263 my $map = cf::map::find $path; 2577 my $map = defined $path ? cf::map::find $path : undef;
2264 2578
2265 if ($map) { 2579 if ($map) {
2266 $map = $map->customise_for ($self); 2580 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map; 2581 $map = $check->($map) if $check && $map;
2268 } else { 2582 } else {
2269 $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);
2270 } 2584 }
2271 2585
2272 $map 2586 $map
2273 }; 2587 };
2274 2588
2279 2593
2280 if ($gen == $self->{_goto_generation}) { 2594 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2595 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2596 $self->leave_link ($map, $x, $y);
2283 } 2597 }
2598
2599 $done->() if $done;
2284 })->prio (1); 2600 })->prio (1);
2285} 2601}
2286 2602
2287=item $player_object->enter_exit ($exit_object) 2603=item $player_object->enter_exit ($exit_object)
2288 2604
2308} 2624}
2309 2625
2310sub prepare_random_map { 2626sub prepare_random_map {
2311 my ($exit) = @_; 2627 my ($exit) = @_;
2312 2628
2313 my $guard = cf::lock_acquire "exit_prepare:$exit";
2314
2315 # all this does is basically replace the /! path by 2629 # all this does is basically replace the /! path by
2316 # a new random map path (?random/...) with a seed 2630 # a new random map path (?random/...) with a seed
2317 # that depends on the exit object 2631 # that depends on the exit object
2318 2632
2319 my $rmp = parse_random_map_params $exit->msg; 2633 my $rmp = parse_random_map_params $exit->msg;
2321 if ($exit->map) { 2635 if ($exit->map) {
2322 $rmp->{region} = $exit->region->name; 2636 $rmp->{region} = $exit->region->name;
2323 $rmp->{origin_map} = $exit->map->path; 2637 $rmp->{origin_map} = $exit->map->path;
2324 $rmp->{origin_x} = $exit->x; 2638 $rmp->{origin_x} = $exit->x;
2325 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2640
2641 $exit->map->touch;
2326 } 2642 }
2327 2643
2328 $rmp->{random_seed} ||= $exit->random_seed; 2644 $rmp->{random_seed} ||= $exit->random_seed;
2329 2645
2330 my $data = cf::to_json $rmp; 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2331 my $md5 = Digest::MD5::md5_hex $data; 2647 my $md5 = Digest::MD5::md5_hex $data;
2332 my $meta = "$RANDOMDIR/$md5.meta"; 2648 my $meta = "$RANDOMDIR/$md5.meta";
2333 2649
2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2650 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2335 aio_write $fh, 0, (length $data), $data, 0; 2651 aio_write $fh, 0, (length $data), $data, 0;
2336 undef $fh; 2652 undef $fh;
2337 aio_rename "$meta~", $meta; 2653 aio_rename "$meta~", $meta;
2338 2654
2655 my $slaying = "?random/$md5";
2656
2657 if ($exit->valid) {
2339 $exit->slaying ("?random/$md5"); 2658 $exit->slaying ("?random/$md5");
2340 $exit->msg (undef); 2659 $exit->msg (undef);
2660 }
2341 } 2661 }
2342} 2662}
2343 2663
2344sub cf::object::player::enter_exit { 2664sub cf::object::player::enter_exit {
2345 my ($self, $exit) = @_; 2665 my ($self, $exit) = @_;
2346 2666
2347 return unless $self->type == cf::PLAYER; 2667 return unless $self->type == cf::PLAYER;
2348 2668
2349 if ($exit->slaying eq "/!") {
2350 #TODO: this should de-fi-ni-te-ly not be a sync-job
2351 # the problem is that $exit might not survive long enough
2352 # so it needs to be done right now, right here
2353 cf::sync_job { prepare_random_map $exit };
2354 }
2355
2356 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2357 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp;
2359
2360 $self->enter_link; 2669 $self->enter_link;
2361 2670
2362 (async { 2671 (async {
2363 $self->deactivate_recursive; # just to be sure 2672 $Coro::current->{desc} = "enter_exit";
2673
2364 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
2365 $self->goto ($slaying, $hp, $sp); 2689 $self->goto ($map, $x, $y);
2366 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
2367 1; 2695 1
2368 }) { 2696 }) {
2369 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the deliantra server. "
2370 . "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. "
2371 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2372 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
2373 2701
2374 warn "ERROR in enter_exit: $@"; 2702 warn "ERROR in enter_exit: $@";
2393 2721
2394 utf8::encode $text; 2722 utf8::encode $text;
2395 $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);
2396} 2724}
2397 2725
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2726=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2727
2400Send 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
2401client 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
2402the 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
2403the message unless the client supports the msg packet. 2731the message unless the client supports the msg packet.
2404 2732
2405=cut 2733=cut
2406 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
2407sub cf::client::send_msg { 2793sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2795
2410 $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 }
2411 2820
2412 return unless @extra || length $msg; 2821 return unless @extra || length $msg;
2413 2822
2414 if ($self->can_msg) { 2823 if ($self->can_msg) {
2415 $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);
2416 } else { 2844 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 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
2428 if (0 && $msg =~ /\[/) { 2860 if (0 && $msg =~ /\[/) {
2861 # COMMAND/INFO
2429 $self->send_packet ("drawextinfo $color 4 0 $msg") 2862 $self->send_packet ("drawextinfo $color 10 8 $msg")
2430 } else { 2863 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2864 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg") 2865 $self->send_packet ("drawinfo $color $msg")
2433 } 2866 }
2434 } 2867 }
2435 } 2868 }
2436} 2869}
2437 2870
2438=item $client->ext_event ($type, %msg) 2871=item $client->ext_msg ($type, @msg)
2439 2872
2440Sends an ext event to the client. 2873Sends an ext event to the client.
2441 2874
2442=cut 2875=cut
2443 2876
2444sub cf::client::ext_event($$%) { 2877sub cf::client::ext_msg($$@) {
2445 my ($self, $type, %msg) = @_; 2878 my ($self, $type, @msg) = @_;
2446 2879
2880 if ($self->extcmd == 2) {
2881 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2882 } elsif ($self->extcmd == 1) { # TODO: remove
2447 $msg{msgtype} = "event_$type"; 2883 push @msg, msgtype => "event_$type";
2448 $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 }
2449} 2904}
2450 2905
2451=item $success = $client->query ($flags, "text", \&cb) 2906=item $success = $client->query ($flags, "text", \&cb)
2452 2907
2453Queues a query to the client, calling the given callback with 2908Queues a query to the client, calling the given callback with
2508 my ($ns, $buf) = @_; 2963 my ($ns, $buf) = @_;
2509 2964
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2965 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511 2966
2512 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
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2975 if (my $cb = $EXTICMD{$type}) {
2514 if (my %reply = $cb->($ns, $msg)) { 2976 @reply = $cb->($ns, @payload);
2515 $reply{msgid} = $msg->{msgid};
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517 }
2518 } 2977 }
2978
2979 $ns->ext_reply ($reply, @reply)
2980 if $reply;
2981
2519 } else { 2982 } else {
2520 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";
2521 } 2984 }
2522 2985
2523 cf::override; 2986 cf::override;
2570our $safe = new Safe "safe"; 3033our $safe = new Safe "safe";
2571our $safe_hole = new Safe::Hole; 3034our $safe_hole = new Safe::Hole;
2572 3035
2573$SIG{FPE} = 'IGNORE'; 3036$SIG{FPE} = 'IGNORE';
2574 3037
2575$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));
2576 3043
2577# here we export the classes and methods available to script code 3044# here we export the classes and methods available to script code
2578 3045
2579=pod 3046=pod
2580 3047
2581The following functions and methods are available within a safe environment: 3048The following functions and methods are available within a safe environment:
2582 3049
2583 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
2584 cf::object::player player 3054 cf::object::player
2585 cf::player peaceful 3055 player
2586 cf::map trigger 3056
3057 cf::player
3058 peaceful
3059
3060 cf::map
3061 trigger
2587 3062
2588=cut 3063=cut
2589 3064
2590for ( 3065for (
2591 ["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)],
2592 ["cf::object::player" => qw(player)], 3069 ["cf::object::player" => qw(player)],
2593 ["cf::player" => qw(peaceful)], 3070 ["cf::player" => qw(peaceful)],
2594 ["cf::map" => qw(trigger)], 3071 ["cf::map" => qw(trigger)],
2595) { 3072) {
2596 no strict 'refs'; 3073 no strict 'refs';
2672# the server's init and main functions 3149# the server's init and main functions
2673 3150
2674sub load_facedata($) { 3151sub load_facedata($) {
2675 my ($path) = @_; 3152 my ($path) = @_;
2676 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
2677 warn "loading facedata from $path\n"; 3160 warn "loading facedata from $path\n";
2678 3161
2679 my $facedata; 3162 my $facedata;
2680 0 < aio_load $path, $facedata 3163 0 < aio_load $path, $facedata
2681 or die "$path: $!"; 3164 or die "$path: $!";
2683 $facedata = Coro::Storable::thaw $facedata; 3166 $facedata = Coro::Storable::thaw $facedata;
2684 3167
2685 $facedata->{version} == 2 3168 $facedata->{version} == 2
2686 or cf::cleanup "$path: version mismatch, cannot proceed."; 3169 or cf::cleanup "$path: version mismatch, cannot proceed.";
2687 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
2688 { 3178 {
2689 my $faces = $facedata->{faceinfo}; 3179 my $faces = $facedata->{faceinfo};
2690 3180
2691 while (my ($face, $info) = each %$faces) { 3181 while (my ($face, $info) = each %$faces) {
2692 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3182 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183
2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3184 cf::face::set_visibility $idx, $info->{visibility};
3185 cf::face::set_magicmap $idx, $info->{magicmap};
2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2696 Coro::cede; 3188
3189 cf::cede_to_tick;
2697 } 3190 }
2698 3191
2699 while (my ($face, $info) = each %$faces) { 3192 while (my ($face, $info) = each %$faces) {
2700 next unless $info->{smooth}; 3193 next unless $info->{smooth};
3194
2701 my $idx = cf::face::find $face 3195 my $idx = cf::face::find $face
2702 or next; 3196 or next;
3197
2703 if (my $smooth = cf::face::find $info->{smooth}) { 3198 if (my $smooth = cf::face::find $info->{smooth}) {
3199 cf::face::set_smooth $idx, $smooth;
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705 } else { 3201 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3202 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 } 3203 }
2708 Coro::cede; 3204
3205 cf::cede_to_tick;
2709 } 3206 }
2710 } 3207 }
2711 3208
2712 { 3209 {
2713 my $anims = $facedata->{animinfo}; 3210 my $anims = $facedata->{animinfo};
2714 3211
2715 while (my ($anim, $info) = each %$anims) { 3212 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3213 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede; 3214 cf::cede_to_tick;
2718 } 3215 }
2719 3216
2720 cf::anim::invalidate_all; # d'oh 3217 cf::anim::invalidate_all; # d'oh
2721 } 3218 }
2722 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
2723 1 3255 1
2724} 3256}
2725 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
2726sub 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
2727 load_resource_file "$MAPDIR/regions" 3301 load_resource_file "$MAPDIR/regions"
2728 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 }
2729} 3308}
2730 3309
2731sub reload_facedata { 3310sub reload_facedata {
2732 load_facedata "$DATADIR/facedata" 3311 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n"; 3312 or die "unable to load facedata\n";
2734} 3313}
2735 3314
2736sub reload_archetypes { 3315sub reload_archetypes {
2737 load_resource_file "$DATADIR/archetypes" 3316 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n"; 3317 or die "unable to load archetypes\n";
2739 #d# NEED to laod twice to resolve forward references
2740 # this really needs to be done in an extra post-pass
2741 # (which needs to be synchronous, so solve it differently)
2742 load_resource_file "$DATADIR/archetypes"
2743 or die "unable to load archetypes\n";
2744} 3318}
2745 3319
2746sub reload_treasures { 3320sub reload_treasures {
2747 load_resource_file "$DATADIR/treasures" 3321 load_resource_file "$DATADIR/treasures"
2748 or die "unable to load treasurelists\n"; 3322 or die "unable to load treasurelists\n";
2749} 3323}
2750 3324
2751sub reload_resources { 3325sub reload_resources {
2752 warn "reloading resource files...\n"; 3326 warn "reloading resource files...\n";
2753 3327
3328 reload_facedata;
3329 reload_archetypes;
2754 reload_regions; 3330 reload_regions;
2755 reload_facedata;
2756 #reload_archetypes;#d#
2757 reload_archetypes;
2758 reload_treasures; 3331 reload_treasures;
2759 3332
2760 warn "finished reloading resource files\n"; 3333 warn "finished reloading resource files\n";
2761} 3334}
2762 3335
2763sub init { 3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
2764 reload_resources; 3341 reload_resources;
2765} 3342}
2766 3343
2767sub cfg_load { 3344sub reload_config {
2768 open my $fh, "<:utf8", "$CONFDIR/config" 3345 open my $fh, "<:utf8", "$CONFDIR/config"
2769 or return; 3346 or return;
2770 3347
2771 local $/; 3348 local $/;
2772 *CFG = YAML::Syck::Load <$fh>; 3349 *CFG = YAML::Load <$fh>;
2773 3350
2774 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2775 3352
2776 $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};
2777 $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};
2783 }; 3360 };
2784 warn $@ if $@; 3361 warn $@ if $@;
2785 } 3362 }
2786} 3363}
2787 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
2788sub main { 3384sub main {
3385 atomic;
3386
2789 # we must not ever block the main coroutine 3387 # we must not ever block the main coroutine
2790 local $Coro::idle = sub { 3388 local $Coro::idle = sub {
2791 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#
2792 (async { 3390 (async {
2793 Event::one_event; 3391 $Coro::current->{desc} = "IDLE BUG HANDLER";
3392 EV::loop EV::LOOP_ONESHOT;
2794 })->prio (Coro::PRIO_MAX); 3393 })->prio (Coro::PRIO_MAX);
2795 }; 3394 };
2796 3395
2797 cfg_load; 3396 {
3397 my $guard = freeze_mainloop;
3398 reload_config;
2798 db_init; 3399 db_init;
2799 load_extensions; 3400 load_extensions;
2800 3401
2801 $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
2802 Event::loop; 3410 EV::loop;
2803} 3411}
2804 3412
2805############################################################################# 3413#############################################################################
2806# initialisation and cleanup 3414# initialisation and cleanup
2807 3415
2808# install some emergency cleanup handlers 3416# install some emergency cleanup handlers
2809BEGIN { 3417BEGIN {
3418 our %SIGWATCHER = ();
2810 for my $signal (qw(INT HUP TERM)) { 3419 for my $signal (qw(INT HUP TERM)) {
2811 Event->signal ( 3420 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2812 reentrant => 0,
2813 data => WF_AUTOCANCEL,
2814 signal => $signal,
2815 prio => 0,
2816 cb => sub {
2817 cf::cleanup "SIG$signal"; 3421 cf::cleanup "SIG$signal";
2818 },
2819 ); 3422 };
2820 } 3423 }
2821} 3424}
2822 3425
2823sub write_runtime { 3426sub write_runtime_sync {
2824 my $runtime = "$LOCALDIR/runtime";
2825
2826 # first touch the runtime file to show we are still running: 3427 # first touch the runtime file to show we are still running:
2827 # the fsync below can take a very very long time. 3428 # the fsync below can take a very very long time.
2828 3429
2829 IO::AIO::aio_utime $runtime, undef, undef; 3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2830 3431
2831 my $guard = cf::lock_acquire "write_runtime"; 3432 my $guard = cf::lock_acquire "write_runtime";
2832 3433
2833 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2834 or return; 3435 or return;
2835 3436
2836 my $value = $cf::RUNTIME + 90 + 10; 3437 my $value = $cf::RUNTIME + 90 + 10;
2837 # 10 is the runtime save interval, for a monotonic clock 3438 # 10 is the runtime save interval, for a monotonic clock
2838 # 60 allows for the watchdog to kill the server. 3439 # 60 allows for the watchdog to kill the server.
2848 aio_utime $fh, undef, undef; 3449 aio_utime $fh, undef, undef;
2849 3450
2850 close $fh 3451 close $fh
2851 or return; 3452 or return;
2852 3453
2853 aio_rename "$runtime~", $runtime 3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2854 and return; 3455 and return;
2855 3456
2856 warn "runtime file written.\n"; 3457 warn "runtime file written.\n";
2857 3458
2858 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 };
2859} 3503}
2860 3504
2861sub emergency_save() { 3505sub emergency_save() {
2862 my $freeze_guard = cf::freeze_mainloop; 3506 my $freeze_guard = cf::freeze_mainloop;
2863 3507
2869 # and maps saved/destroyed asynchronously. 3513 # and maps saved/destroyed asynchronously.
2870 warn "begin emergency player save\n"; 3514 warn "begin emergency player save\n";
2871 for my $login (keys %cf::PLAYER) { 3515 for my $login (keys %cf::PLAYER) {
2872 my $pl = $cf::PLAYER{$login} or next; 3516 my $pl = $cf::PLAYER{$login} or next;
2873 $pl->valid or next; 3517 $pl->valid or next;
3518 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2874 $pl->save; 3519 $pl->save;
2875 } 3520 }
2876 warn "end emergency player save\n"; 3521 warn "end emergency player save\n";
2877 3522
2878 warn "begin emergency map save\n"; 3523 warn "begin emergency map save\n";
2884 warn "end emergency map save\n"; 3529 warn "end emergency map save\n";
2885 3530
2886 warn "begin emergency database checkpoint\n"; 3531 warn "begin emergency database checkpoint\n";
2887 BDB::db_env_txn_checkpoint $DB_ENV; 3532 BDB::db_env_txn_checkpoint $DB_ENV;
2888 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";
2889 }; 3538 };
2890 3539
2891 warn "leave emergency perl save\n"; 3540 warn "leave emergency perl save\n";
2892} 3541}
2893 3542
2894sub post_cleanup { 3543sub post_cleanup {
2895 my ($make_core) = @_; 3544 my ($make_core) = @_;
2896 3545
2897 warn Carp::longmess "post_cleanup backtrace" 3546 warn Carp::longmess "post_cleanup backtrace"
2898 if $make_core; 3547 if $make_core;
3548
3549 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$;
2899} 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
2900 3580
2901sub do_reload_perl() { 3581sub do_reload_perl() {
2902 # can/must only be called in main 3582 # can/must only be called in main
2903 if ($Coro::current != $Coro::main) { 3583 if ($Coro::current != $Coro::main) {
2904 warn "can only reload from main coroutine"; 3584 warn "can only reload from main coroutine";
2905 return; 3585 return;
2906 } 3586 }
2907 3587
3588 return if $RELOAD++;
3589
3590 while ($RELOAD) {
2908 warn "reloading..."; 3591 warn "reloading...";
2909 3592
2910 warn "entering sync_job"; 3593 warn "entering sync_job";
2911 3594
2912 cf::sync_job { 3595 cf::sync_job {
2913 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
2914 cf::emergency_save; 3597 cf::emergency_save;
2915 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
2916 3599
2917 warn "syncing database to disk"; 3600 warn "syncing database to disk";
2918 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
2919 3602
2920 # 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
2921 3604
2922 warn "cancelling all WF_AUTOCANCEL watchers";
2923 for (Event::all_watchers) {
2924 $_->cancel if $_->data & WF_AUTOCANCEL;
2925 }
2926
2927 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
2928 for (;;) {
2929 BDB::flush;
2930 IO::AIO::flush;
2931 Coro::cede;
2932 last unless IO::AIO::nreqs || BDB::nreqs; 3606 while (IO::AIO::nreqs || BDB::nreqs) {
2933 warn "iterate..."; 3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2934 }
2935
2936 ++$RELOAD;
2937
2938 warn "cancelling all extension coros";
2939 $_->cancel for values %EXT_CORO;
2940 %EXT_CORO = ();
2941
2942 warn "removing commands";
2943 %COMMAND = ();
2944
2945 warn "removing ext/exti commands";
2946 %EXTCMD = ();
2947 %EXTICMD = ();
2948
2949 warn "unloading/nuking all extensions";
2950 for my $pkg (@EXTS) {
2951 warn "... unloading $pkg";
2952
2953 if (my $cb = $pkg->can ("unload")) {
2954 eval {
2955 $cb->($pkg);
2956 1
2957 } or warn "$pkg unloaded, but with errors: $@";
2958 } 3608 }
2959 3609
2960 warn "... nuking $pkg"; 3610 warn "cancelling all extension coros";
2961 Symbol::delete_package $pkg; 3611 $_->cancel for values %EXT_CORO;
2962 } 3612 %EXT_CORO = ();
2963 3613
2964 warn "unloading all perl modules loaded from $LIBDIR"; 3614 warn "removing commands";
2965 while (my ($k, $v) = each %INC) { 3615 %COMMAND = ();
2966 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2967 3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
2968 warn "... unloading $k"; 3623 warn "... unloading $pkg";
2969 delete $INC{$k};
2970 3624
2971 $k =~ s/\.pm$//;
2972 $k =~ s/\//::/g;
2973
2974 if (my $cb = $k->can ("unload_module")) { 3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
2975 $cb->(); 3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 }
3631
3632 warn "... clearing $pkg";
3633 clear_package $pkg;
2976 } 3634 }
2977 3635
2978 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;
2979 } 3651 }
2980 3652
2981 warn "getting rid of safe::, as good as possible"; 3653 warn "getting rid of safe::, as good as possible";
2982 Symbol::delete_package "safe::$_" 3654 clear_package "safe::$_"
2983 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);
2984 3656
2985 warn "unloading cf.pm \"a bit\""; 3657 warn "unloading cf.pm \"a bit\"";
2986 delete $INC{"cf.pm"}; 3658 delete $INC{"cf.pm"};
2987 delete $INC{"cf/pod.pm"}; 3659 delete $INC{"cf/pod.pm"};
2988 3660
2989 # don't, removes xs symbols, too, 3661 # don't, removes xs symbols, too,
2990 # and global variables created in xs 3662 # and global variables created in xs
2991 #Symbol::delete_package __PACKAGE__; 3663 #clear_package __PACKAGE__;
2992 3664
2993 warn "unload completed, starting to reload now"; 3665 warn "unload completed, starting to reload now";
2994 3666
2995 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
2996 require cf; 3668 require cf;
2997 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2998 3670
2999 warn "loading config and database again"; 3671 warn "loading config and database again";
3000 cf::cfg_load; 3672 cf::reload_config;
3001 3673
3002 warn "loading extensions"; 3674 warn "loading extensions";
3003 cf::load_extensions; 3675 cf::load_extensions;
3004 3676
3005 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3006 _global_reattach; # objects, sockets 3678 _global_reattach; # objects, sockets
3007 warn "reattaching attachments to maps"; 3679 warn "reattaching attachments to maps";
3008 reattach $_ for values %MAP; 3680 reattach $_ for values %MAP;
3009 warn "reattaching attachments to players"; 3681 warn "reattaching attachments to players";
3010 reattach $_ for values %PLAYER; 3682 reattach $_ for values %PLAYER;
3011 3683
3012 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3013 3685
3014 1 3686 1
3015 } or do { 3687 } or do {
3016 warn $@; 3688 warn $@;
3017 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3018 exit 1;
3019 }; 3690 };
3020 3691
3021 warn "reloaded"; 3692 warn "reloaded";
3693 --$RELOAD;
3694 }
3022}; 3695};
3023 3696
3024our $RELOAD_WATCHER; # used only during reload 3697our $RELOAD_WATCHER; # used only during reload
3025 3698
3026sub reload_perl() { 3699sub reload_perl() {
3027 # doing reload synchronously and two reloads happen back-to-back, 3700 # doing reload synchronously and two reloads happen back-to-back,
3028 # coro crashes during coro_state_free->destroy here. 3701 # coro crashes during coro_state_free->destroy here.
3029 3702
3030 $RELOAD_WATCHER ||= Event->timer ( 3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3031 reentrant => 0,
3032 after => 0,
3033 data => WF_AUTOCANCEL,
3034 cb => sub {
3035 do_reload_perl; 3704 do_reload_perl;
3036 undef $RELOAD_WATCHER; 3705 undef $RELOAD_WATCHER;
3037 },
3038 ); 3706 };
3039} 3707}
3040 3708
3041register_command "reload" => sub { 3709register_command "reload" => sub {
3042 my ($who, $arg) = @_; 3710 my ($who, $arg) = @_;
3043 3711
3044 if ($who->flag (FLAG_WIZ)) { 3712 if ($who->flag (FLAG_WIZ)) {
3045 $who->message ("reloading server."); 3713 $who->message ("reloading server.");
3714 async {
3715 $Coro::current->{desc} = "perl_reload";
3046 async { reload_perl }; 3716 reload_perl;
3717 };
3047 } 3718 }
3048}; 3719};
3049 3720
3050unshift @INC, $LIBDIR; 3721unshift @INC, $LIBDIR;
3051 3722
3053 3724
3054our @WAIT_FOR_TICK; 3725our @WAIT_FOR_TICK;
3055our @WAIT_FOR_TICK_BEGIN; 3726our @WAIT_FOR_TICK_BEGIN;
3056 3727
3057sub wait_for_tick { 3728sub wait_for_tick {
3058 return unless $TICK_WATCHER->is_active;
3059 return if $Coro::current == $Coro::main; 3729 return if tick_inhibit || $Coro::current == $Coro::main;
3060 3730
3061 my $signal = new Coro::Signal; 3731 my $signal = new Coro::Signal;
3062 push @WAIT_FOR_TICK, $signal; 3732 push @WAIT_FOR_TICK, $signal;
3063 $signal->wait; 3733 $signal->wait;
3064} 3734}
3065 3735
3066sub wait_for_tick_begin { 3736sub wait_for_tick_begin {
3067 return unless $TICK_WATCHER->is_active;
3068 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3069 3738
3070 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3071 push @WAIT_FOR_TICK_BEGIN, $signal; 3740 push @WAIT_FOR_TICK_BEGIN, $signal;
3072 $signal->wait; 3741 $signal->wait;
3073} 3742}
3074 3743
3075 my $min = 1e6;#d# 3744sub tick {
3076 my $avg = 10;
3077$TICK_WATCHER = Event->timer (
3078 reentrant => 0,
3079 parked => 1,
3080 prio => 0,
3081 at => $NEXT_TICK || $TICK,
3082 data => WF_AUTOCANCEL,
3083 cb => sub {
3084 if ($Coro::current != $Coro::main) { 3745 if ($Coro::current != $Coro::main) {
3085 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"
3086 unless ++$bug_warning > 10; 3747 unless ++$bug_warning > 10;
3087 return; 3748 return;
3088 } 3749 }
3089 3750
3090 $NOW = $tick_start = Event::time;
3091
3092 cf::server_tick; # one server iteration 3751 cf::server_tick; # one server iteration
3093 3752
3094 0 && sync_job {#d# 3753 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3095 for(1..10) { 3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3096 my $t = Event::time; 3755 Coro::async_pool {
3097 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3756 $Coro::current->{desc} = "runtime saver";
3098 or die; 3757 write_runtime_sync
3099 3758 or warn "ERROR: unable to write runtime file: $!";
3100 $map->width (50);
3101 $map->height (50);
3102 $map->alloc;
3103 $map->_load_objects ("/tmp/x.map", 1);
3104 my $t = Event::time - $t;
3105
3106 #next unless $t < 0.0013;#d#
3107 if ($t < $min) {
3108 $min = $t;
3109 }
3110 $avg = $avg * 0.99 + $t * 0.01;
3111 }
3112 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3113 exit 0;
3114 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3115 }; 3759 };
3760 }
3116 3761
3117 $RUNTIME += $TICK;
3118 $NEXT_TICK += $TICK;
3119
3120 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 $NEXT_RUNTIME_WRITE = $NOW + 10;
3122 Coro::async_pool {
3123 write_runtime
3124 or warn "ERROR: unable to write runtime file: $!";
3125 };
3126 }
3127
3128# my $AFTER = Event::time;
3129# warn $AFTER - $NOW;#d#
3130
3131 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3132 $sig->send; 3763 $sig->send;
3133 } 3764 }
3134 while (my $sig = shift @WAIT_FOR_TICK) { 3765 while (my $sig = shift @WAIT_FOR_TICK) {
3135 $sig->send; 3766 $sig->send;
3136 } 3767 }
3137 3768
3138 $NOW = Event::time; 3769 $LOAD = ($NOW - $TICK_START) / $TICK;
3139
3140 # if we are delayed by four ticks or more, skip them all
3141 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3142
3143 $TICK_WATCHER->at ($NEXT_TICK);
3144 $TICK_WATCHER->start;
3145
3146 $LOAD = ($NOW - $tick_start) / $TICK;
3147 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3148 3771
3149 _post_tick; 3772 if (0) {
3150 3773 if ($NEXT_TICK) {
3151 3774 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d#
3777 }
3152 }, 3778 }
3153); 3779}
3154 3780
3155{ 3781{
3156 BDB::max_poll_time $TICK * 0.1; 3782 # configure BDB
3157 $BDB_POLL_WATCHER = Event->io ( 3783
3158 reentrant => 0,
3159 fd => BDB::poll_fileno,
3160 poll => 'r',
3161 prio => 0,
3162 data => WF_AUTOCANCEL,
3163 cb => \&BDB::poll_cb,
3164 );
3165 BDB::min_parallel 8; 3784 BDB::min_parallel 8;
3166 3785 BDB::max_poll_reqs $TICK * 0.1;
3167 BDB::set_sync_prepare { 3786 $AnyEvent::BDB::WATCHER->priority (1);
3168 my $status;
3169 my $current = $Coro::current;
3170 (
3171 sub {
3172 $status = $!;
3173 $current->ready; undef $current;
3174 },
3175 sub {
3176 Coro::schedule while defined $current;
3177 $! = $status;
3178 },
3179 )
3180 };
3181 3787
3182 unless ($DB_ENV) { 3788 unless ($DB_ENV) {
3183 $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);
3184 3795
3185 cf::sync_job { 3796 cf::sync_job {
3186 eval { 3797 eval {
3187 BDB::db_env_open 3798 BDB::db_env_open
3188 $DB_ENV, 3799 $DB_ENV,
3190 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
3191 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3802 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3192 0666; 3803 0666;
3193 3804
3194 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3805 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3195
3196 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3197 $DB_ENV->set_lk_detect;
3198 }; 3806 };
3199 3807
3200 cf::cleanup "db_env_open(db): $@" if $@; 3808 cf::cleanup "db_env_open(db): $@" if $@;
3201 }; 3809 };
3202 } 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 };
3203} 3821}
3204 3822
3205{ 3823{
3824 # configure IO::AIO
3825
3206 IO::AIO::min_parallel 8; 3826 IO::AIO::min_parallel 8;
3207
3208 undef $Coro::AIO::WATCHER;
3209 IO::AIO::max_poll_time $TICK * 0.1; 3827 IO::AIO::max_poll_time $TICK * 0.1;
3210 $AIO_POLL_WATCHER = Event->io ( 3828 undef $AnyEvent::AIO::WATCHER;
3211 reentrant => 0,
3212 data => WF_AUTOCANCEL,
3213 fd => IO::AIO::poll_fileno,
3214 poll => 'r',
3215 prio => 6,
3216 cb => \&IO::AIO::poll_cb,
3217 );
3218} 3829}
3219 3830
3220my $_log_backtrace; 3831my $_log_backtrace;
3221 3832
3222sub _log_backtrace { 3833sub _log_backtrace {
3225 $msg =~ s/\n//; 3836 $msg =~ s/\n//;
3226 3837
3227 # limit the # of concurrent backtraces 3838 # limit the # of concurrent backtraces
3228 if ($_log_backtrace < 2) { 3839 if ($_log_backtrace < 2) {
3229 ++$_log_backtrace; 3840 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg;
3230 async { 3842 async {
3843 $Coro::current->{desc} = "abt $msg";
3844
3231 my @bt = fork_call { 3845 my @bt = fork_call {
3232 @addr = map { sprintf "%x", $_ } @addr; 3846 @addr = map { sprintf "%x", $_ } @addr;
3233 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3847 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3234 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 |"
3235 or die "addr2line: $!"; 3849 or die "addr2line: $!";
3243 } 3857 }
3244 3858
3245 @funcs 3859 @funcs
3246 }; 3860 };
3247 3861
3248 LOG llevInfo, "[ABT] $msg\n"; 3862 LOG llevInfo, "[ABT] $perl_bt\n";
3863 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3249 LOG llevInfo, "[ABT] $_\n" for @bt; 3864 LOG llevInfo, "[ABT] $_\n" for @bt;
3250 --$_log_backtrace; 3865 --$_log_backtrace;
3251 }; 3866 };
3252 } else { 3867 } else {
3253 LOG llevInfo, "[ABT] $msg\n"; 3868 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines