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.282 by elmex, Tue Jun 19 18:15:34 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
51use JSON::XS 2.01 ();
25use BDB (); 52use BDB ();
26use Data::Dumper; 53use Data::Dumper;
27use Digest::MD5; 54use Digest::MD5;
28use Fcntl; 55use Fcntl;
29use YAML::Syck (); 56use YAML ();
30use IO::AIO 2.32 (); 57use IO::AIO ();
31use Time::HiRes; 58use Time::HiRes;
32use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
33 63
34# configure various modules to our taste 64# configure various modules to our taste
35# 65#
36$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
37Coro::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";
38Compress::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
39
40$Event::Eval = 1; # no idea why this is required, but it is
41
42# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
43$YAML::Syck::ImplicitUnicode = 1;
44
45$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
46 74
47sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
48 76
49our %COMMAND = (); 77our %COMMAND = ();
50our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
51 79
52our @EXTS = (); # list of extension package names 80our @EXTS = (); # list of extension package names
53our %EXTCMD = (); 81our %EXTCMD = ();
82our %EXTICMD = ();
54our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
55our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
56 85
57our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far
58our @EVENT; 87our @EVENT;
59 88
60our $CONFDIR = confdir; 89our $CONFDIR = confdir;
61our $DATADIR = datadir; 90our $DATADIR = datadir;
62our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
63our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
64our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
65our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
66our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
67our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
68our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
69our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
70our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
71 104
72our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
73our $TICK_WATCHER;
74our $AIO_POLL_WATCHER;
75our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
76our $NEXT_TICK; 107our $NEXT_TICK;
77our $NOW;
78our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
79 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
80our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
81our $DB_ENV; 113our $DB_ENV;
82 114
83our %CFG; 115our %CFG;
84 116
85our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
86our $RUNTIME; 118our $RUNTIME;
119our $NOW;
87 120
88our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
89our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
90our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
91 124
92# 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 ∕
93our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
94 127
95our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
96our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
97our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
98 132
99binmode STDOUT; 133binmode STDOUT;
100binmode STDERR; 134binmode STDERR;
101 135
102# read virtual server time, if available 136# read virtual server time, if available
103unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 137unless ($RUNTIME || !-e $RUNTIMEFILE) {
104 open my $fh, "<", "$LOCALDIR/runtime" 138 open my $fh, "<", $RUNTIMEFILE
105 or die "unable to read runtime file: $!"; 139 or die "unable to read $RUNTIMEFILE file: $!";
106 $RUNTIME = <$fh> + 0.; 140 $RUNTIME = <$fh> + 0.;
107} 141}
108 142
109mkdir $_ 143mkdir $_
110 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 144 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
… …
155 189
156The raw value load value from the last tick. 190The raw value load value from the last tick.
157 191
158=item %cf::CFG 192=item %cf::CFG
159 193
160Configuration for the server, loaded from C</etc/crossfire/config>, or 194Configuration for the server, loaded from C</etc/deliantra-server/config>, or
161from wherever your confdir points to. 195from wherever your confdir points to.
162 196
163=item cf::wait_for_tick, cf::wait_for_tick_begin 197=item cf::wait_for_tick, cf::wait_for_tick_begin
164 198
165These 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
166returns 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
167per 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.
168 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
169=back 209=back
170 210
171=cut 211=cut
172 212
173BEGIN { 213BEGIN {
… …
177 $msg .= "\n" 217 $msg .= "\n"
178 unless $msg =~ /\n$/; 218 unless $msg =~ /\n$/;
179 219
180 $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;
181 221
182 utf8::encode $msg;
183 LOG llevError, $msg; 222 LOG llevError, $msg;
184 }; 223 };
185} 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#?
186 240
187@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 241@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
188@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 242@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
189@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 243@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
190@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 244@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
197for my $pkg (qw( 251for my $pkg (qw(
198 cf::global cf::attachable 252 cf::global cf::attachable
199 cf::object cf::object::player 253 cf::object cf::object::player
200 cf::client cf::player 254 cf::client cf::player
201 cf::arch cf::living 255 cf::arch cf::living
256 cf::map cf::mapspace
202 cf::map cf::party cf::region 257 cf::party cf::region
203)) { 258)) {
204 no strict 'refs';
205 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 259 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
206} 260}
207 261
208$Event::DIED = sub { 262$EV::DIED = sub {
209 warn "error in event callback: @_"; 263 warn "error in event callback: @_";
210}; 264};
211 265
212############################################################################# 266#############################################################################
213 267
… …
236 $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;
237 $d 291 $d
238 } || "[unable to dump $_[0]: '$@']"; 292 } || "[unable to dump $_[0]: '$@']";
239} 293}
240 294
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
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.
302
303=cut
304
305our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
306
307sub encode_json($) { $json_coder->encode ($_[0]) }
308sub decode_json($) { $json_coder->decode ($_[0]) }
250 309
251=item cf::lock_wait $string 310=item cf::lock_wait $string
252 311
253Wait until the given lock is available. See cf::lock_acquire. 312Wait until the given lock is available. See cf::lock_acquire.
254 313
… …
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 318for example when the coroutine gets canceled), the lock is automatically
260returned. 319returned.
261 320
321Locks are *not* recursive, locking from the same coro twice results in a
322deadlocked coro.
323
262Lock 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
263uses map_find and cf::map::load uses map_load). 325uses map_find and cf::map::load uses map_load).
264 326
265=item $locked = cf::lock_active $string 327=item $locked = cf::lock_active $string
266 328
267Return 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.
268 330
269=cut 331=cut
270 332
271our %LOCK; 333our %LOCK;
334our %LOCKER;#d#
272 335
273sub lock_wait($) { 336sub lock_wait($) {
274 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#
275 343
276 # wait for lock, if any 344 # wait for lock, if any
277 while ($LOCK{$key}) { 345 while ($LOCK{$key}) {
278 push @{ $LOCK{$key} }, $Coro::current; 346 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 347 Coro::schedule;
… …
285 353
286 # wait, to be sure we are not locked 354 # wait, to be sure we are not locked
287 lock_wait $key; 355 lock_wait $key;
288 356
289 $LOCK{$key} = []; 357 $LOCK{$key} = [];
358 $LOCKER{$key} = $Coro::current;#d#
290 359
291 Coro::guard { 360 Coro::guard {
361 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 362 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 363 $_->ready for @{ delete $LOCK{$key} };
294 } 364 }
295} 365}
296 366
… …
299 369
300 ! ! $LOCK{$key} 370 ! ! $LOCK{$key}
301} 371}
302 372
303sub freeze_mainloop { 373sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 374 tick_inhibit_inc;
305 375
306 my $guard = Coro::guard { 376 Coro::guard \&tick_inhibit_dec;
307 $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 }
308 }; 437 }
309 $TICK_WATCHER->stop; 438};
310 $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;
311} 452}
312 453
313=item cf::async { BLOCK } 454=item cf::async { BLOCK }
314 455
315Currently the same as Coro::async_pool, meaning you cannot use 456Currently the same as Coro::async_pool, meaning you cannot use
… …
320 461
321BEGIN { *async = \&Coro::async_pool } 462BEGIN { *async = \&Coro::async_pool }
322 463
323=item cf::sync_job { BLOCK } 464=item cf::sync_job { BLOCK }
324 465
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 466The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 467is always able to handle events or runnable, as Deliantra is only
327partly 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
328acceptable. 469acceptable.
329 470
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 472the given BLOCK in another coroutine while waiting for the result. The
… …
336 477
337sub sync_job(&) { 478sub sync_job(&) {
338 my ($job) = @_; 479 my ($job) = @_;
339 480
340 if ($Coro::current == $Coro::main) { 481 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 482 my $time = EV::time;
342 483
343 # this is the main coro, too bad, we have to block 484 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 485 # till the operation succeeds, freezing the server :/
345 486
346 # TODO: use suspend/resume instead 487 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 488
348 my $freeze_guard = freeze_mainloop; 489 my $freeze_guard = freeze_mainloop;
349 490
350 my $busy = 1; 491 my $busy = 1;
351 my @res; 492 my @res;
352 493
353 (async { 494 (async {
495 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 496 @res = eval { $job->() };
355 warn $@ if $@; 497 warn $@ if $@;
356 undef $busy; 498 undef $busy;
357 })->prio (Coro::PRIO_MAX); 499 })->prio (Coro::PRIO_MAX);
358 500
359 while ($busy) { 501 while ($busy) {
360 Coro::cede or Event::one_event; 502 if (Coro::nready) {
503 Coro::cede_notself;
504 } else {
505 EV::loop EV::LOOP_ONESHOT;
361 } 506 }
507 }
362 508
363 $time = Event::time - $time; 509 my $time = EV::time - $time;
364 510
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 511 $TICK_START += $time; # do not account sync jobs to server load
369 512
370 wantarray ? @res : $res[0] 513 wantarray ? @res : $res[0]
371 } else { 514 } else {
372 # we are in another coroutine, how wonderful, everything just works 515 # we are in another coroutine, how wonderful, everything just works
373 516
… …
398=item fork_call { }, $args 541=item fork_call { }, $args
399 542
400Executes the given code block with the given arguments in a seperate 543Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 544process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 545Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 546never block itself or use any form of event handling.
404 547
405=cut 548=cut
406 549
407sub fork_call(&@) { 550sub fork_call(&@) {
408 my ($cb, @args) = @_; 551 my ($cb, @args) = @_;
409 552
410# 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,
411# or die "socketpair: $!"; 554 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 555 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 556
415 if (my $pid = fork) { 557 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 558 reset_signals;
428 local $SIG{__WARN__}; 559 &$cb
429 local $SIG{__DIE__}; 560 }, @args;
430 eval {
431 close $fh1;
432 561
433 my @res = eval { $cb->(@args) }; 562 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 563}
435 };
436 564
437 warn $@ if $@; 565=item $coin = coin_from_name $name
438 _exit 0; 566
439 } 567=cut
568
569our %coin_alias = (
570 "silver" => "silvercoin",
571 "silvercoin" => "silvercoin",
572 "silvercoins" => "silvercoin",
573 "gold" => "goldcoin",
574 "goldcoin" => "goldcoin",
575 "goldcoins" => "goldcoin",
576 "platinum" => "platinacoin",
577 "platinumcoin" => "platinacoin",
578 "platinumcoins" => "platinacoin",
579 "platina" => "platinacoin",
580 "platinacoin" => "platinacoin",
581 "platinacoins" => "platinacoin",
582 "royalty" => "royalty",
583 "royalties" => "royalty",
584);
585
586sub coin_from_name($) {
587 $coin_alias{$_[0]}
588 ? cf::arch::find $coin_alias{$_[0]}
589 : undef
440} 590}
441 591
442=item $value = cf::db_get $family => $key 592=item $value = cf::db_get $family => $key
443 593
444Returns a single value from the environment database. 594Returns a single value from the environment database.
… …
446=item cf::db_put $family => $key => $value 596=item cf::db_put $family => $key => $value
447 597
448Stores 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
449data 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).
450 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
451=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}
452 624
453our $DB; 625our $DB;
454 626
455sub db_init { 627sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 628 cf::sync_job {
460 eval { 629 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 630 };
470} 631}
471 632
472sub db_get($$) { 633sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 634 my $key = "$_[0]/$_[1]";
474 635
… …
524 if (1) { 685 if (1) {
525 $md5 = 686 $md5 =
526 join "\x00", 687 join "\x00",
527 $processversion, 688 $processversion,
528 map { 689 map {
529 Coro::cede; 690 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 691 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 692 } 0.. $#$src;
532 693
533 694
534 my $dbmd5 = db_get cache => "$id/md5"; 695 my $dbmd5 = db_get cache => "$id/md5";
… …
572 733
573############################################################################# 734#############################################################################
574 735
575=head2 ATTACHABLE OBJECTS 736=head2 ATTACHABLE OBJECTS
576 737
577Many 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
578attach callbacks/event handlers (a collection of which is called an "attachment") 739attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 740to it. All such attachable objects support the following methods.
580 741
581In 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>
582C<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
583Crossfire TRT). 744Deliantra).
584 745
585=over 4 746=over 4
586 747
587=item $attachable->attach ($attachment, key => $value...) 748=item $attachable->attach ($attachment, key => $value...)
588 749
… …
632=item cf::CLASS::attachment $name, ... 793=item cf::CLASS::attachment $name, ...
633 794
634Register an attachment by C<$name> through which attachable objects of the 795Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 796given CLASS can refer to this attachment.
636 797
637Some classes such as crossfire maps and objects can specify attachments 798Some classes such as deliantra maps and objects can specify attachments
638that 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.
639 800
640These calls expect any number of the following handler/hook descriptions: 801These calls expect any number of the following handler/hook descriptions:
641 802
642=over 4 803=over 4
… …
840 "; 1001 ";
841 die if $@; 1002 die if $@;
842} 1003}
843 1004
844our $override; 1005our $override;
845our @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?
846 1007
847sub override { 1008sub override {
848 $override = 1; 1009 $override = 1;
849 @invoke_results = (); 1010 @INVOKE_RESULTS = (@_);
850} 1011}
851 1012
852sub do_invoke { 1013sub do_invoke {
853 my $event = shift; 1014 my $event = shift;
854 my $callbacks = shift; 1015 my $callbacks = shift;
855 1016
856 @invoke_results = (); 1017 @INVOKE_RESULTS = ();
857 1018
858 local $override; 1019 local $override;
859 1020
860 for (@$callbacks) { 1021 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1022 eval { &{$_->[1]} };
… …
870 } 1031 }
871 1032
872 0 1033 0
873} 1034}
874 1035
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1036=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1037
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1039
879Generate an object-specific event with the given arguments. 1040Generate an object-specific event with the given arguments.
880 1041
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 1044results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1045
885=back 1046=back
886 1047
887=cut 1048=cut
888 1049
889############################################################################# 1050#############################################################################
890# 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}
891 1094
892sub reattach { 1095sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1096 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1097 my ($obj) = @_;
895 1098
1099 # no longer needed after getting rid of delete_package?
896 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
897 1101
898 my $registry = $obj->registry; 1102 my $registry = $obj->registry;
899 1103
900 @$registry = (); 1104 @$registry = ();
901 1105
… …
916cf::attachable->attach ( 1120cf::attachable->attach (
917 prio => -1000000, 1121 prio => -1000000,
918 on_instantiate => sub { 1122 on_instantiate => sub {
919 my ($obj, $data) = @_; 1123 my ($obj, $data) = @_;
920 1124
921 $data = from_json $data; 1125 $data = decode_json $data;
922 1126
923 for (@$data) { 1127 for (@$data) {
924 my ($name, $args) = @$_; 1128 my ($name, $args) = @$_;
925 1129
926 $obj->attach ($name, %{$args || {} }); 1130 $obj->attach ($name, %{$args || {} });
… …
942sub object_freezer_save { 1146sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1147 my ($filename, $rdata, $objs) = @_;
944 1148
945 sync_job { 1149 sync_job {
946 if (length $$rdata) { 1150 if (length $$rdata) {
1151 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1152 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1153 $decname, length $$rdata, scalar @$objs;
949 1154
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1155 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1156 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1157 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1158 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1159 aio_close $fh;
955 1160
956 if (@$objs) { 1161 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1163 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1164 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1165 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1166 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1167 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1168 aio_rename "$filename.pst~", "$filename.pst";
964 } 1169 }
965 } else { 1170 } else {
966 aio_unlink "$filename.pst"; 1171 aio_unlink "$filename.pst";
967 } 1172 }
… …
972 } 1177 }
973 } else { 1178 } else {
974 aio_unlink $filename; 1179 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1180 aio_unlink "$filename.pst";
976 } 1181 }
977 } 1182 };
978} 1183}
979 1184
980sub object_freezer_as_string { 1185sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1186 my ($rdata, $objs) = @_;
982 1187
… …
994 or return; 1199 or return;
995 1200
996 unless (aio_stat "$filename.pst") { 1201 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1202 (aio_load "$filename.pst", $av) >= 0
998 or return; 1203 or return;
1204
999 $av = eval { (Storable::thaw $av)->{objs} }; 1205 my $st = eval { Coro::Storable::thaw $av };
1206 $av = $st->{objs};
1000 } 1207 }
1001 1208
1209 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1210 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1211 $decname, length $data, scalar @{$av || []};
1212
1004 return ($data, $av); 1213 ($data, $av)
1005} 1214}
1006 1215
1007=head2 COMMAND CALLBACKS 1216=head2 COMMAND CALLBACKS
1008 1217
1009=over 4 1218=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1238 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1239}
1031 1240
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1241=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1242
1034Register a callback fro execution when the client sends an extcmd packet. 1243Register a callback for execution when the client sends an (synchronous)
1244extcmd packet. Ext commands will be processed in the order they are
1245received by the server, like other user commands. The first argument is
1246the logged-in player. Ext commands can only be processed after a player
1247has logged in successfully.
1035 1248
1036If the callback returns something, it is sent back as if reply was being 1249If the callback returns something, it is sent back as if reply was being
1037called. 1250called.
1038 1251
1252=item cf::register_exticmd $name => \&callback($ns,$packet);
1253
1254Register a callback for execution when the client sends an (asynchronous)
1255exticmd packet. Exti commands are processed by the server as soon as they
1256are received, i.e. out of order w.r.t. other commands. The first argument
1257is a client socket. Exti commands can be received anytime, even before
1258log-in.
1259
1260If the callback returns something, it is sent back as if reply was being
1261called.
1262
1039=cut 1263=cut
1040 1264
1041sub register_extcmd { 1265sub register_extcmd {
1042 my ($name, $cb) = @_; 1266 my ($name, $cb) = @_;
1043 1267
1044 $EXTCMD{$name} = $cb; 1268 $EXTCMD{$name} = $cb;
1269}
1270
1271sub register_exticmd {
1272 my ($name, $cb) = @_;
1273
1274 $EXTICMD{$name} = $cb;
1045} 1275}
1046 1276
1047cf::player->attach ( 1277cf::player->attach (
1048 on_command => sub { 1278 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1279 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1288 cf::override;
1059 }, 1289 },
1060 on_extcmd => sub { 1290 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1291 my ($pl, $buf) = @_;
1062 1292
1063 my $msg = eval { from_json $buf }; 1293 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1294
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1303 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1304 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1305 }
1306
1307 $pl->ext_reply ($reply, @reply)
1308 if $reply;
1309
1071 } else { 1310 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1311 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1312 }
1074 1313
1075 cf::override; 1314 cf::override;
… …
1102 1341
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1342 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1343 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1344
1106 $ext{source} = 1345 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1346 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1347 . "#line 1 \"$path\"\n{\n"
1109 . $source 1348 . $source
1110 . "\n};\n1"; 1349 . "\n};\n1";
1111 1350
1112 $todo{$base} = \%ext; 1351 $todo{$base} = \%ext;
… …
1128 my $msg = $@ ? "$v->{path}: $@\n" 1367 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1368 : "$v->{base}: extension inactive.\n";
1130 1369
1131 if (exists $v->{meta}{mandatory}) { 1370 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1371 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1372 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1373 }
1136 1374
1137 warn $msg; 1375 warn $msg;
1138 } 1376 }
1139 1377
… …
1153 1391
1154=back 1392=back
1155 1393
1156=head2 CORE EXTENSIONS 1394=head2 CORE EXTENSIONS
1157 1395
1158Functions and methods that extend core crossfire objects. 1396Functions and methods that extend core deliantra objects.
1159 1397
1160=cut 1398=cut
1161 1399
1162package cf::player; 1400package cf::player;
1163 1401
1164use Coro::AIO; 1402use Coro::AIO;
1165 1403
1166=head3 cf::player 1404=head3 cf::player
1167 1405
1168=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}
1169 1421
1170=item cf::player::find $login 1422=item cf::player::find $login
1171 1423
1172Returns the given player object, loading it if necessary (might block). 1424Returns the given player object, loading it if necessary (might block).
1173 1425
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1461 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1462 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1463 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1464 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1465
1214 my $pl = load_pl path $login 1466 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1474 $cf::PLAYER{$login} = $pl
1217 } 1475 }
1218 } 1476 }
1219} 1477}
1220 1478
… …
1229 return if $pl->{deny_save}; 1487 return if $pl->{deny_save};
1230 1488
1231 aio_mkdir playerdir $pl, 0770; 1489 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1490 $pl->{last_save} = $cf::RUNTIME;
1233 1491
1492 cf::get_slot 0.01;
1493
1234 $pl->save_pl ($path); 1494 $pl->save_pl ($path);
1235 Coro::cede; 1495 cf::cede_to_tick;
1236} 1496}
1237 1497
1238sub new($) { 1498sub new($) {
1239 my ($login) = @_; 1499 my ($login) = @_;
1240 1500
… …
1246 $cf::PLAYER{$login} = $self; 1506 $cf::PLAYER{$login} = $self;
1247 1507
1248 $self 1508 $self
1249} 1509}
1250 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
1251=item $pl->quit_character 1521=item $pl->quit_character
1252 1522
1253Nukes the player without looking back. If logged in, the connection will 1523Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1524be destroyed. May block for a long time.
1255 1525
… …
1259 my ($pl) = @_; 1529 my ($pl) = @_;
1260 1530
1261 my $name = $pl->ob->name; 1531 my $name = $pl->ob->name;
1262 1532
1263 $pl->{deny_save} = 1; 1533 $pl->{deny_save} = 1;
1264 $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
1265 1535
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1536 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1537 $pl->deactivate;
1538 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1539 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1540 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1541 $pl->ns->destroy if $pl->ns;
1270 1542
1271 my $path = playerdir $pl; 1543 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1544 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1308 or return []; 1580 or return [];
1309 1581
1310 my @logins; 1582 my @logins;
1311 1583
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1590 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1591 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1592 $buf !~ /^password -------------$/m or next; # official not-valid tag
1593 }
1316 1594
1317 utf8::decode $login; 1595 utf8::decode $login;
1318 push @logins, $login; 1596 push @logins, $login;
1319 } 1597 }
1320 1598
… …
1347 } 1625 }
1348 1626
1349 \@paths 1627 \@paths
1350} 1628}
1351 1629
1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1631
1632Expand deliantra pod fragments into protocol xml.
1633
1352=item $player->ext_reply ($msgid, %msg) 1634=item $player->ext_reply ($msgid, @msg)
1353 1635
1354Sends an ext reply to the player. 1636Sends an ext reply to the player.
1355 1637
1356=cut 1638=cut
1357 1639
1358sub ext_reply($$%) { 1640sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1641 my ($self, $id, @msg) = @_;
1360 1642
1361 $msg{msgid} = $id; 1643 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1644}
1365 1645
1366=item $player->ext_event ($type, %msg) 1646=item $player->ext_msg ($type, @msg)
1367 1647
1368Sends an ext event to the client. 1648Sends an ext event to the client.
1369 1649
1370=cut 1650=cut
1371 1651
1372sub ext_event($$%) { 1652sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1653 my ($self, $type, @msg) = @_;
1374 1654
1375 $self->ns->ext_event ($type, %msg); 1655 $self->ns->ext_msg ($type, @msg);
1376} 1656}
1377 1657
1378=head3 cf::region 1658=head3 cf::region
1379 1659
1380=over 4 1660=over 4
… …
1393 my ($path) = @_; 1673 my ($path) = @_;
1394 1674
1395 my ($match, $specificity); 1675 my ($match, $specificity);
1396 1676
1397 for my $region (list) { 1677 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1678 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1679 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1680 if $region->specificity > $specificity;
1401 } 1681 }
1402 } 1682 }
1403 1683
… …
1424our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1426 1706
1427sub generate_random_map { 1707sub generate_random_map {
1428 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
1429 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1713 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1523 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1524 return $self; 1807 return $self;
1525 } 1808 }
1526 } 1809 }
1527 1810
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1812 ()
1530} 1813}
1531 1814
1532sub init { 1815sub init {
1533 my ($self) = @_; 1816 my ($self) = @_;
… …
1555 1838
1556# the temporary/swap location 1839# the temporary/swap location
1557sub save_path { 1840sub save_path {
1558 my ($self) = @_; 1841 my ($self) = @_;
1559 1842
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1562} 1845}
1563 1846
1564# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1565sub uniq_path { 1848sub uniq_path {
1566 my ($self) = @_; 1849 my ($self) = @_;
1567 1850
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1570} 1853}
1571 1854
1572# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1573# all maps in C++... 1856# all maps in C++...
… …
1596 1879
1597sub load_header_from($) { 1880sub load_header_from($) {
1598 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1599 1882
1600 utf8::encode $path; 1883 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1892
1607 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1608 1894
1609 1 1895 1
1610} 1896}
… …
1664sub find { 1950sub find {
1665 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1666 1952
1667 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1668 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1670 1957
1671 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1672 my $guard = cf::lock_acquire "map_find:$path"; 1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1673 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1674 or return; 1963 or return;
1675 1964
1676 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1677 1966
… …
1679 or return; 1968 or return;
1680 1969
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1684 $map->reset; 1975 $map->reset;
1685 undef $guard;
1686 return find $path; 1976 return find $path;
1687 } 1977 }
1688 1978
1689 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1690 } 1980 }
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1700 1990
1701 my $path = $self->{path}; 1991 my $path = $self->{path};
1702 1992
1703 { 1993 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1705 1995
1996 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 1998
1708 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1709 2000
1710 $self->alloc; 2001 $self->alloc;
1711 2002
1712 $self->pre_load; 2003 $self->pre_load;
1713 Coro::cede; 2004 cf::cede_to_tick;
1714 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1716 or return; 2009 or return;
1717 2010
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1719 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1720 2013
1721 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2015 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2018 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1726 } 2022 }
1727 } 2023 }
1728 2024
1729 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1730 # now do the right thing for maps 2028 # now do the right thing for maps
1731 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2031 unless $self->difficulty;
1734 Coro::cede; 2032 cf::cede_to_tick;
1735 2033
1736 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2035 $self->decay_objects;
1738 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1739 $self->update_buttons; 2037 $self->update_buttons;
1740 Coro::cede; 2038 cf::cede_to_tick;
1741 $self->set_darkness_map; 2039 $self->set_darkness_map;
1742 Coro::cede; 2040 cf::cede_to_tick;
1743 $self->activate; 2041 $self->activate;
1744 } 2042 }
1745 2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
2046
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2048 }
1748 2049
1749 $self->post_load; 2050 $self->post_load;
1750} 2051}
1751 2052
… …
1760 2061
1761 $self 2062 $self
1762} 2063}
1763 2064
1764# 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
1765sub load_diag { 2066sub load_neighbours {
1766 my ($map) = @_; 2067 my ($map) = @_;
1767 2068
1768 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1769 2070
1770 for (0 .. 3) { 2071 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1772 or next; 2073 or next;
1773 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1774 or next; 2075 or next;
1775 $neigh->load; 2076 $neigh->load;
1776 2077
2078 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2081 }
1780 2082
1781 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1783 or next; 2086 or next;
1784 $neigh->load; 2087 $neigh->load;
1785 } 2088 }
1786} 2089}
1787 2090
… …
1792} 2095}
1793 2096
1794sub do_load_sync { 2097sub do_load_sync {
1795 my ($map) = @_; 2098 my ($map) = @_;
1796 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1797 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1798} 2104}
1799 2105
1800our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1802 2108
1803sub find_async { 2109sub find_async {
1804 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1805 2111
1806 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1807 2113
1808 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2116 }
1811 2117
1812 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1813 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1814 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2125 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2126 $map->load if $v;
2127 }
1819 2128
1820 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1821 } 2130 }
1822 } 2131 }
1823 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1824 }; 2133 };
1825 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
… …
1828} 2137}
1829 2138
1830sub save { 2139sub save {
1831 my ($self) = @_; 2140 my ($self) = @_;
1832 2141
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2143
1835 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1836 2145
1837 return unless $self->dirty; 2146 return unless $self->dirty;
1838 2147
… …
1844 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1845 2154
1846 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1847 2156
1848 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1850 }; 2160 };
2161
2162 cf::get_slot 0.02;
1851 2163
1852 if ($uniq) { 2164 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2167 } else {
… …
1861 my ($self) = @_; 2173 my ($self) = @_;
1862 2174
1863 # save first because save cedes 2175 # save first because save cedes
1864 $self->save; 2176 $self->save;
1865 2177
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2179
1868 return if $self->players; 2180 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1871 2183
2184 $self->in_memory (cf::MAP_SWAPPED);
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2188 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2189}
1875 2190
1876sub reset_at { 2191sub reset_at {
1877 my ($self) = @_; 2192 my ($self) = @_;
1878 2193
… …
1910 if $uniq; 2225 if $uniq;
1911 } 2226 }
1912 2227
1913 delete $cf::MAP{$self->path}; 2228 delete $cf::MAP{$self->path};
1914 2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2232 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2233
1919 $self->unlink_save; 2234 $self->unlink_save;
1920 $self->destroy; 2235 $self->destroy;
1921} 2236}
1922 2237
1923my $nuke_counter = "aaaa"; 2238my $nuke_counter = "aaaa";
1924 2239
1925sub nuke { 2240sub nuke {
1926 my ($self) = @_; 2241 my ($self) = @_;
1927 2242
2243 {
2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245
1928 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1929 2247
1930 $self->unlink_save; 2248 $self->unlink_save;
1931 2249
1932 bless $self, "cf::map"; 2250 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2251 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2252 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2253 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2255
1938 $cf::MAP{$self->path} = $self; 2256 $cf::MAP{$self->path} = $self;
2257 }
1939 2258
1940 $self->reset; # polite request, might not happen 2259 $self->reset; # polite request, might not happen
1941} 2260}
1942 2261
1943=item $maps = cf::map::tmp_maps 2262=item $maps = cf::map::tmp_maps
… …
1985 2304
1986sub unique_maps() { 2305sub unique_maps() {
1987 [ 2306 [
1988 map { 2307 map {
1989 utf8::decode $_; 2308 utf8::decode $_;
1990 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
1991 ? normalise $_ 2312 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2314 ]
1995} 2315}
1996 2316
1997package cf;
1998
1999=back 2317=back
2000 2318
2001=head3 cf::object 2319=head3 cf::object
2002 2320
2003=cut 2321=cut
… …
2006 2324
2007=over 4 2325=over 4
2008 2326
2009=item $ob->inv_recursive 2327=item $ob->inv_recursive
2010 2328
2011Returns 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.
2012 2331
2013=cut 2332=cut
2014 2333
2015sub inv_recursive_; 2334sub inv_recursive_;
2016sub inv_recursive_ { 2335sub inv_recursive_ {
… …
2019 2338
2020sub inv_recursive { 2339sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2022} 2341}
2023 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
2024package cf; 2371package cf;
2025 2372
2026=back 2373=back
2027 2374
2028=head3 cf::object::player 2375=head3 cf::object::player
… …
2034Sends 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>
2035can 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
2036dialogue with the given NPC character. 2383dialogue with the given NPC character.
2037 2384
2038=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};
2039 2400
2040# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2402# with dialog boxes.
2042#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
2043sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
… …
2050 2411
2051 } else { 2412 } else {
2052 my $pl = $self->contr; 2413 my $pl = $self->contr;
2053 2414
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2418
2060 } else { 2419 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2422 }
2064 } 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 (@_);
2065} 2434}
2066 2435
2067=item $player_object->may ("access") 2436=item $player_object->may ("access")
2068 2437
2069Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
… …
2082 2451
2083=item $player_object->enter_link 2452=item $player_object->enter_link
2084 2453
2085Freezes 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}>).
2086 2455
2087The 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.
2088I<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.
2089 2460
2090Will never block. 2461Will never block.
2091 2462
2092=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2093 2464
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2151 2522
2152 $map->load; 2523 $map->load;
2153 $map->load_diag; 2524 $map->load_neighbours;
2154 2525
2155 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2156 $self->activate_recursive; 2528 $self->activate_recursive;
2157 2529
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2160} 2532}
2161 2533
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2535
2164Moves 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
2165her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2166that 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
2167the 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 >>.
2168 2544
2169=cut 2545=cut
2170 2546
2171our $GOTOGEN; 2547our $GOTOGEN;
2172 2548
2173sub cf::object::player::goto { 2549sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2550 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2551
2176 # 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
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2554
2179 $self->enter_link; 2555 $self->enter_link;
2180 2556
2181 (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
2182 my $map = eval { 2579 my $map = eval {
2183 my $map = cf::map::find $path; 2580 my $map = defined $path ? cf::map::find $path : undef;
2184 2581
2185 if ($map) { 2582 if ($map) {
2186 $map = $map->customise_for ($self); 2583 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2584 $map = $check->($map) if $check && $map;
2188 } else { 2585 } else {
2189 $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);
2190 } 2587 }
2191 2588
2192 $map 2589 $map
2193 }; 2590 };
2194 2591
… …
2199 2596
2200 if ($gen == $self->{_goto_generation}) { 2597 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2598 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2599 $self->leave_link ($map, $x, $y);
2203 } 2600 }
2601
2602 $done->() if $done;
2204 })->prio (1); 2603 })->prio (1);
2205} 2604}
2206 2605
2207=item $player_object->enter_exit ($exit_object) 2606=item $player_object->enter_exit ($exit_object)
2208 2607
… …
2228} 2627}
2229 2628
2230sub prepare_random_map { 2629sub prepare_random_map {
2231 my ($exit) = @_; 2630 my ($exit) = @_;
2232 2631
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2634 # that depends on the exit object
2238 2635
2239 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
… …
2241 if ($exit->map) { 2638 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2246 } 2645 }
2247 2646
2248 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2249 2648
2250 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2253 2652
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2655 undef $fh;
2257 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2258 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2261 } 2664 }
2262} 2665}
2263 2666
2264sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2266 2669
2267 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2268 2671
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2672 $self->enter_link;
2281 2673
2282 (async { 2674 (async {
2283 $self->deactivate_recursive; # just to be sure 2675 $Coro::current->{desc} = "enter_exit";
2676
2284 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
2285 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2286 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
2287 1; 2698 1
2288 }) { 2699 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "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. "
2291 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2704
2294 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2313 2724
2314 utf8::encode $text; 2725 utf8::encode $text;
2315 $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);
2316} 2727}
2317 2728
2729=item $client->send_msg ($channel, $msg, $color, [extra...])
2730
2731Send a drawinfo or msg packet to the client, formatting the msg for the
2732client if neccessary. C<$type> should be a string identifying the type of
2733the message, with C<log> being the default. If C<$color> is negative, suppress
2734the message unless the client supports the msg packet.
2735
2736=cut
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
2802sub cf::client::send_msg {
2803 my ($self, $channel, $msg, $color, @extra) = @_;
2804
2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2807
2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809
2810 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel};
2813
2814 $self->ext_msg (channel_info => $channel)
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id};
2818
2819 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel)
2824 if $self->can_msg;
2825 }
2826
2827 $channel = $channel->{id};
2828 }
2829
2830 return unless @extra || length $msg;
2831
2832 if ($self->can_msg) {
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);
2853 } else {
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
2869 if (0 && $msg =~ /\[/) {
2870 # COMMAND/INFO
2871 $self->send_packet ("drawextinfo $color 10 8 $msg")
2872 } else {
2873 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2874 $self->send_packet ("drawinfo $color $msg")
2875 }
2876 }
2877 }
2878}
2879
2318=item $client->ext_event ($type, %msg) 2880=item $client->ext_msg ($type, @msg)
2319 2881
2320Sends an exti event to the client. 2882Sends an ext event to the client.
2321 2883
2322=cut 2884=cut
2323 2885
2324sub cf::client::ext_event($$%) { 2886sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2887 my ($self, $type, @msg) = @_;
2326 2888
2889 if ($self->extcmd == 2) {
2890 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2891 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2892 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2893 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2894 }
2895}
2896
2897=item $client->ext_reply ($msgid, @msg)
2898
2899Sends an ext reply to the client.
2900
2901=cut
2902
2903sub cf::client::ext_reply($$@) {
2904 my ($self, $id, @msg) = @_;
2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2908 } elsif ($self->extcmd == 1) {
2909 #TODO: version 1, remove
2910 unshift @msg, msgtype => "reply", msgid => $id;
2911 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2912 }
2329} 2913}
2330 2914
2331=item $success = $client->query ($flags, "text", \&cb) 2915=item $success = $client->query ($flags, "text", \&cb)
2332 2916
2333Queues a query to the client, calling the given callback with 2917Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2918the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2919C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2920
2337Queries can fail, so check the return code. Or don't, as queries will become 2921Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2922become reliable at some point in the future.
2339 2923
2340=cut 2924=cut
2341 2925
2342sub cf::client::query { 2926sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2927 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2935 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2936 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2937
2354 $self->send_packet ($self->{query_queue}[0][0]) 2938 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2939 if @{ $self->{query_queue} } == 1;
2940
2941 1
2356} 2942}
2357 2943
2358cf::client->attach ( 2944cf::client->attach (
2945 on_connect => sub {
2946 my ($ns) = @_;
2947
2948 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2949 },
2359 on_reply => sub { 2950 on_reply => sub {
2360 my ($ns, $msg) = @_; 2951 my ($ns, $msg) = @_;
2361 2952
2362 # this weird shuffling is so that direct followup queries 2953 # this weird shuffling is so that direct followup queries
2363 # get handled first 2954 # get handled first
… …
2375 } else { 2966 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2967 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2968 }
2378 } 2969 }
2379 }, 2970 },
2971 on_exticmd => sub {
2972 my ($ns, $buf) = @_;
2973
2974 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2975
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
2984 if (my $cb = $EXTICMD{$type}) {
2985 @reply = $cb->($ns, @payload);
2986 }
2987
2988 $ns->ext_reply ($reply, @reply)
2989 if $reply;
2990
2991 } else {
2992 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2993 }
2994
2995 cf::override;
2996 },
2380); 2997);
2381 2998
2382=item $client->async (\&cb) 2999=item $client->async (\&cb)
2383 3000
2384Create a new coroutine, running the specified callback. The coroutine will 3001Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 3042our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3043our $safe_hole = new Safe::Hole;
2427 3044
2428$SIG{FPE} = 'IGNORE'; 3045$SIG{FPE} = 'IGNORE';
2429 3046
2430$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));
2431 3052
2432# here we export the classes and methods available to script code 3053# here we export the classes and methods available to script code
2433 3054
2434=pod 3055=pod
2435 3056
2436The following functions and methods are available within a safe environment: 3057The following functions and methods are available within a safe environment:
2437 3058
2438 cf::object contr pay_amount pay_player map 3059 cf::object
3060 contr pay_amount pay_player map x y force_find force_add destroy
3061 insert remove name archname title slaying race decrease split
3062
2439 cf::object::player player 3063 cf::object::player
2440 cf::player peaceful 3064 player
2441 cf::map trigger 3065
3066 cf::player
3067 peaceful
3068
3069 cf::map
3070 trigger
2442 3071
2443=cut 3072=cut
2444 3073
2445for ( 3074for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp)],
2447 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
2450) { 3081) {
2451 no strict 'refs'; 3082 no strict 'refs';
… …
2527# the server's init and main functions 3158# the server's init and main functions
2528 3159
2529sub load_facedata($) { 3160sub load_facedata($) {
2530 my ($path) = @_; 3161 my ($path) = @_;
2531 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
2532 warn "loading facedata from $path\n"; 3169 warn "loading facedata from $path\n";
2533 3170
2534 my $facedata; 3171 my $facedata;
2535 0 < aio_load $path, $facedata 3172 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3173 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 3175 $facedata = Coro::Storable::thaw $facedata;
2539 3176
2540 $facedata->{version} == 2 3177 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3178 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 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
2543 { 3187 {
2544 my $faces = $facedata->{faceinfo}; 3188 my $faces = $facedata->{faceinfo};
2545 3189
2546 while (my ($face, $info) = each %$faces) { 3190 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3191 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3192
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3193 cf::face::set_visibility $idx, $info->{visibility};
3194 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3195 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3196 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3197
3198 cf::cede_to_tick;
2552 } 3199 }
2553 3200
2554 while (my ($face, $info) = each %$faces) { 3201 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3202 next unless $info->{smooth};
3203
2556 my $idx = cf::face::find $face 3204 my $idx = cf::face::find $face
2557 or next; 3205 or next;
3206
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3207 if (my $smooth = cf::face::find $info->{smooth}) {
3208 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3209 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3210 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3211 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3212 }
2563 Coro::cede; 3213
3214 cf::cede_to_tick;
2564 } 3215 }
2565 } 3216 }
2566 3217
2567 { 3218 {
2568 my $anims = $facedata->{animinfo}; 3219 my $anims = $facedata->{animinfo};
2569 3220
2570 while (my ($anim, $info) = each %$anims) { 3221 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3222 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3223 cf::cede_to_tick;
2573 } 3224 }
2574 3225
2575 cf::anim::invalidate_all; # d'oh 3226 cf::anim::invalidate_all; # d'oh
2576 } 3227 }
2577 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
2578 1 3264 1
2579} 3265}
2580 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
2581sub 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
2582 load_resource_file "$MAPDIR/regions" 3310 load_resource_file "$MAPDIR/regions"
2583 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 }
2584} 3317}
2585 3318
2586sub reload_facedata { 3319sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3320 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3321 or die "unable to load facedata\n";
… …
2599} 3332}
2600 3333
2601sub reload_resources { 3334sub reload_resources {
2602 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
2603 3336
3337 reload_facedata;
3338 reload_archetypes;
2604 reload_regions; 3339 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3340 reload_treasures;
2609 3341
2610 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
2611} 3343}
2612 3344
2613sub init { 3345sub init {
3346 my $guard = freeze_mainloop;
3347
3348 evthread_start IO::AIO::poll_fileno;
3349
2614 reload_resources; 3350 reload_resources;
2615} 3351}
2616 3352
2617sub cfg_load { 3353sub reload_config {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3354 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3355 or return;
2620 3356
2621 local $/; 3357 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3358 *CFG = YAML::Load <$fh>;
2623 3359
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3360 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3361
2626 $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};
2627 $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};
… …
2633 }; 3369 };
2634 warn $@ if $@; 3370 warn $@ if $@;
2635 } 3371 }
2636} 3372}
2637 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
2638sub main { 3393sub main {
3394 atomic;
3395
2639 # we must not ever block the main coroutine 3396 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3397 local $Coro::idle = sub {
2641 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#
2642 (async { 3399 (async {
2643 Event::one_event; 3400 $Coro::current->{desc} = "IDLE BUG HANDLER";
3401 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3402 })->prio (Coro::PRIO_MAX);
2645 }; 3403 };
2646 3404
2647 cfg_load; 3405 {
3406 my $guard = freeze_mainloop;
3407 reload_config;
2648 db_init; 3408 db_init;
2649 load_extensions; 3409 load_extensions;
2650 3410
2651 $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
2652 Event::loop; 3419 EV::loop;
2653} 3420}
2654 3421
2655############################################################################# 3422#############################################################################
2656# initialisation and cleanup 3423# initialisation and cleanup
2657 3424
2658# install some emergency cleanup handlers 3425# install some emergency cleanup handlers
2659BEGIN { 3426BEGIN {
3427 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3428 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3429 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3430 cf::cleanup "SIG$signal";
2668 },
2669 ); 3431 };
2670 } 3432 }
2671} 3433}
2672 3434
2673sub write_runtime { 3435sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime";
2675
2676 # first touch the runtime file to show we are still running: 3436 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3437 # the fsync below can take a very very long time.
2678 3438
2679 IO::AIO::aio_utime $runtime, undef, undef; 3439 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3440
2681 my $guard = cf::lock_acquire "write_runtime"; 3441 my $guard = cf::lock_acquire "write_runtime";
2682 3442
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3443 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2684 or return; 3444 or return;
2685 3445
2686 my $value = $cf::RUNTIME + 90 + 10; 3446 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3447 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3448 # 60 allows for the watchdog to kill the server.
… …
2698 aio_utime $fh, undef, undef; 3458 aio_utime $fh, undef, undef;
2699 3459
2700 close $fh 3460 close $fh
2701 or return; 3461 or return;
2702 3462
2703 aio_rename "$runtime~", $runtime 3463 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3464 and return;
2705 3465
2706 warn "runtime file written.\n"; 3466 warn "runtime file written.\n";
2707 3467
2708 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 };
2709} 3512}
2710 3513
2711sub emergency_save() { 3514sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3515 my $freeze_guard = cf::freeze_mainloop;
2713 3516
… …
2719 # and maps saved/destroyed asynchronously. 3522 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3523 warn "begin emergency player save\n";
2721 for my $login (keys %cf::PLAYER) { 3524 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3525 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3526 $pl->valid or next;
3527 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3528 $pl->save;
2725 } 3529 }
2726 warn "end emergency player save\n"; 3530 warn "end emergency player save\n";
2727 3531
2728 warn "begin emergency map save\n"; 3532 warn "begin emergency map save\n";
… …
2734 warn "end emergency map save\n"; 3538 warn "end emergency map save\n";
2735 3539
2736 warn "begin emergency database checkpoint\n"; 3540 warn "begin emergency database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3541 BDB::db_env_txn_checkpoint $DB_ENV;
2738 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";
2739 }; 3547 };
2740 3548
2741 warn "leave emergency perl save\n"; 3549 warn "leave emergency perl save\n";
2742} 3550}
2743 3551
2744sub post_cleanup { 3552sub post_cleanup {
2745 my ($make_core) = @_; 3553 my ($make_core) = @_;
2746 3554
2747 warn Carp::longmess "post_cleanup backtrace" 3555 warn Carp::longmess "post_cleanup backtrace"
2748 if $make_core; 3556 if $make_core;
3557
3558 my $fh = pidfile;
3559 unlink $PIDFILE if <$fh> == $$;
2749} 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
2750 3589
2751sub do_reload_perl() { 3590sub do_reload_perl() {
2752 # can/must only be called in main 3591 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3592 if ($Coro::current != $Coro::main) {
2754 warn "can only reload from main coroutine"; 3593 warn "can only reload from main coroutine";
2755 return; 3594 return;
2756 } 3595 }
2757 3596
3597 return if $RELOAD++;
3598
3599 while ($RELOAD) {
2758 warn "reloading..."; 3600 warn "reloading...";
2759 3601
2760 warn "entering sync_job"; 3602 warn "entering sync_job";
2761 3603
2762 cf::sync_job { 3604 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3605 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3606 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3607 cf::write_runtime_sync; # external watchdog should not bark
2766 3608
2767 warn "syncing database to disk"; 3609 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3611
2770 # 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
2771 3613
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests"; 3614 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3615 while (IO::AIO::nreqs || BDB::nreqs) {
2783 warn "iterate..."; 3616 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = ();
2791
2792 warn "removing commands";
2793 %COMMAND = ();
2794
2795 warn "removing ext commands";
2796 %EXTCMD = ();
2797
2798 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg";
2801
2802 if (my $cb = $pkg->can ("unload")) {
2803 eval {
2804 $cb->($pkg);
2805 1
2806 } or warn "$pkg unloaded, but with errors: $@";
2807 } 3617 }
2808 3618
2809 warn "... nuking $pkg"; 3619 warn "cancelling all extension coros";
2810 Symbol::delete_package $pkg; 3620 $_->cancel for values %EXT_CORO;
2811 } 3621 %EXT_CORO = ();
2812 3622
2813 warn "unloading all perl modules loaded from $LIBDIR"; 3623 warn "removing commands";
2814 while (my ($k, $v) = each %INC) { 3624 %COMMAND = ();
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 3625
3626 warn "removing ext/exti commands";
3627 %EXTCMD = ();
3628 %EXTICMD = ();
3629
3630 warn "unloading/nuking all extensions";
3631 for my $pkg (@EXTS) {
2817 warn "... unloading $k"; 3632 warn "... unloading $pkg";
2818 delete $INC{$k};
2819 3633
2820 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g;
2822
2823 if (my $cb = $k->can ("unload_module")) { 3634 if (my $cb = $pkg->can ("unload")) {
3635 eval {
2824 $cb->(); 3636 $cb->($pkg);
3637 1
3638 } or warn "$pkg unloaded, but with errors: $@";
3639 }
3640
3641 warn "... clearing $pkg";
3642 clear_package $pkg;
2825 } 3643 }
2826 3644
2827 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;
2828 } 3660 }
2829 3661
2830 warn "getting rid of safe::, as good as possible"; 3662 warn "getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 3663 clear_package "safe::$_"
2832 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);
2833 3665
2834 warn "unloading cf.pm \"a bit\""; 3666 warn "unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 3667 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 3668 delete $INC{"cf/pod.pm"};
2837 3669
2838 # don't, removes xs symbols, too, 3670 # don't, removes xs symbols, too,
2839 # and global variables created in xs 3671 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 3672 #clear_package __PACKAGE__;
2841 3673
2842 warn "unload completed, starting to reload now"; 3674 warn "unload completed, starting to reload now";
2843 3675
2844 warn "reloading cf.pm"; 3676 warn "reloading cf.pm";
2845 require cf; 3677 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3678 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3679
2848 warn "loading config and database again"; 3680 warn "loading config and database again";
2849 cf::cfg_load; 3681 cf::reload_config;
2850 3682
2851 warn "loading extensions"; 3683 warn "loading extensions";
2852 cf::load_extensions; 3684 cf::load_extensions;
2853 3685
2854 warn "reattaching attachments to objects/players"; 3686 warn "reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 3687 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 3688 warn "reattaching attachments to maps";
2857 reattach $_ for values %MAP; 3689 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 3690 warn "reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 3691 reattach $_ for values %PLAYER;
2860 3692
2861 warn "leaving sync_job"; 3693 warn "leaving sync_job";
2862 3694
2863 1 3695 1
2864 } or do { 3696 } or do {
2865 warn $@; 3697 warn $@;
2866 warn "error while reloading, exiting."; 3698 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3699 };
2869 3700
2870 warn "reloaded"; 3701 warn "reloaded";
3702 --$RELOAD;
3703 }
2871}; 3704};
2872 3705
2873our $RELOAD_WATCHER; # used only during reload 3706our $RELOAD_WATCHER; # used only during reload
2874 3707
2875sub reload_perl() { 3708sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3709 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3710 # coro crashes during coro_state_free->destroy here.
2878 3711
2879 $RELOAD_WATCHER ||= Event->timer ( 3712 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2880 reentrant => 0,
2881 after => 0,
2882 data => WF_AUTOCANCEL,
2883 cb => sub {
2884 do_reload_perl; 3713 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3714 undef $RELOAD_WATCHER;
2886 },
2887 ); 3715 };
2888} 3716}
2889 3717
2890register_command "reload" => sub { 3718register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3719 my ($who, $arg) = @_;
2892 3720
2893 if ($who->flag (FLAG_WIZ)) { 3721 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3722 $who->message ("reloading server.");
3723 async {
3724 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3725 reload_perl;
3726 };
2896 } 3727 }
2897}; 3728};
2898 3729
2899unshift @INC, $LIBDIR; 3730unshift @INC, $LIBDIR;
2900 3731
… …
2902 3733
2903our @WAIT_FOR_TICK; 3734our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3735our @WAIT_FOR_TICK_BEGIN;
2905 3736
2906sub wait_for_tick { 3737sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3738 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3739
2910 my $signal = new Coro::Signal; 3740 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3741 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3742 $signal->wait;
2913} 3743}
2914 3744
2915sub wait_for_tick_begin { 3745sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3746 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3747
2919 my $signal = new Coro::Signal; 3748 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3749 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3750 $signal->wait;
2922} 3751}
2923 3752
2924 my $min = 1e6;#d# 3753sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3754 if ($Coro::current != $Coro::main) {
2934 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"
2935 unless ++$bug_warning > 10; 3756 unless ++$bug_warning > 10;
2936 return; 3757 return;
2937 } 3758 }
2938 3759
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3760 cf::server_tick; # one server iteration
2942 3761
2943 0 && sync_job {#d# 3762 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3763 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3764 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3765 $Coro::current->{desc} = "runtime saver";
2947 or die; 3766 write_runtime_sync
2948 3767 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3768 };
3769 }
2965 3770
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3771 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3772 $sig->send;
2982 } 3773 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3774 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3775 $sig->send;
2985 } 3776 }
2986 3777
2987 $NOW = Event::time; 3778 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3779 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3780
2998 _post_tick; 3781 if (0) {
2999 3782 if ($NEXT_TICK) {
3000 3783 my $jitter = $TICK_START - $NEXT_TICK;
3784 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3785 warn "jitter $JITTER\n";#d#
3786 }
3001 }, 3787 }
3002); 3788}
3003 3789
3004{ 3790{
3005 BDB::max_poll_time $TICK * 0.1; 3791 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3792
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3793 BDB::min_parallel 8;
3015 3794 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3795 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3796
3031 unless ($DB_ENV) { 3797 unless ($DB_ENV) {
3032 $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);
3033 3804
3034 cf::sync_job { 3805 cf::sync_job {
3035 eval { 3806 eval {
3036 BDB::db_env_open 3807 BDB::db_env_open
3037 $DB_ENV, 3808 $DB_ENV,
… …
3039 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
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3811 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3812 0666;
3042 3813
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3814 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3815 };
3048 3816
3049 cf::cleanup "db_env_open(db): $@" if $@; 3817 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3818 };
3051 } 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 };
3052} 3830}
3053 3831
3054{ 3832{
3833 # configure IO::AIO
3834
3055 IO::AIO::min_parallel 8; 3835 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3836 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3837 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3838}
3068 3839
3069my $_log_backtrace; 3840my $_log_backtrace;
3070 3841
3071sub _log_backtrace { 3842sub _log_backtrace {
… …
3074 $msg =~ s/\n//; 3845 $msg =~ s/\n//;
3075 3846
3076 # limit the # of concurrent backtraces 3847 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3848 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3849 ++$_log_backtrace;
3850 my $perl_bt = Carp::longmess $msg;
3079 async { 3851 async {
3852 $Coro::current->{desc} = "abt $msg";
3853
3080 my @bt = fork_call { 3854 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3855 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3856 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 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 |"
3084 or die "addr2line: $!"; 3858 or die "addr2line: $!";
… …
3092 } 3866 }
3093 3867
3094 @funcs 3868 @funcs
3095 }; 3869 };
3096 3870
3097 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $perl_bt\n";
3872 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 3873 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 3874 --$_log_backtrace;
3100 }; 3875 };
3101 } else { 3876 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 3877 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines