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.299 by root, Sun Jul 8 14:56:05 2007 UTC vs.
Revision 1.449 by root, Sat Sep 20 00:09:27 2008 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines