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.300 by root, Tue Jul 10 06:44:29 2007 UTC vs.
Revision 1.450 by root, Mon Sep 22 01:33:09 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
68
69$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
70
71# make sure c-lzf reinitialises itself
72Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
39Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 73Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 74
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 76
50our %COMMAND = (); 77our %COMMAND = ();
51our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
57our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
58 85
59our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
60our @EVENT; 87our @EVENT;
61 88
62our $CONFDIR = confdir; 89our $CONFDIR = confdir;
63our $DATADIR = datadir; 90our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
73 104
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 107our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
81 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 113our $DB_ENV;
84 114
85our %CFG; 115our %CFG;
86 116
87our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 118our $RUNTIME;
119our $NOW;
89 120
90our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
93 124
94# used to convert map paths into valid unix filenames by replacing / by ∕ 125# used to convert map paths into valid unix filenames by replacing / by ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 127
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
100 132
101binmode STDOUT; 133binmode STDOUT;
102binmode STDERR; 134binmode STDERR;
103 135
104# read virtual server time, if available 136# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
109} 141}
110 142
111mkdir $_ 143mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
157 189
158The raw value load value from the last tick. 190The raw value load value from the last tick.
159 191
160=item %cf::CFG 192=item %cf::CFG
161 193
162Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 195from wherever your confdir points to.
164 196
165=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
166 198
167These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 199These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
168returns directly I<after> the tick processing (and consequently, can only wake one process 200returns directly I<after> the tick processing (and consequently, can only wake one process
169per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 201per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
170 202
203=item @cf::INVOKE_RESULTS
204
205This array contains the results of the last C<invoke ()> call. When
206C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
207that call.
208
171=back 209=back
172 210
173=cut 211=cut
174 212
175BEGIN { 213BEGIN {
179 $msg .= "\n" 217 $msg .= "\n"
180 unless $msg =~ /\n$/; 218 unless $msg =~ /\n$/;
181 219
182 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 220 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
183 221
184 utf8::encode $msg;
185 LOG llevError, $msg; 222 LOG llevError, $msg;
186 }; 223 };
187} 224}
225
226$Coro::State::DIEHOOK = sub {
227 return unless $^S eq 0; # "eq", not "=="
228
229 if ($Coro::current == $Coro::main) {#d#
230 warn "DIEHOOK called in main context, Coro bug?\n";#d#
231 return;#d#
232 }#d#
233
234 # kill coroutine otherwise
235 warn Carp::longmess $_[0];
236 Coro::terminate
237};
238
239$SIG{__DIE__} = sub { }; #d#?
188 240
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 251for my $pkg (qw(
200 cf::global cf::attachable 252 cf::global cf::attachable
201 cf::object cf::object::player 253 cf::object cf::object::player
202 cf::client cf::player 254 cf::client cf::player
203 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
204 cf::map cf::party cf::region 257 cf::party cf::region
205)) { 258)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 260}
209 261
210$Event::DIED = sub { 262$EV::DIED = sub {
211 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
212}; 264};
213 265
214############################################################################# 266#############################################################################
215 267
238 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 290 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
239 $d 291 $d
240 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
241} 293}
242 294
243=item $ref = cf::from_json $json 295=item $ref = cf::decode_json $json
244 296
245Converts a JSON string into the corresponding perl data structure. 297Converts a JSON string into the corresponding perl data structure.
246 298
247=item $json = cf::to_json $ref 299=item $json = cf::encode_json $ref
248 300
249Converts a perl data structure into its JSON representation. 301Converts a perl data structure into its JSON representation.
250 302
251=cut 303=cut
252 304
253our $json_coder = JSON::XS->new->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 warn $_;#d#
1441 $_
1442}
1443
1444sub hintmode {
1445 $_[0]{hintmode} = $_[1] if @_ > 1;
1446 $_[0]{hintmode}
1447}
1448
1449=item $player->ext_reply ($msgid, %msg) 1634=item $player->ext_reply ($msgid, @msg)
1450 1635
1451Sends an ext reply to the player. 1636Sends an ext reply to the player.
1452 1637
1453=cut 1638=cut
1454 1639
1455sub ext_reply($$%) { 1640sub ext_reply($$@) {
1456 my ($self, $id, %msg) = @_; 1641 my ($self, $id, @msg) = @_;
1457 1642
1458 $msg{msgid} = $id; 1643 $self->ns->ext_reply ($id, @msg)
1459 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1460} 1644}
1461 1645
1462=item $player->ext_event ($type, %msg) 1646=item $player->ext_msg ($type, @msg)
1463 1647
1464Sends an ext event to the client. 1648Sends an ext event to the client.
1465 1649
1466=cut 1650=cut
1467 1651
1468sub ext_event($$%) { 1652sub ext_msg($$@) {
1469 my ($self, $type, %msg) = @_; 1653 my ($self, $type, @msg) = @_;
1470 1654
1471 $self->ns->ext_event ($type, %msg); 1655 $self->ns->ext_msg ($type, @msg);
1472} 1656}
1473 1657
1474=head3 cf::region 1658=head3 cf::region
1475 1659
1476=over 4 1660=over 4
1489 my ($path) = @_; 1673 my ($path) = @_;
1490 1674
1491 my ($match, $specificity); 1675 my ($match, $specificity);
1492 1676
1493 for my $region (list) { 1677 for my $region (list) {
1494 if ($region->match && $path =~ $region->match) { 1678 if ($region->{match} && $path =~ $region->{match}) {
1495 ($match, $specificity) = ($region, $region->specificity) 1679 ($match, $specificity) = ($region, $region->specificity)
1496 if $region->specificity > $specificity; 1680 if $region->specificity > $specificity;
1497 } 1681 }
1498 } 1682 }
1499 1683
1520our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1521our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1522 1706
1523sub generate_random_map { 1707sub generate_random_map {
1524 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
1525 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1526 $self->_create_random_map ( 1713 $self->_create_random_map (
1527 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1528 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1529 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1619 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1620 return $self; 1807 return $self;
1621 } 1808 }
1622 } 1809 }
1623 1810
1624 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1625 () 1812 ()
1626} 1813}
1627 1814
1628sub init { 1815sub init {
1629 my ($self) = @_; 1816 my ($self) = @_;
1651 1838
1652# the temporary/swap location 1839# the temporary/swap location
1653sub save_path { 1840sub save_path {
1654 my ($self) = @_; 1841 my ($self) = @_;
1655 1842
1656 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1657 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1658} 1845}
1659 1846
1660# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1661sub uniq_path { 1848sub uniq_path {
1662 my ($self) = @_; 1849 my ($self) = @_;
1663 1850
1664 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1665 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1666} 1853}
1667 1854
1668# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1669# all maps in C++... 1856# all maps in C++...
1692 1879
1693sub load_header_from($) { 1880sub load_header_from($) {
1694 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1695 1882
1696 utf8::encode $path; 1883 utf8::encode $path;
1697 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1698 # or return;
1699
1700 $self->_load_header ($path)
1701 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;
1702 1892
1703 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1704 1894
1705 1 1895 1
1706} 1896}
1760sub find { 1950sub find {
1761 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1762 1952
1763 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1764 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1765 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1766 1957
1767 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1768 my $guard = cf::lock_acquire "map_find:$path"; 1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1769 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1770 or return; 1963 or return;
1771 1964
1772 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1773 1966
1775 or return; 1968 or return;
1776 1969
1777 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1778 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1779 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1780 $map->reset; 1975 $map->reset;
1781 undef $guard;
1782 return find $path; 1976 return find $path;
1783 } 1977 }
1784 1978
1785 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1786 } 1980 }
1795 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1796 1990
1797 my $path = $self->{path}; 1991 my $path = $self->{path};
1798 1992
1799 { 1993 {
1800 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1801 1995
1996 return unless $self->valid;
1802 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1803 1998
1804 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1805 2000
1806 $self->alloc; 2001 $self->alloc;
1807 2002
1808 $self->pre_load; 2003 $self->pre_load;
1809 Coro::cede; 2004 cf::cede_to_tick;
1810 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1811 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1812 or return; 2009 or return;
1813 2010
1814 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1815 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1816 2013
1817 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1818 utf8::encode $uniq; 2015 utf8::encode $uniq;
1819 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1820 $self->clear_unique_items; 2018 $self->clear_unique_items;
1821 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1822 } 2022 }
1823 } 2023 }
1824 2024
1825 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1826 # now do the right thing for maps 2028 # now do the right thing for maps
1827 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1828 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1829 unless $self->difficulty; 2031 unless $self->difficulty;
1830 Coro::cede; 2032 cf::cede_to_tick;
1831 2033
1832 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1833 $self->decay_objects; 2035 $self->decay_objects;
1834 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1835 $self->update_buttons; 2037 $self->update_buttons;
1836 Coro::cede; 2038 cf::cede_to_tick;
1837 $self->set_darkness_map; 2039 $self->set_darkness_map;
1838 Coro::cede; 2040 cf::cede_to_tick;
1839 $self->activate; 2041 $self->activate;
1840 } 2042 }
1841 2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
2046
1842 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1843 } 2048 }
1844 2049
1845 $self->post_load; 2050 $self->post_load;
1846} 2051}
1847 2052
1856 2061
1857 $self 2062 $self
1858} 2063}
1859 2064
1860# 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
1861sub load_diag { 2066sub load_neighbours {
1862 my ($map) = @_; 2067 my ($map) = @_;
1863 2068
1864 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1865 2070
1866 for (0 .. 3) { 2071 for (0 .. 3) {
1867 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1868 or next; 2073 or next;
1869 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1870 or next; 2075 or next;
1871 $neigh->load; 2076 $neigh->load;
1872 2077
2078 push @neigh,
1873 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1874 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1875 } 2081 }
1876 2082
1877 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1878 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1879 or next; 2086 or next;
1880 $neigh->load; 2087 $neigh->load;
1881 } 2088 }
1882} 2089}
1883 2090
1888} 2095}
1889 2096
1890sub do_load_sync { 2097sub do_load_sync {
1891 my ($map) = @_; 2098 my ($map) = @_;
1892 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1893 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1894} 2104}
1895 2105
1896our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1897our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1898 2108
1899sub find_async { 2109sub find_async {
1900 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1901 2111
1902 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1903 2113
1904 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1905 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1906 } 2116 }
1907 2117
1908 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1909 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1910 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1911 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1912 my $map = find $path 2125 if (my $map = find $k) {
1913 or next;
1914 $map->load; 2126 $map->load if $v;
2127 }
1915 2128
1916 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1917 } 2130 }
1918 } 2131 }
1919 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1920 }; 2133 };
1921 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
1924} 2137}
1925 2138
1926sub save { 2139sub save {
1927 my ($self) = @_; 2140 my ($self) = @_;
1928 2141
1929 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1930 2143
1931 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1932 2145
1933 return unless $self->dirty; 2146 return unless $self->dirty;
1934 2147
1940 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1941 2154
1942 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1943 2156
1944 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1945 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1946 }; 2160 };
2161
2162 cf::get_slot 0.02;
1947 2163
1948 if ($uniq) { 2164 if ($uniq) {
1949 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1950 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1951 } else { 2167 } else {
1957 my ($self) = @_; 2173 my ($self) = @_;
1958 2174
1959 # save first because save cedes 2175 # save first because save cedes
1960 $self->save; 2176 $self->save;
1961 2177
1962 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
1963 2179
1964 return if $self->players; 2180 return if $self->players;
1965 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
1966 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1967 2183
2184 $self->in_memory (cf::MAP_SWAPPED);
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1968 $self->clear; 2188 $self->clear;
1969 $self->in_memory (cf::MAP_SWAPPED);
1970} 2189}
1971 2190
1972sub reset_at { 2191sub reset_at {
1973 my ($self) = @_; 2192 my ($self) = @_;
1974 2193
2006 if $uniq; 2225 if $uniq;
2007 } 2226 }
2008 2227
2009 delete $cf::MAP{$self->path}; 2228 delete $cf::MAP{$self->path};
2010 2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
2011 $self->clear; 2232 $self->clear;
2012
2013 $_->clear_links_to ($self) for values %cf::MAP;
2014 2233
2015 $self->unlink_save; 2234 $self->unlink_save;
2016 $self->destroy; 2235 $self->destroy;
2017} 2236}
2018 2237
2019my $nuke_counter = "aaaa"; 2238my $nuke_counter = "aaaa";
2020 2239
2021sub nuke { 2240sub nuke {
2022 my ($self) = @_; 2241 my ($self) = @_;
2023 2242
2243 {
2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245
2024 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
2025 2247
2026 $self->unlink_save; 2248 $self->unlink_save;
2027 2249
2028 bless $self, "cf::map"; 2250 bless $self, "cf::map";
2029 delete $self->{deny_reset}; 2251 delete $self->{deny_reset};
2030 $self->{deny_save} = 1; 2252 $self->{deny_save} = 1;
2031 $self->reset_timeout (1); 2253 $self->reset_timeout (1);
2032 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2033 2255
2034 $cf::MAP{$self->path} = $self; 2256 $cf::MAP{$self->path} = $self;
2257 }
2035 2258
2036 $self->reset; # polite request, might not happen 2259 $self->reset; # polite request, might not happen
2037} 2260}
2038 2261
2039=item $maps = cf::map::tmp_maps 2262=item $maps = cf::map::tmp_maps
2081 2304
2082sub unique_maps() { 2305sub unique_maps() {
2083 [ 2306 [
2084 map { 2307 map {
2085 utf8::decode $_; 2308 utf8::decode $_;
2086 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2087 ? normalise $_ 2312 : normalise $_
2088 : ()
2089 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2090 ] 2314 ]
2091} 2315}
2092 2316
2093package cf;
2094
2095=back 2317=back
2096 2318
2097=head3 cf::object 2319=head3 cf::object
2098 2320
2099=cut 2321=cut
2102 2324
2103=over 4 2325=over 4
2104 2326
2105=item $ob->inv_recursive 2327=item $ob->inv_recursive
2106 2328
2107Returns 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.
2108 2331
2109=cut 2332=cut
2110 2333
2111sub inv_recursive_; 2334sub inv_recursive_;
2112sub inv_recursive_ { 2335sub inv_recursive_ {
2115 2338
2116sub inv_recursive { 2339sub inv_recursive {
2117 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2118} 2341}
2119 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
2120package cf; 2371package cf;
2121 2372
2122=back 2373=back
2123 2374
2124=head3 cf::object::player 2375=head3 cf::object::player
2130Sends 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>
2131can 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
2132dialogue with the given NPC character. 2383dialogue with the given NPC character.
2133 2384
2134=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};
2135 2400
2136# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2137# with dialog boxes. 2402# with dialog boxes.
2138#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
2139sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2146 2411
2147 } else { 2412 } else {
2148 my $pl = $self->contr; 2413 my $pl = $self->contr;
2149 2414
2150 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2151 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2152 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2153 $diag->{id},
2154 msgtype => "reply",
2155 msg => $diag->{pl}->expand_cfpod ($msg),
2156 add_topics => []
2157 );
2158 2418
2159 } else { 2419 } else {
2160 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2161 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2162 } 2422 }
2163 } 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 (@_);
2164} 2434}
2165 2435
2166=item $player_object->may ("access") 2436=item $player_object->may ("access")
2167 2437
2168Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
2181 2451
2182=item $player_object->enter_link 2452=item $player_object->enter_link
2183 2453
2184Freezes 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}>).
2185 2455
2186The 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.
2187I<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.
2188 2460
2189Will never block. 2461Will never block.
2190 2462
2191=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2192 2464
2247 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2248 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2249 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2250 2522
2251 $map->load; 2523 $map->load;
2252 $map->load_diag; 2524 $map->load_neighbours;
2253 2525
2254 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2255 $self->activate_recursive; 2528 $self->activate_recursive;
2256 2529
2257 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2258 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2259} 2532}
2260 2533
2261=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2262 2535
2263Moves 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
2264her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2265that 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
2266the 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 >>.
2267 2544
2268=cut 2545=cut
2269 2546
2270our $GOTOGEN; 2547our $GOTOGEN;
2271 2548
2272sub cf::object::player::goto { 2549sub cf::object::player::goto {
2273 my ($self, $path, $x, $y, $check) = @_; 2550 my ($self, $path, $x, $y, $check, $done) = @_;
2274 2551
2275 # 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
2276 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2277 2554
2278 $self->enter_link; 2555 $self->enter_link;
2279 2556
2280 (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
2281 my $map = eval { 2579 my $map = eval {
2282 my $map = cf::map::find $path; 2580 my $map = defined $path ? cf::map::find $path : undef;
2283 2581
2284 if ($map) { 2582 if ($map) {
2285 $map = $map->customise_for ($self); 2583 $map = $map->customise_for ($self);
2286 $map = $check->($map) if $check && $map; 2584 $map = $check->($map) if $check && $map;
2287 } else { 2585 } else {
2288 $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);
2289 } 2587 }
2290 2588
2291 $map 2589 $map
2292 }; 2590 };
2293 2591
2298 2596
2299 if ($gen == $self->{_goto_generation}) { 2597 if ($gen == $self->{_goto_generation}) {
2300 delete $self->{_goto_generation}; 2598 delete $self->{_goto_generation};
2301 $self->leave_link ($map, $x, $y); 2599 $self->leave_link ($map, $x, $y);
2302 } 2600 }
2601
2602 $done->() if $done;
2303 })->prio (1); 2603 })->prio (1);
2304} 2604}
2305 2605
2306=item $player_object->enter_exit ($exit_object) 2606=item $player_object->enter_exit ($exit_object)
2307 2607
2327} 2627}
2328 2628
2329sub prepare_random_map { 2629sub prepare_random_map {
2330 my ($exit) = @_; 2630 my ($exit) = @_;
2331 2631
2332 my $guard = cf::lock_acquire "exit_prepare:$exit";
2333
2334 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2335 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2336 # that depends on the exit object 2634 # that depends on the exit object
2337 2635
2338 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2340 if ($exit->map) { 2638 if ($exit->map) {
2341 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2342 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2343 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2344 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2345 } 2645 }
2346 2646
2347 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2348 2648
2349 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2350 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2351 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2352 2652
2353 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2354 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2355 undef $fh; 2655 undef $fh;
2356 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2357 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2358 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2359 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2360 } 2664 }
2361} 2665}
2362 2666
2363sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2364 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2365 2669
2366 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2367 2671
2368 if ($exit->slaying eq "/!") {
2369 #TODO: this should de-fi-ni-te-ly not be a sync-job
2370 # the problem is that $exit might not survive long enough
2371 # so it needs to be done right now, right here
2372 cf::sync_job { prepare_random_map $exit };
2373 }
2374
2375 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2376 my $hp = $exit->stats->hp;
2377 my $sp = $exit->stats->sp;
2378
2379 $self->enter_link; 2672 $self->enter_link;
2380 2673
2381 # if exit is damned, update players death & WoR home-position
2382 $self->contr->savebed ($slaying, $hp, $sp)
2383 if $exit->flag (FLAG_DAMNED);
2384
2385 (async { 2674 (async {
2386 $self->deactivate_recursive; # just to be sure 2675 $Coro::current->{desc} = "enter_exit";
2676
2387 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
2388 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2389 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
2390 1; 2698 1
2391 }) { 2699 }) {
2392 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2393 . "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. "
2394 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2395 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2396 2704
2397 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2416 2724
2417 utf8::encode $text; 2725 utf8::encode $text;
2418 $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);
2419} 2727}
2420 2728
2421=item $client->send_msg ($color, $type, $msg, [extra...]) 2729=item $client->send_msg ($channel, $msg, $color, [extra...])
2422 2730
2423Send 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
2424client 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
2425the 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
2426the message unless the client supports the msg packet. 2734the message unless the client supports the msg packet.
2427 2735
2428=cut 2736=cut
2429 2737
2738# non-persistent channels (usually the info channel)
2739our %CHANNEL = (
2740 "c/identify" => {
2741 id => "infobox",
2742 title => "Identify",
2743 reply => undef,
2744 tooltip => "Items recently identified",
2745 },
2746 "c/examine" => {
2747 id => "infobox",
2748 title => "Examine",
2749 reply => undef,
2750 tooltip => "Signs and other items you examined",
2751 },
2752 "c/book" => {
2753 id => "infobox",
2754 title => "Book",
2755 reply => undef,
2756 tooltip => "The contents of a note or book",
2757 },
2758 "c/lookat" => {
2759 id => "infobox",
2760 title => "Look",
2761 reply => undef,
2762 tooltip => "What you saw there",
2763 },
2764 "c/who" => {
2765 id => "infobox",
2766 title => "Players",
2767 reply => undef,
2768 tooltip => "Shows players who are currently online",
2769 },
2770 "c/body" => {
2771 id => "infobox",
2772 title => "Body Parts",
2773 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available",
2775 },
2776 "c/skills" => {
2777 id => "infobox",
2778 title => "Skills",
2779 reply => undef,
2780 tooltip => "Shows your experience per skill and item power",
2781 },
2782 "c/uptime" => {
2783 id => "infobox",
2784 title => "Uptime",
2785 reply => undef,
2786 tooltip => "How long the server has been running since last restart",
2787 },
2788 "c/mapinfo" => {
2789 id => "infobox",
2790 title => "Map Info",
2791 reply => undef,
2792 tooltip => "Information related to the maps",
2793 },
2794 "c/party" => {
2795 id => "party",
2796 title => "Party",
2797 reply => "gsay ",
2798 tooltip => "Messages and chat related to your party",
2799 },
2800);
2801
2430sub cf::client::send_msg { 2802sub cf::client::send_msg {
2431 my ($self, $color, $type, $msg, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2432 2804
2433 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2807
2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2819 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825 }
2826
2827 $channel = $channel->{id};
2828 }
2434 2829
2435 return unless @extra || length $msg; 2830 return unless @extra || length $msg;
2436 2831
2437 if ($self->can_msg) { 2832 if ($self->can_msg) {
2438 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 2833 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF;
2836
2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 );
2841
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt);
2439 } else { 2853 } else {
2440 # replace some tags by gcfclient-compatible ones
2441 for ($msg) {
2442 1 while
2443 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2444 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2445 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2446 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2447 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2448 }
2449
2450 if ($color >= 0) { 2854 if ($color >= 0) {
2855 # replace some tags by gcfclient-compatible ones
2856 for ($msg) {
2857 1 while
2858 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2859 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2860 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2861 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2862 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2863 }
2864
2865 $color &= cf::NDI_COLOR_MASK;
2866
2867 utf8::encode $msg;
2868
2451 if (0 && $msg =~ /\[/) { 2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2452 $self->send_packet ("drawextinfo $color 4 0 $msg") 2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2453 } else { 2872 } else {
2454 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2455 $self->send_packet ("drawinfo $color $msg") 2874 $self->send_packet ("drawinfo $color $msg")
2456 } 2875 }
2457 } 2876 }
2458 } 2877 }
2459} 2878}
2460 2879
2461=item $client->ext_event ($type, %msg) 2880=item $client->ext_msg ($type, @msg)
2462 2881
2463Sends an ext event to the client. 2882Sends an ext event to the client.
2464 2883
2465=cut 2884=cut
2466 2885
2467sub cf::client::ext_event($$%) { 2886sub cf::client::ext_msg($$@) {
2468 my ($self, $type, %msg) = @_; 2887 my ($self, $type, @msg) = @_;
2469 2888
2889 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove
2470 $msg{msgtype} = "event_$type"; 2892 push @msg, msgtype => "event_$type";
2471 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 }
2895}
2896
2897=item $client->ext_reply ($msgid, @msg)
2898
2899Sends an ext reply to the client.
2900
2901=cut
2902
2903sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_;
2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 }
2472} 2913}
2473 2914
2474=item $success = $client->query ($flags, "text", \&cb) 2915=item $success = $client->query ($flags, "text", \&cb)
2475 2916
2476Queues a query to the client, calling the given callback with 2917Queues a query to the client, calling the given callback with
2531 my ($ns, $buf) = @_; 2972 my ($ns, $buf) = @_;
2532 2973
2533 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2974 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2534 2975
2535 if (ref $msg) { 2976 if (ref $msg) {
2977 my ($type, $reply, @payload) =
2978 "ARRAY" eq ref $msg
2979 ? @$msg
2980 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2981
2982 my @reply;
2983
2536 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 2984 if (my $cb = $EXTICMD{$type}) {
2537 if (my %reply = $cb->($ns, $msg)) { 2985 @reply = $cb->($ns, @payload);
2538 $reply{msgid} = $msg->{msgid};
2539 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2540 }
2541 } 2986 }
2987
2988 $ns->ext_reply ($reply, @reply)
2989 if $reply;
2990
2542 } else { 2991 } else {
2543 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2544 } 2993 }
2545 2994
2546 cf::override; 2995 cf::override;
2593our $safe = new Safe "safe"; 3042our $safe = new Safe "safe";
2594our $safe_hole = new Safe::Hole; 3043our $safe_hole = new Safe::Hole;
2595 3044
2596$SIG{FPE} = 'IGNORE'; 3045$SIG{FPE} = 'IGNORE';
2597 3046
2598$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3047$safe->permit_only (Opcode::opset qw(
3048 :base_core :base_mem :base_orig :base_math
3049 grepstart grepwhile mapstart mapwhile
3050 sort time
3051));
2599 3052
2600# here we export the classes and methods available to script code 3053# here we export the classes and methods available to script code
2601 3054
2602=pod 3055=pod
2603 3056
2604The following functions and methods are available within a safe environment: 3057The following functions and methods are available within a safe environment:
2605 3058
2606 cf::object 3059 cf::object
2607 contr pay_amount pay_player map x y force_find force_add 3060 contr pay_amount pay_player map x y force_find force_add destroy
2608 insert remove 3061 insert remove name archname title slaying race decrease split
2609 3062
2610 cf::object::player 3063 cf::object::player
2611 player 3064 player
2612 3065
2613 cf::player 3066 cf::player
2618 3071
2619=cut 3072=cut
2620 3073
2621for ( 3074for (
2622 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2623 insert remove)], 3076 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)],
2624 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
2625 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
2626 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
2627) { 3081) {
2628 no strict 'refs'; 3082 no strict 'refs';
2704# the server's init and main functions 3158# the server's init and main functions
2705 3159
2706sub load_facedata($) { 3160sub load_facedata($) {
2707 my ($path) = @_; 3161 my ($path) = @_;
2708 3162
3163 # HACK to clear player env face cache, we need some signal framework
3164 # for this (global event?)
3165 %ext::player_env::MUSIC_FACE_CACHE = ();
3166
3167 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3168
2709 warn "loading facedata from $path\n"; 3169 warn "loading facedata from $path\n";
2710 3170
2711 my $facedata; 3171 my $facedata;
2712 0 < aio_load $path, $facedata 3172 0 < aio_load $path, $facedata
2713 or die "$path: $!"; 3173 or die "$path: $!";
2715 $facedata = Coro::Storable::thaw $facedata; 3175 $facedata = Coro::Storable::thaw $facedata;
2716 3176
2717 $facedata->{version} == 2 3177 $facedata->{version} == 2
2718 or cf::cleanup "$path: version mismatch, cannot proceed."; 3178 or cf::cleanup "$path: version mismatch, cannot proceed.";
2719 3179
3180 # patch in the exptable
3181 $facedata->{resource}{"res/exp_table"} = {
3182 type => FT_RSRC,
3183 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3184 };
3185 cf::cede_to_tick;
3186
2720 { 3187 {
2721 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
2722 3189
2723 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
2724 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
2725 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3193 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap};
2726 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2727 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2728 Coro::cede; 3197
3198 cf::cede_to_tick;
2729 } 3199 }
2730 3200
2731 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2732 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
2733 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
2734 or next; 3205 or next;
3206
2735 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth;
2736 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2737 } else { 3210 } else {
2738 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
2739 } 3212 }
2740 Coro::cede; 3213
3214 cf::cede_to_tick;
2741 } 3215 }
2742 } 3216 }
2743 3217
2744 { 3218 {
2745 my $anims = $facedata->{animinfo}; 3219 my $anims = $facedata->{animinfo};
2746 3220
2747 while (my ($anim, $info) = each %$anims) { 3221 while (my ($anim, $info) = each %$anims) {
2748 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3222 cf::anim::set $anim, $info->{frames}, $info->{facings};
2749 Coro::cede; 3223 cf::cede_to_tick;
2750 } 3224 }
2751 3225
2752 cf::anim::invalidate_all; # d'oh 3226 cf::anim::invalidate_all; # d'oh
2753 } 3227 }
2754 3228
3229 {
3230 # TODO: for gcfclient pleasure, we should give resources
3231 # that gcfclient doesn't grok a >10000 face index.
3232 my $res = $facedata->{resource};
3233
3234 while (my ($name, $info) = each %$res) {
3235 if (defined $info->{type}) {
3236 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3237 my $data;
3238
3239 if ($info->{type} & 1) {
3240 # prepend meta info
3241
3242 my $meta = $enc->encode ({
3243 name => $name,
3244 %{ $info->{meta} || {} },
3245 });
3246
3247 $data = pack "(w/a*)*", $meta, $info->{data};
3248 } else {
3249 $data = $info->{data};
3250 }
3251
3252 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3253 cf::face::set_type $idx, $info->{type};
3254 } else {
3255 $RESOURCE{$name} = $info;
3256 }
3257
3258 cf::cede_to_tick;
3259 }
3260 }
3261
3262 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3263
2755 1 3264 1
2756} 3265}
2757 3266
3267cf::global->attach (on_resource_update => sub {
3268 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3269 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3270
3271 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3272 my $sound = $soundconf->{compat}[$_]
3273 or next;
3274
3275 my $face = cf::face::find "sound/$sound->[1]";
3276 cf::sound::set $sound->[0] => $face;
3277 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3278 }
3279
3280 while (my ($k, $v) = each %{$soundconf->{event}}) {
3281 my $face = cf::face::find "sound/$v";
3282 cf::sound::set $k => $face;
3283 }
3284 }
3285});
3286
3287register_exticmd fx_want => sub {
3288 my ($ns, $want) = @_;
3289
3290 while (my ($k, $v) = each %$want) {
3291 $ns->fx_want ($k, $v);
3292 }
3293};
3294
3295sub load_resource_file($) {
3296 my $guard = lock_acquire "load_resource_file";
3297
3298 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100;
3300 cf::arch::commit_load;
3301
3302 $status
3303}
3304
2758sub reload_regions { 3305sub reload_regions {
3306 # HACK to clear player env face cache, we need some signal framework
3307 # for this (global event?)
3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3309
2759 load_resource_file "$MAPDIR/regions" 3310 load_resource_file "$MAPDIR/regions"
2760 or die "unable to load regions file\n"; 3311 or die "unable to load regions file\n";
3312
3313 for (cf::region::list) {
3314 $_->{match} = qr/$_->{match}/
3315 if exists $_->{match};
3316 }
2761} 3317}
2762 3318
2763sub reload_facedata { 3319sub reload_facedata {
2764 load_facedata "$DATADIR/facedata" 3320 load_facedata "$DATADIR/facedata"
2765 or die "unable to load facedata\n"; 3321 or die "unable to load facedata\n";
2766} 3322}
2767 3323
2768sub reload_archetypes { 3324sub reload_archetypes {
2769 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
2770 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
2771 #d# NEED to laod twice to resolve forward references
2772 # this really needs to be done in an extra post-pass
2773 # (which needs to be synchronous, so solve it differently)
2774 load_resource_file "$DATADIR/archetypes"
2775 or die "unable to load archetypes\n";
2776} 3327}
2777 3328
2778sub reload_treasures { 3329sub reload_treasures {
2779 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
2780 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
2781} 3332}
2782 3333
2783sub reload_resources { 3334sub reload_resources {
2784 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
2785 3336
3337 reload_facedata;
3338 reload_archetypes;
2786 reload_regions; 3339 reload_regions;
2787 reload_facedata;
2788 #reload_archetypes;#d#
2789 reload_archetypes;
2790 reload_treasures; 3340 reload_treasures;
2791 3341
2792 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
2793} 3343}
2794 3344
2795sub init { 3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
2796 reload_resources; 3350 reload_resources;
2797} 3351}
2798 3352
2799sub cfg_load { 3353sub reload_config {
2800 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
2801 or return; 3355 or return;
2802 3356
2803 local $/; 3357 local $/;
2804 *CFG = YAML::Syck::Load <$fh>; 3358 *CFG = YAML::Load <$fh>;
2805 3359
2806 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2807 3361
2808 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3362 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2809 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3363 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2815 }; 3369 };
2816 warn $@ if $@; 3370 warn $@ if $@;
2817 } 3371 }
2818} 3372}
2819 3373
3374sub pidfile() {
3375 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3376 or die "$PIDFILE: $!";
3377 flock $fh, &Fcntl::LOCK_EX
3378 or die "$PIDFILE: flock: $!";
3379 $fh
3380}
3381
3382# make sure only one server instance is running at any one time
3383sub atomic {
3384 my $fh = pidfile;
3385
3386 my $pid = <$fh>;
3387 kill 9, $pid if $pid > 0;
3388
3389 seek $fh, 0, 0;
3390 print $fh $$;
3391}
3392
2820sub main { 3393sub main {
3394 atomic;
3395
2821 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
2822 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
2823 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3398 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2824 (async { 3399 (async {
2825 Event::one_event; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT;
2826 })->prio (Coro::PRIO_MAX); 3402 })->prio (Coro::PRIO_MAX);
2827 }; 3403 };
2828 3404
2829 cfg_load; 3405 {
3406 my $guard = freeze_mainloop;
3407 reload_config;
2830 db_init; 3408 db_init;
2831 load_extensions; 3409 load_extensions;
2832 3410
2833 $TICK_WATCHER->start; 3411 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3412 }
3413
3414 utime time, time, $RUNTIMEFILE;
3415
3416 # no (long-running) fork's whatsoever before this point(!)
3417 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3418
2834 Event::loop; 3419 EV::loop;
2835} 3420}
2836 3421
2837############################################################################# 3422#############################################################################
2838# initialisation and cleanup 3423# initialisation and cleanup
2839 3424
2840# install some emergency cleanup handlers 3425# install some emergency cleanup handlers
2841BEGIN { 3426BEGIN {
3427 our %SIGWATCHER = ();
2842 for my $signal (qw(INT HUP TERM)) { 3428 for my $signal (qw(INT HUP TERM)) {
2843 Event->signal ( 3429 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2844 reentrant => 0,
2845 data => WF_AUTOCANCEL,
2846 signal => $signal,
2847 prio => 0,
2848 cb => sub {
2849 cf::cleanup "SIG$signal"; 3430 cf::cleanup "SIG$signal";
2850 },
2851 ); 3431 };
2852 } 3432 }
2853} 3433}
2854 3434
2855sub write_runtime { 3435sub write_runtime_sync {
2856 my $runtime = "$LOCALDIR/runtime";
2857
2858 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
2859 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
2860 3438
2861 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2862 3440
2863 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
2864 3442
2865 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2866 or return; 3444 or return;
2867 3445
2868 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
2869 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
2870 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
2880 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
2881 3459
2882 close $fh 3460 close $fh
2883 or return; 3461 or return;
2884 3462
2885 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2886 and return; 3464 and return;
2887 3465
2888 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
2889 3467
2890 1 3468 1
3469}
3470
3471our $uuid_lock;
3472our $uuid_skip;
3473
3474sub write_uuid_sync($) {
3475 $uuid_skip ||= $_[0];
3476
3477 return if $uuid_lock;
3478 local $uuid_lock = 1;
3479
3480 my $uuid = "$LOCALDIR/uuid";
3481
3482 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3483 or return;
3484
3485 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3486 $uuid_skip = 0;
3487
3488 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3489 and return;
3490
3491 # always fsync - this file is important
3492 aio_fsync $fh
3493 and return;
3494
3495 close $fh
3496 or return;
3497
3498 aio_rename "$uuid~", $uuid
3499 and return;
3500
3501 warn "uuid file written ($value).\n";
3502
3503 1
3504
3505}
3506
3507sub write_uuid($$) {
3508 my ($skip, $sync) = @_;
3509
3510 $sync ? write_uuid_sync $skip
3511 : async { write_uuid_sync $skip };
2891} 3512}
2892 3513
2893sub emergency_save() { 3514sub emergency_save() {
2894 my $freeze_guard = cf::freeze_mainloop; 3515 my $freeze_guard = cf::freeze_mainloop;
2895 3516
2901 # and maps saved/destroyed asynchronously. 3522 # and maps saved/destroyed asynchronously.
2902 warn "begin emergency player save\n"; 3523 warn "begin emergency player save\n";
2903 for my $login (keys %cf::PLAYER) { 3524 for my $login (keys %cf::PLAYER) {
2904 my $pl = $cf::PLAYER{$login} or next; 3525 my $pl = $cf::PLAYER{$login} or next;
2905 $pl->valid or next; 3526 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2906 $pl->save; 3528 $pl->save;
2907 } 3529 }
2908 warn "end emergency player save\n"; 3530 warn "end emergency player save\n";
2909 3531
2910 warn "begin emergency map save\n"; 3532 warn "begin emergency map save\n";
2916 warn "end emergency map save\n"; 3538 warn "end emergency map save\n";
2917 3539
2918 warn "begin emergency database checkpoint\n"; 3540 warn "begin emergency database checkpoint\n";
2919 BDB::db_env_txn_checkpoint $DB_ENV; 3541 BDB::db_env_txn_checkpoint $DB_ENV;
2920 warn "end emergency database checkpoint\n"; 3542 warn "end emergency database checkpoint\n";
3543
3544 warn "begin write uuid\n";
3545 write_uuid_sync 1;
3546 warn "end write uuid\n";
2921 }; 3547 };
2922 3548
2923 warn "leave emergency perl save\n"; 3549 warn "leave emergency perl save\n";
2924} 3550}
2925 3551
2926sub post_cleanup { 3552sub post_cleanup {
2927 my ($make_core) = @_; 3553 my ($make_core) = @_;
2928 3554
2929 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
2930 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
2931} 3560}
3561
3562# a safer delete_package, copied from Symbol
3563sub clear_package($) {
3564 my $pkg = shift;
3565
3566 # expand to full symbol table name if needed
3567 unless ($pkg =~ /^main::.*::$/) {
3568 $pkg = "main$pkg" if $pkg =~ /^::/;
3569 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3570 $pkg .= '::' unless $pkg =~ /::$/;
3571 }
3572
3573 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3574 my $stem_symtab = *{$stem}{HASH};
3575
3576 defined $stem_symtab and exists $stem_symtab->{$leaf}
3577 or return;
3578
3579 # clear all symbols
3580 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3581 for my $name (keys %$leaf_symtab) {
3582 _gv_clear *{"$pkg$name"};
3583# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3584 }
3585 warn "cleared package #$pkg\n";#d#
3586}
3587
3588our $RELOAD; # how many times to reload
2932 3589
2933sub do_reload_perl() { 3590sub do_reload_perl() {
2934 # can/must only be called in main 3591 # can/must only be called in main
2935 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
2936 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
2937 return; 3594 return;
2938 } 3595 }
2939 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
2940 warn "reloading..."; 3600 warn "reloading...";
2941 3601
2942 warn "entering sync_job"; 3602 warn "entering sync_job";
2943 3603
2944 cf::sync_job { 3604 cf::sync_job {
2945 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
2946 cf::emergency_save; 3606 cf::emergency_save;
2947 cf::write_runtime; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
2948 3608
2949 warn "syncing database to disk"; 3609 warn "syncing database to disk";
2950 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
2951 3611
2952 # if anything goes wrong in here, we should simply crash as we already saved 3612 # if anything goes wrong in here, we should simply crash as we already saved
2953 3613
2954 warn "cancelling all WF_AUTOCANCEL watchers";
2955 for (Event::all_watchers) {
2956 $_->cancel if $_->data & WF_AUTOCANCEL;
2957 }
2958
2959 warn "flushing outstanding aio requests"; 3614 warn "flushing outstanding aio requests";
2960 for (;;) {
2961 BDB::flush;
2962 IO::AIO::flush;
2963 Coro::cede;
2964 last unless IO::AIO::nreqs || BDB::nreqs; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
2965 warn "iterate..."; 3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2966 }
2967
2968 ++$RELOAD;
2969
2970 warn "cancelling all extension coros";
2971 $_->cancel for values %EXT_CORO;
2972 %EXT_CORO = ();
2973
2974 warn "removing commands";
2975 %COMMAND = ();
2976
2977 warn "removing ext/exti commands";
2978 %EXTCMD = ();
2979 %EXTICMD = ();
2980
2981 warn "unloading/nuking all extensions";
2982 for my $pkg (@EXTS) {
2983 warn "... unloading $pkg";
2984
2985 if (my $cb = $pkg->can ("unload")) {
2986 eval {
2987 $cb->($pkg);
2988 1
2989 } or warn "$pkg unloaded, but with errors: $@";
2990 } 3617 }
2991 3618
2992 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
2993 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
2994 } 3621 %EXT_CORO = ();
2995 3622
2996 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
2997 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
2998 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2999 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
3000 warn "... unloading $k"; 3632 warn "... unloading $pkg";
3001 delete $INC{$k};
3002 3633
3003 $k =~ s/\.pm$//;
3004 $k =~ s/\//::/g;
3005
3006 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
3007 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
3008 } 3643 }
3009 3644
3010 Symbol::delete_package $k; 3645 warn "unloading all perl modules loaded from $LIBDIR";
3646 while (my ($k, $v) = each %INC) {
3647 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3648
3649 warn "... unloading $k";
3650 delete $INC{$k};
3651
3652 $k =~ s/\.pm$//;
3653 $k =~ s/\//::/g;
3654
3655 if (my $cb = $k->can ("unload_module")) {
3656 $cb->();
3657 }
3658
3659 clear_package $k;
3011 } 3660 }
3012 3661
3013 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
3014 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
3015 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3664 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3016 3665
3017 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
3018 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
3019 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
3020 3669
3021 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
3022 # and global variables created in xs 3671 # and global variables created in xs
3023 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
3024 3673
3025 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
3026 3675
3027 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
3028 require cf; 3677 require cf;
3029 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3030 3679
3031 warn "loading config and database again"; 3680 warn "loading config and database again";
3032 cf::cfg_load; 3681 cf::reload_config;
3033 3682
3034 warn "loading extensions"; 3683 warn "loading extensions";
3035 cf::load_extensions; 3684 cf::load_extensions;
3036 3685
3037 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
3038 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
3039 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
3040 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
3041 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
3042 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
3043 3692
3044 warn "leaving sync_job"; 3693 warn "leaving sync_job";
3045 3694
3046 1 3695 1
3047 } or do { 3696 } or do {
3048 warn $@; 3697 warn $@;
3049 warn "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
3050 exit 1;
3051 }; 3699 };
3052 3700
3053 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
3054}; 3704};
3055 3705
3056our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
3057 3707
3058sub reload_perl() { 3708sub reload_perl() {
3059 # doing reload synchronously and two reloads happen back-to-back, 3709 # doing reload synchronously and two reloads happen back-to-back,
3060 # coro crashes during coro_state_free->destroy here. 3710 # coro crashes during coro_state_free->destroy here.
3061 3711
3062 $RELOAD_WATCHER ||= Event->timer ( 3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3063 reentrant => 0,
3064 after => 0,
3065 data => WF_AUTOCANCEL,
3066 cb => sub {
3067 do_reload_perl; 3713 do_reload_perl;
3068 undef $RELOAD_WATCHER; 3714 undef $RELOAD_WATCHER;
3069 },
3070 ); 3715 };
3071} 3716}
3072 3717
3073register_command "reload" => sub { 3718register_command "reload" => sub {
3074 my ($who, $arg) = @_; 3719 my ($who, $arg) = @_;
3075 3720
3076 if ($who->flag (FLAG_WIZ)) { 3721 if ($who->flag (FLAG_WIZ)) {
3077 $who->message ("reloading server."); 3722 $who->message ("reloading server.");
3723 async {
3724 $Coro::current->{desc} = "perl_reload";
3078 async { reload_perl }; 3725 reload_perl;
3726 };
3079 } 3727 }
3080}; 3728};
3081 3729
3082unshift @INC, $LIBDIR; 3730unshift @INC, $LIBDIR;
3083 3731
3085 3733
3086our @WAIT_FOR_TICK; 3734our @WAIT_FOR_TICK;
3087our @WAIT_FOR_TICK_BEGIN; 3735our @WAIT_FOR_TICK_BEGIN;
3088 3736
3089sub wait_for_tick { 3737sub wait_for_tick {
3090 return unless $TICK_WATCHER->is_active;
3091 return if $Coro::current == $Coro::main; 3738 return if tick_inhibit || $Coro::current == $Coro::main;
3092 3739
3093 my $signal = new Coro::Signal; 3740 my $signal = new Coro::Signal;
3094 push @WAIT_FOR_TICK, $signal; 3741 push @WAIT_FOR_TICK, $signal;
3095 $signal->wait; 3742 $signal->wait;
3096} 3743}
3097 3744
3098sub wait_for_tick_begin { 3745sub wait_for_tick_begin {
3099 return unless $TICK_WATCHER->is_active;
3100 return if $Coro::current == $Coro::main; 3746 return if tick_inhibit || $Coro::current == $Coro::main;
3101 3747
3102 my $signal = new Coro::Signal; 3748 my $signal = new Coro::Signal;
3103 push @WAIT_FOR_TICK_BEGIN, $signal; 3749 push @WAIT_FOR_TICK_BEGIN, $signal;
3104 $signal->wait; 3750 $signal->wait;
3105} 3751}
3106 3752
3107 my $min = 1e6;#d# 3753sub tick {
3108 my $avg = 10;
3109$TICK_WATCHER = Event->timer (
3110 reentrant => 0,
3111 parked => 1,
3112 prio => 0,
3113 at => $NEXT_TICK || $TICK,
3114 data => WF_AUTOCANCEL,
3115 cb => sub {
3116 if ($Coro::current != $Coro::main) { 3754 if ($Coro::current != $Coro::main) {
3117 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3755 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3118 unless ++$bug_warning > 10; 3756 unless ++$bug_warning > 10;
3119 return; 3757 return;
3120 } 3758 }
3121 3759
3122 $NOW = $tick_start = Event::time;
3123
3124 cf::server_tick; # one server iteration 3760 cf::server_tick; # one server iteration
3125 3761
3126 0 && sync_job {#d# 3762 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3127 for(1..10) { 3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3128 my $t = Event::time; 3764 Coro::async_pool {
3129 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3765 $Coro::current->{desc} = "runtime saver";
3130 or die; 3766 write_runtime_sync
3131 3767 or warn "ERROR: unable to write runtime file: $!";
3132 $map->width (50);
3133 $map->height (50);
3134 $map->alloc;
3135 $map->_load_objects ("/tmp/x.map", 1);
3136 my $t = Event::time - $t;
3137
3138 #next unless $t < 0.0013;#d#
3139 if ($t < $min) {
3140 $min = $t;
3141 }
3142 $avg = $avg * 0.99 + $t * 0.01;
3143 }
3144 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3145 exit 0;
3146 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3147 }; 3768 };
3769 }
3148 3770
3149 $RUNTIME += $TICK;
3150 $NEXT_TICK += $TICK;
3151
3152 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3153 $NEXT_RUNTIME_WRITE = $NOW + 10;
3154 Coro::async_pool {
3155 write_runtime
3156 or warn "ERROR: unable to write runtime file: $!";
3157 };
3158 }
3159
3160# my $AFTER = Event::time;
3161# warn $AFTER - $NOW;#d#
3162
3163 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3164 $sig->send; 3772 $sig->send;
3165 } 3773 }
3166 while (my $sig = shift @WAIT_FOR_TICK) { 3774 while (my $sig = shift @WAIT_FOR_TICK) {
3167 $sig->send; 3775 $sig->send;
3168 } 3776 }
3169 3777
3170 $NOW = Event::time; 3778 $LOAD = ($NOW - $TICK_START) / $TICK;
3171
3172 # if we are delayed by four ticks or more, skip them all
3173 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3174
3175 $TICK_WATCHER->at ($NEXT_TICK);
3176 $TICK_WATCHER->start;
3177
3178 $LOAD = ($NOW - $tick_start) / $TICK;
3179 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3779 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3180 3780
3181 _post_tick; 3781 if (0) {
3182 3782 if ($NEXT_TICK) {
3183 3783 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d#
3786 }
3184 }, 3787 }
3185); 3788}
3186 3789
3187{ 3790{
3188 BDB::max_poll_time $TICK * 0.1; 3791 # configure BDB
3189 $BDB_POLL_WATCHER = Event->io ( 3792
3190 reentrant => 0,
3191 fd => BDB::poll_fileno,
3192 poll => 'r',
3193 prio => 0,
3194 data => WF_AUTOCANCEL,
3195 cb => \&BDB::poll_cb,
3196 );
3197 BDB::min_parallel 8; 3793 BDB::min_parallel 8;
3198 3794 BDB::max_poll_reqs $TICK * 0.1;
3199 BDB::set_sync_prepare { 3795 $AnyEvent::BDB::WATCHER->priority (1);
3200 my $status;
3201 my $current = $Coro::current;
3202 (
3203 sub {
3204 $status = $!;
3205 $current->ready; undef $current;
3206 },
3207 sub {
3208 Coro::schedule while defined $current;
3209 $! = $status;
3210 },
3211 )
3212 };
3213 3796
3214 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3215 $DB_ENV = BDB::db_env_create; 3798 $DB_ENV = BDB::db_env_create;
3799 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3800 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3801 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3802 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3803 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3216 3804
3217 cf::sync_job { 3805 cf::sync_job {
3218 eval { 3806 eval {
3219 BDB::db_env_open 3807 BDB::db_env_open
3220 $DB_ENV, 3808 $DB_ENV,
3222 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3810 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3223 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3811 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3224 0666; 3812 0666;
3225 3813
3226 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3814 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3227
3228 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3229 $DB_ENV->set_lk_detect;
3230 }; 3815 };
3231 3816
3232 cf::cleanup "db_env_open(db): $@" if $@; 3817 cf::cleanup "db_env_open(db): $@" if $@;
3233 }; 3818 };
3234 } 3819 }
3820
3821 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3822 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3823 };
3824 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3825 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3826 };
3827 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3828 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3829 };
3235} 3830}
3236 3831
3237{ 3832{
3833 # configure IO::AIO
3834
3238 IO::AIO::min_parallel 8; 3835 IO::AIO::min_parallel 8;
3239
3240 undef $Coro::AIO::WATCHER;
3241 IO::AIO::max_poll_time $TICK * 0.1; 3836 IO::AIO::max_poll_time $TICK * 0.1;
3242 $AIO_POLL_WATCHER = Event->io ( 3837 undef $AnyEvent::AIO::WATCHER;
3243 reentrant => 0,
3244 data => WF_AUTOCANCEL,
3245 fd => IO::AIO::poll_fileno,
3246 poll => 'r',
3247 prio => 6,
3248 cb => \&IO::AIO::poll_cb,
3249 );
3250} 3838}
3251 3839
3252my $_log_backtrace; 3840my $_log_backtrace;
3253 3841
3254sub _log_backtrace { 3842sub _log_backtrace {
3257 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3258 3846
3259 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3260 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3261 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3262 async { 3851 async {
3852 $Coro::current->{desc} = "abt $msg";
3853
3263 my @bt = fork_call { 3854 my @bt = fork_call {
3264 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
3265 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3856 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3266 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3857 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3267 or die "addr2line: $!"; 3858 or die "addr2line: $!";
3275 } 3866 }
3276 3867
3277 @funcs 3868 @funcs
3278 }; 3869 };
3279 3870
3280 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3281 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3282 --$_log_backtrace; 3874 --$_log_backtrace;
3283 }; 3875 };
3284 } else { 3876 } else {
3285 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines