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.285 by root, Sun Jun 24 04:21:42 2007 UTC vs.
Revision 1.449 by root, Sat Sep 20 00:09:27 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Storable; 31use EV;
10use Event;
11use Opcode; 32use Opcode;
12use Safe; 33use Safe;
13use Safe::Hole; 34use Safe::Hole;
35use Storable ();
14 36
15use Coro 3.61 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
49use Coro::Util ();
24 50
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
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1630=item $protocol_xml = $player->expand_cfpod ($cfpod)
1353 1631
1354Expand crossfire pod fragments into protocol xml. 1632Expand deliantra pod fragments into protocol xml.
1355 1633
1356=cut
1357
1358sub expand_cfpod {
1359 ((my $self), (local $_)) = @_;
1360
1361 # escape & and <
1362 s/&/&amp;/g;
1363 s/(?<![BIUGH])</&lt;/g;
1364
1365 # this is buggy, it needs to properly take care of nested <'s
1366
1367 1 while
1368 # replace B<>, I<>, U<> etc.
1369 s/B<([^\>]*)>/<b>$1<\/b>/
1370 || s/I<([^\>]*)>/<i>$1<\/i>/
1371 || s/U<([^\>]*)>/<u>$1<\/u>/
1372 # replace G<male|female> tags
1373 || s{G<([^>|]*)\|([^>]*)>}{
1374 $self->gender ? $2 : $1
1375 }ge
1376 # replace H<hint text>
1377 || s/H<([^\>]*)>/<fg name="lightblue">[$1]<\/fg>/g;
1378
1379 # create single paragraphs (very hackish)
1380 s/(?<=\S)\n(?=\w)/ /g;
1381
1382 $_
1383}
1384
1385=item $player->ext_reply ($msgid, %msg) 1634=item $player->ext_reply ($msgid, @msg)
1386 1635
1387Sends an ext reply to the player. 1636Sends an ext reply to the player.
1388 1637
1389=cut 1638=cut
1390 1639
1391sub ext_reply($$%) { 1640sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1641 my ($self, $id, @msg) = @_;
1393 1642
1394 $msg{msgid} = $id; 1643 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1644}
1398 1645
1399=item $player->ext_event ($type, %msg) 1646=item $player->ext_msg ($type, @msg)
1400 1647
1401Sends an ext event to the client. 1648Sends an ext event to the client.
1402 1649
1403=cut 1650=cut
1404 1651
1405sub ext_event($$%) { 1652sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1653 my ($self, $type, @msg) = @_;
1407 1654
1408 $self->ns->ext_event ($type, %msg); 1655 $self->ns->ext_msg ($type, @msg);
1409} 1656}
1410 1657
1411=head3 cf::region 1658=head3 cf::region
1412 1659
1413=over 4 1660=over 4
… …
1426 my ($path) = @_; 1673 my ($path) = @_;
1427 1674
1428 my ($match, $specificity); 1675 my ($match, $specificity);
1429 1676
1430 for my $region (list) { 1677 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1678 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1679 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1680 if $region->specificity > $specificity;
1434 } 1681 }
1435 } 1682 }
1436 1683
… …
1457our $MAX_RESET = 3600; 1704our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1705our $DEFAULT_RESET = 3000;
1459 1706
1460sub generate_random_map { 1707sub generate_random_map {
1461 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
1462 # mit "rum" bekleckern, nicht 1712 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1713 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1556 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1557 return $self; 1807 return $self;
1558 } 1808 }
1559 } 1809 }
1560 1810
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1812 ()
1563} 1813}
1564 1814
1565sub init { 1815sub init {
1566 my ($self) = @_; 1816 my ($self) = @_;
… …
1588 1838
1589# the temporary/swap location 1839# the temporary/swap location
1590sub save_path { 1840sub save_path {
1591 my ($self) = @_; 1841 my ($self) = @_;
1592 1842
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1844 "$TMPDIR/$path.map"
1595} 1845}
1596 1846
1597# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1598sub uniq_path { 1848sub uniq_path {
1599 my ($self) = @_; 1849 my ($self) = @_;
1600 1850
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1852 "$UNIQUEDIR/$path"
1603} 1853}
1604 1854
1605# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1606# all maps in C++... 1856# all maps in C++...
… …
1629 1879
1630sub load_header_from($) { 1880sub load_header_from($) {
1631 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1632 1882
1633 utf8::encode $path; 1883 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 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;
1639 1892
1640 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1641 1894
1642 1 1895 1
1643} 1896}
… …
1697sub find { 1950sub find {
1698 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1699 1952
1700 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1701 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1703 1957
1704 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1705 my $guard = cf::lock_acquire "map_find:$path"; 1960 my $guard2 = cf::lock_acquire "map_find:$path";
1961
1706 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1707 or return; 1963 or return;
1708 1964
1709 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1710 1966
… …
1712 or return; 1968 or return;
1713 1969
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
1974 undef $guard1;
1717 $map->reset; 1975 $map->reset;
1718 undef $guard;
1719 return find $path; 1976 return find $path;
1720 } 1977 }
1721 1978
1722 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1723 } 1980 }
… …
1732 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1733 1990
1734 my $path = $self->{path}; 1991 my $path = $self->{path};
1735 1992
1736 { 1993 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1738 1995
1996 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 1998
1741 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1742 2000
1743 $self->alloc; 2001 $self->alloc;
1744 2002
1745 $self->pre_load; 2003 $self->pre_load;
1746 Coro::cede; 2004 cf::cede_to_tick;
1747 2005
2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2008 $self->_load_objects ($f)
1749 or return; 2009 or return;
1750 2010
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
1752 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1753 2013
1754 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2015 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2018 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1759 } 2022 }
1760 } 2023 }
1761 2024
1762 Coro::cede; 2025 $f->resolve_delayed_derefs;
2026
2027 cf::cede_to_tick;
1763 # now do the right thing for maps 2028 # now do the right thing for maps
1764 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2031 unless $self->difficulty;
1767 Coro::cede; 2032 cf::cede_to_tick;
1768 2033
1769 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2035 $self->decay_objects;
1771 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
1772 $self->update_buttons; 2037 $self->update_buttons;
1773 Coro::cede; 2038 cf::cede_to_tick;
1774 $self->set_darkness_map; 2039 $self->set_darkness_map;
1775 Coro::cede; 2040 cf::cede_to_tick;
1776 $self->activate; 2041 $self->activate;
1777 } 2042 }
1778 2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
2046
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2048 }
1781 2049
1782 $self->post_load; 2050 $self->post_load;
1783} 2051}
1784 2052
… …
1793 2061
1794 $self 2062 $self
1795} 2063}
1796 2064
1797# 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
1798sub load_diag { 2066sub load_neighbours {
1799 my ($map) = @_; 2067 my ($map) = @_;
1800 2068
1801 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1802 2070
1803 for (0 .. 3) { 2071 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1805 or next; 2073 or next;
1806 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1807 or next; 2075 or next;
1808 $neigh->load; 2076 $neigh->load;
1809 2077
2078 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2081 }
1813 2082
1814 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1816 or next; 2086 or next;
1817 $neigh->load; 2087 $neigh->load;
1818 } 2088 }
1819} 2089}
1820 2090
… …
1825} 2095}
1826 2096
1827sub do_load_sync { 2097sub do_load_sync {
1828 my ($map) = @_; 2098 my ($map) = @_;
1829 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1830 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1831} 2104}
1832 2105
1833our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1835 2108
1836sub find_async { 2109sub find_async {
1837 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1838 2111
1839 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1840 2113
1841 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2116 }
1844 2117
1845 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1846 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1847 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2125 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2126 $map->load if $v;
2127 }
1852 2128
1853 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1854 } 2130 }
1855 } 2131 }
1856 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1857 }; 2133 };
1858 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
… …
1861} 2137}
1862 2138
1863sub save { 2139sub save {
1864 my ($self) = @_; 2140 my ($self) = @_;
1865 2141
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2143
1868 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1869 2145
1870 return unless $self->dirty; 2146 return unless $self->dirty;
1871 2147
… …
1877 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1878 2154
1879 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1880 2156
1881 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1883 }; 2160 };
2161
2162 cf::get_slot 0.02;
1884 2163
1885 if ($uniq) { 2164 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2167 } else {
… …
1894 my ($self) = @_; 2173 my ($self) = @_;
1895 2174
1896 # save first because save cedes 2175 # save first because save cedes
1897 $self->save; 2176 $self->save;
1898 2177
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2179
1901 return if $self->players; 2180 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2182 return if $self->{deny_save};
1904 2183
2184 $self->in_memory (cf::MAP_SWAPPED);
2185
2186 $self->deactivate;
2187 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2188 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2189}
1908 2190
1909sub reset_at { 2191sub reset_at {
1910 my ($self) = @_; 2192 my ($self) = @_;
1911 2193
… …
1943 if $uniq; 2225 if $uniq;
1944 } 2226 }
1945 2227
1946 delete $cf::MAP{$self->path}; 2228 delete $cf::MAP{$self->path};
1947 2229
2230 $self->deactivate;
2231 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2232 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2233
1952 $self->unlink_save; 2234 $self->unlink_save;
1953 $self->destroy; 2235 $self->destroy;
1954} 2236}
1955 2237
1956my $nuke_counter = "aaaa"; 2238my $nuke_counter = "aaaa";
1957 2239
1958sub nuke { 2240sub nuke {
1959 my ($self) = @_; 2241 my ($self) = @_;
1960 2242
2243 {
2244 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245
1961 delete $cf::MAP{$self->path}; 2246 delete $cf::MAP{$self->path};
1962 2247
1963 $self->unlink_save; 2248 $self->unlink_save;
1964 2249
1965 bless $self, "cf::map"; 2250 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2251 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2252 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2253 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2254 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2255
1971 $cf::MAP{$self->path} = $self; 2256 $cf::MAP{$self->path} = $self;
2257 }
1972 2258
1973 $self->reset; # polite request, might not happen 2259 $self->reset; # polite request, might not happen
1974} 2260}
1975 2261
1976=item $maps = cf::map::tmp_maps 2262=item $maps = cf::map::tmp_maps
… …
2018 2304
2019sub unique_maps() { 2305sub unique_maps() {
2020 [ 2306 [
2021 map { 2307 map {
2022 utf8::decode $_; 2308 utf8::decode $_;
2023 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2024 ? normalise $_ 2312 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2314 ]
2028} 2315}
2029 2316
2030package cf;
2031
2032=back 2317=back
2033 2318
2034=head3 cf::object 2319=head3 cf::object
2035 2320
2036=cut 2321=cut
… …
2039 2324
2040=over 4 2325=over 4
2041 2326
2042=item $ob->inv_recursive 2327=item $ob->inv_recursive
2043 2328
2044Returns 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.
2045 2331
2046=cut 2332=cut
2047 2333
2048sub inv_recursive_; 2334sub inv_recursive_;
2049sub inv_recursive_ { 2335sub inv_recursive_ {
… …
2052 2338
2053sub inv_recursive { 2339sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2055} 2341}
2056 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
2057package cf; 2371package cf;
2058 2372
2059=back 2373=back
2060 2374
2061=head3 cf::object::player 2375=head3 cf::object::player
… …
2067Sends 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>
2068can 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
2069dialogue with the given NPC character. 2383dialogue with the given NPC character.
2070 2384
2071=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};
2072 2400
2073# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2402# with dialog boxes.
2075#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
2076sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
… …
2083 2411
2084 } else { 2412 } else {
2085 my $pl = $self->contr; 2413 my $pl = $self->contr;
2086 2414
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2415 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2090 $diag->{id},
2091 msgtype => "reply",
2092 msg => $diag->{pl}->expand_cfpod ($msg),
2093 add_topics => []
2094 );
2095 2418
2096 } else { 2419 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2422 }
2100 } 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 (@_);
2101} 2434}
2102 2435
2103=item $player_object->may ("access") 2436=item $player_object->may ("access")
2104 2437
2105Returns wether the given player is authorized to access resource "access" 2438Returns wether the given player is authorized to access resource "access"
… …
2118 2451
2119=item $player_object->enter_link 2452=item $player_object->enter_link
2120 2453
2121Freezes 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}>).
2122 2455
2123The 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.
2124I<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.
2125 2460
2126Will never block. 2461Will never block.
2127 2462
2128=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2129 2464
… …
2184 # use -1 or undef as default coordinates, not 0, 0 2519 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2520 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2521 if $x <=0 && $y <= 0;
2187 2522
2188 $map->load; 2523 $map->load;
2189 $map->load_diag; 2524 $map->load_neighbours;
2190 2525
2191 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2192 $self->activate_recursive; 2528 $self->activate_recursive;
2193 2529
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2196} 2532}
2197 2533
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2534=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2535
2200Moves 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
2201her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2202that 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
2203the 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 >>.
2204 2544
2205=cut 2545=cut
2206 2546
2207our $GOTOGEN; 2547our $GOTOGEN;
2208 2548
2209sub cf::object::player::goto { 2549sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2550 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2551
2212 # 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
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2553 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2554
2215 $self->enter_link; 2555 $self->enter_link;
2216 2556
2217 (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
2218 my $map = eval { 2579 my $map = eval {
2219 my $map = cf::map::find $path; 2580 my $map = defined $path ? cf::map::find $path : undef;
2220 2581
2221 if ($map) { 2582 if ($map) {
2222 $map = $map->customise_for ($self); 2583 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2584 $map = $check->($map) if $check && $map;
2224 } else { 2585 } else {
2225 $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);
2226 } 2587 }
2227 2588
2228 $map 2589 $map
2229 }; 2590 };
2230 2591
… …
2235 2596
2236 if ($gen == $self->{_goto_generation}) { 2597 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2598 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2599 $self->leave_link ($map, $x, $y);
2239 } 2600 }
2601
2602 $done->() if $done;
2240 })->prio (1); 2603 })->prio (1);
2241} 2604}
2242 2605
2243=item $player_object->enter_exit ($exit_object) 2606=item $player_object->enter_exit ($exit_object)
2244 2607
… …
2264} 2627}
2265 2628
2266sub prepare_random_map { 2629sub prepare_random_map {
2267 my ($exit) = @_; 2630 my ($exit) = @_;
2268 2631
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2634 # that depends on the exit object
2274 2635
2275 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
… …
2277 if ($exit->map) { 2638 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2282 } 2645 }
2283 2646
2284 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2285 2648
2286 my $data = cf::to_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2289 2652
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2655 undef $fh;
2293 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2294 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2297 } 2664 }
2298} 2665}
2299 2666
2300sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2302 2669
2303 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2304 2671
2305 if ($exit->slaying eq "/!") {
2306 #TODO: this should de-fi-ni-te-ly not be a sync-job
2307 # the problem is that $exit might not survive long enough
2308 # so it needs to be done right now, right here
2309 cf::sync_job { prepare_random_map $exit };
2310 }
2311
2312 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2313 my $hp = $exit->stats->hp;
2314 my $sp = $exit->stats->sp;
2315
2316 $self->enter_link; 2672 $self->enter_link;
2317 2673
2318 (async { 2674 (async {
2319 $self->deactivate_recursive; # just to be sure 2675 $Coro::current->{desc} = "enter_exit";
2676
2320 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
2321 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2322 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
2323 1; 2698 1
2324 }) { 2699 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2326 . "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. "
2327 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2329 2704
2330 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
… …
2349 2724
2350 utf8::encode $text; 2725 utf8::encode $text;
2351 $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);
2352} 2727}
2353 2728
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2729=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2730
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2731Send a drawinfo or msg packet to the client, formatting the msg for the
2357client if neccessary. C<$type> should be a string identifying the type of 2732client if neccessary. C<$type> should be a string identifying the type of
2358the message, with C<log> being the default. If C<$color> is negative, suppress 2733the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2734the message unless the client supports the msg packet.
2360 2735
2361=cut 2736=cut
2362 2737
2738# non-persistent channels (usually the info channel)
2739our %CHANNEL = (
2740 "c/identify" => {
2741 id => "infobox",
2742 title => "Identify",
2743 reply => undef,
2744 tooltip => "Items recently identified",
2745 },
2746 "c/examine" => {
2747 id => "infobox",
2748 title => "Examine",
2749 reply => undef,
2750 tooltip => "Signs and other items you examined",
2751 },
2752 "c/book" => {
2753 id => "infobox",
2754 title => "Book",
2755 reply => undef,
2756 tooltip => "The contents of a note or book",
2757 },
2758 "c/lookat" => {
2759 id => "infobox",
2760 title => "Look",
2761 reply => undef,
2762 tooltip => "What you saw there",
2763 },
2764 "c/who" => {
2765 id => "infobox",
2766 title => "Players",
2767 reply => undef,
2768 tooltip => "Shows players who are currently online",
2769 },
2770 "c/body" => {
2771 id => "infobox",
2772 title => "Body Parts",
2773 reply => undef,
2774 tooltip => "Shows which body parts you posess and are available",
2775 },
2776 "c/uptime" => {
2777 id => "infobox",
2778 title => "Uptime",
2779 reply => undef,
2780 tooltip => "How long the server has been running since last restart",
2781 },
2782 "c/mapinfo" => {
2783 id => "infobox",
2784 title => "Map Info",
2785 reply => undef,
2786 tooltip => "Information related to the maps",
2787 },
2788 "c/party" => {
2789 id => "party",
2790 title => "Party",
2791 reply => "gsay ",
2792 tooltip => "Messages and chat related to your party",
2793 },
2794);
2795
2363sub cf::client::send_msg { 2796sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2797 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2798
2366 $msg = $self->pl->expand_cfpod ($msg); 2799 $msg = $self->pl->expand_cfpod ($msg)
2800 unless $color & cf::NDI_VERBATIM;
2801
2802 $color &= cf::NDI_CLIENT_MASK; # just in case...
2803
2804 # check predefined channels, for the benefit of C
2805 if ($CHANNEL{$channel}) {
2806 $channel = $CHANNEL{$channel};
2807
2808 $self->ext_msg (channel_info => $channel)
2809 if $self->can_msg;
2810
2811 $channel = $channel->{id};
2812
2813 } elsif (ref $channel) {
2814 # send meta info to client, if not yet sent
2815 unless (exists $self->{channel}{$channel->{id}}) {
2816 $self->{channel}{$channel->{id}} = $channel;
2817 $self->ext_msg (channel_info => $channel)
2818 if $self->can_msg;
2819 }
2820
2821 $channel = $channel->{id};
2822 }
2823
2824 return unless @extra || length $msg;
2367 2825
2368 if ($self->can_msg) { 2826 if ($self->can_msg) {
2369 $self->send_packet ("msg " . cf::to_json [$color, $type, $msg, @extra]); 2827 # default colour, mask it out
2828 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2829 if $color & cf::NDI_DEF;
2830
2831 my $pkt = "msg "
2832 . $self->{json_coder}->encode (
2833 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2834 );
2835
2836 # try lzf for large packets
2837 $pkt = "lzf " . Compress::LZF::compress $pkt
2838 if 1024 <= length $pkt and $self->{can_lzf};
2839
2840 # split very large packets
2841 if (8192 < length $pkt and $self->{can_lzf}) {
2842 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2843 $pkt = "frag";
2844 }
2845
2846 $self->send_packet ($pkt);
2370 } else { 2847 } else {
2371 # replace some tags by gcfclient-compatible ones
2372 for ($msg) {
2373 1 while
2374 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2375 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2376 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2377 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2378 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2379 }
2380
2381 if ($color >= 0) { 2848 if ($color >= 0) {
2849 # replace some tags by gcfclient-compatible ones
2850 for ($msg) {
2851 1 while
2852 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2853 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2854 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2855 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2856 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2857 }
2858
2859 $color &= cf::NDI_COLOR_MASK;
2860
2861 utf8::encode $msg;
2862
2382 if (0 && $msg =~ /\[/) { 2863 if (0 && $msg =~ /\[/) {
2864 # COMMAND/INFO
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2865 $self->send_packet ("drawextinfo $color 10 8 $msg")
2384 } else { 2866 } else {
2385 s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2867 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2386 $self->send_packet ("drawinfo $color $msg") 2868 $self->send_packet ("drawinfo $color $msg")
2387 } 2869 }
2388 } 2870 }
2389 } 2871 }
2390} 2872}
2391 2873
2392=item $client->ext_event ($type, %msg) 2874=item $client->ext_msg ($type, @msg)
2393 2875
2394Sends an exti event to the client. 2876Sends an ext event to the client.
2395 2877
2396=cut 2878=cut
2397 2879
2398sub cf::client::ext_event($$%) { 2880sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2881 my ($self, $type, @msg) = @_;
2400 2882
2883 if ($self->extcmd == 2) {
2884 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2885 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2886 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2887 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2888 }
2889}
2890
2891=item $client->ext_reply ($msgid, @msg)
2892
2893Sends an ext reply to the client.
2894
2895=cut
2896
2897sub cf::client::ext_reply($$@) {
2898 my ($self, $id, @msg) = @_;
2899
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2902 } elsif ($self->extcmd == 1) {
2903 #TODO: version 1, remove
2904 unshift @msg, msgtype => "reply", msgid => $id;
2905 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2906 }
2403} 2907}
2404 2908
2405=item $success = $client->query ($flags, "text", \&cb) 2909=item $success = $client->query ($flags, "text", \&cb)
2406 2910
2407Queues a query to the client, calling the given callback with 2911Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2912the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2409C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2913C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2914
2411Queries can fail, so check the return code. Or don't, as queries will become 2915Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2916become reliable at some point in the future.
2413 2917
2414=cut 2918=cut
2415 2919
2416sub cf::client::query { 2920sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2921 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2929 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2930 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2931
2428 $self->send_packet ($self->{query_queue}[0][0]) 2932 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2933 if @{ $self->{query_queue} } == 1;
2934
2935 1
2430} 2936}
2431 2937
2432cf::client->attach ( 2938cf::client->attach (
2939 on_connect => sub {
2940 my ($ns) = @_;
2941
2942 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2943 },
2433 on_reply => sub { 2944 on_reply => sub {
2434 my ($ns, $msg) = @_; 2945 my ($ns, $msg) = @_;
2435 2946
2436 # this weird shuffling is so that direct followup queries 2947 # this weird shuffling is so that direct followup queries
2437 # get handled first 2948 # get handled first
… …
2449 } else { 2960 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2961 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2962 }
2452 } 2963 }
2453 }, 2964 },
2965 on_exticmd => sub {
2966 my ($ns, $buf) = @_;
2967
2968 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2969
2970 if (ref $msg) {
2971 my ($type, $reply, @payload) =
2972 "ARRAY" eq ref $msg
2973 ? @$msg
2974 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2975
2976 my @reply;
2977
2978 if (my $cb = $EXTICMD{$type}) {
2979 @reply = $cb->($ns, @payload);
2980 }
2981
2982 $ns->ext_reply ($reply, @reply)
2983 if $reply;
2984
2985 } else {
2986 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2987 }
2988
2989 cf::override;
2990 },
2454); 2991);
2455 2992
2456=item $client->async (\&cb) 2993=item $client->async (\&cb)
2457 2994
2458Create a new coroutine, running the specified callback. The coroutine will 2995Create a new coroutine, running the specified callback. The coroutine will
… …
2499our $safe = new Safe "safe"; 3036our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3037our $safe_hole = new Safe::Hole;
2501 3038
2502$SIG{FPE} = 'IGNORE'; 3039$SIG{FPE} = 'IGNORE';
2503 3040
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3041$safe->permit_only (Opcode::opset qw(
3042 :base_core :base_mem :base_orig :base_math
3043 grepstart grepwhile mapstart mapwhile
3044 sort time
3045));
2505 3046
2506# here we export the classes and methods available to script code 3047# here we export the classes and methods available to script code
2507 3048
2508=pod 3049=pod
2509 3050
2510The following functions and methods are available within a safe environment: 3051The following functions and methods are available within a safe environment:
2511 3052
2512 cf::object contr pay_amount pay_player map 3053 cf::object
3054 contr pay_amount pay_player map x y force_find force_add destroy
3055 insert remove name archname title slaying race decrease split
3056
2513 cf::object::player player 3057 cf::object::player
2514 cf::player peaceful 3058 player
2515 cf::map trigger 3059
3060 cf::player
3061 peaceful
3062
3063 cf::map
3064 trigger
2516 3065
2517=cut 3066=cut
2518 3067
2519for ( 3068for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3069 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3070 insert remove inv nrof name archname title slaying race
3071 decrease split destroy change_exp)],
2521 ["cf::object::player" => qw(player)], 3072 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3073 ["cf::player" => qw(peaceful)],
2523 ["cf::map" => qw(trigger)], 3074 ["cf::map" => qw(trigger)],
2524) { 3075) {
2525 no strict 'refs'; 3076 no strict 'refs';
… …
2601# the server's init and main functions 3152# the server's init and main functions
2602 3153
2603sub load_facedata($) { 3154sub load_facedata($) {
2604 my ($path) = @_; 3155 my ($path) = @_;
2605 3156
3157 # HACK to clear player env face cache, we need some signal framework
3158 # for this (global event?)
3159 %ext::player_env::MUSIC_FACE_CACHE = ();
3160
3161 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3162
2606 warn "loading facedata from $path\n"; 3163 warn "loading facedata from $path\n";
2607 3164
2608 my $facedata; 3165 my $facedata;
2609 0 < aio_load $path, $facedata 3166 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3167 or die "$path: $!";
… …
2612 $facedata = Coro::Storable::thaw $facedata; 3169 $facedata = Coro::Storable::thaw $facedata;
2613 3170
2614 $facedata->{version} == 2 3171 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3172 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3173
3174 # patch in the exptable
3175 $facedata->{resource}{"res/exp_table"} = {
3176 type => FT_RSRC,
3177 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3178 };
3179 cf::cede_to_tick;
3180
2617 { 3181 {
2618 my $faces = $facedata->{faceinfo}; 3182 my $faces = $facedata->{faceinfo};
2619 3183
2620 while (my ($face, $info) = each %$faces) { 3184 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3185 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3186
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3187 cf::face::set_visibility $idx, $info->{visibility};
3188 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3189 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3190 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3191
3192 cf::cede_to_tick;
2626 } 3193 }
2627 3194
2628 while (my ($face, $info) = each %$faces) { 3195 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3196 next unless $info->{smooth};
3197
2630 my $idx = cf::face::find $face 3198 my $idx = cf::face::find $face
2631 or next; 3199 or next;
3200
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3201 if (my $smooth = cf::face::find $info->{smooth}) {
3202 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3203 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3204 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3205 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3206 }
2637 Coro::cede; 3207
3208 cf::cede_to_tick;
2638 } 3209 }
2639 } 3210 }
2640 3211
2641 { 3212 {
2642 my $anims = $facedata->{animinfo}; 3213 my $anims = $facedata->{animinfo};
2643 3214
2644 while (my ($anim, $info) = each %$anims) { 3215 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3216 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3217 cf::cede_to_tick;
2647 } 3218 }
2648 3219
2649 cf::anim::invalidate_all; # d'oh 3220 cf::anim::invalidate_all; # d'oh
2650 } 3221 }
2651 3222
3223 {
3224 # TODO: for gcfclient pleasure, we should give resources
3225 # that gcfclient doesn't grok a >10000 face index.
3226 my $res = $facedata->{resource};
3227
3228 while (my ($name, $info) = each %$res) {
3229 if (defined $info->{type}) {
3230 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3231 my $data;
3232
3233 if ($info->{type} & 1) {
3234 # prepend meta info
3235
3236 my $meta = $enc->encode ({
3237 name => $name,
3238 %{ $info->{meta} || {} },
3239 });
3240
3241 $data = pack "(w/a*)*", $meta, $info->{data};
3242 } else {
3243 $data = $info->{data};
3244 }
3245
3246 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3247 cf::face::set_type $idx, $info->{type};
3248 } else {
3249 $RESOURCE{$name} = $info;
3250 }
3251
3252 cf::cede_to_tick;
3253 }
3254 }
3255
3256 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3257
2652 1 3258 1
2653} 3259}
2654 3260
3261cf::global->attach (on_resource_update => sub {
3262 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3263 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3264
3265 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3266 my $sound = $soundconf->{compat}[$_]
3267 or next;
3268
3269 my $face = cf::face::find "sound/$sound->[1]";
3270 cf::sound::set $sound->[0] => $face;
3271 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3272 }
3273
3274 while (my ($k, $v) = each %{$soundconf->{event}}) {
3275 my $face = cf::face::find "sound/$v";
3276 cf::sound::set $k => $face;
3277 }
3278 }
3279});
3280
3281register_exticmd fx_want => sub {
3282 my ($ns, $want) = @_;
3283
3284 while (my ($k, $v) = each %$want) {
3285 $ns->fx_want ($k, $v);
3286 }
3287};
3288
3289sub load_resource_file($) {
3290 my $guard = lock_acquire "load_resource_file";
3291
3292 my $status = load_resource_file_ $_[0];
3293 get_slot 0.1, 100;
3294 cf::arch::commit_load;
3295
3296 $status
3297}
3298
2655sub reload_regions { 3299sub reload_regions {
3300 # HACK to clear player env face cache, we need some signal framework
3301 # for this (global event?)
3302 %ext::player_env::MUSIC_FACE_CACHE = ();
3303
2656 load_resource_file "$MAPDIR/regions" 3304 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3305 or die "unable to load regions file\n";
3306
3307 for (cf::region::list) {
3308 $_->{match} = qr/$_->{match}/
3309 if exists $_->{match};
3310 }
2658} 3311}
2659 3312
2660sub reload_facedata { 3313sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3314 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3315 or die "unable to load facedata\n";
… …
2673} 3326}
2674 3327
2675sub reload_resources { 3328sub reload_resources {
2676 warn "reloading resource files...\n"; 3329 warn "reloading resource files...\n";
2677 3330
3331 reload_facedata;
3332 reload_archetypes;
2678 reload_regions; 3333 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures; 3334 reload_treasures;
2683 3335
2684 warn "finished reloading resource files\n"; 3336 warn "finished reloading resource files\n";
2685} 3337}
2686 3338
2687sub init { 3339sub init {
3340 my $guard = freeze_mainloop;
3341
3342 evthread_start IO::AIO::poll_fileno;
3343
2688 reload_resources; 3344 reload_resources;
2689} 3345}
2690 3346
2691sub cfg_load { 3347sub reload_config {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3349 or return;
2694 3350
2695 local $/; 3351 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3352 *CFG = YAML::Load <$fh>;
2697 3353
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2699 3355
2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2701 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2707 }; 3363 };
2708 warn $@ if $@; 3364 warn $@ if $@;
2709 } 3365 }
2710} 3366}
2711 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
2712sub main { 3387sub main {
3388 atomic;
3389
2713 # we must not ever block the main coroutine 3390 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3391 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3392 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3393 (async {
2717 Event::one_event; 3394 $Coro::current->{desc} = "IDLE BUG HANDLER";
3395 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3396 })->prio (Coro::PRIO_MAX);
2719 }; 3397 };
2720 3398
2721 cfg_load; 3399 {
3400 my $guard = freeze_mainloop;
3401 reload_config;
2722 db_init; 3402 db_init;
2723 load_extensions; 3403 load_extensions;
2724 3404
2725 $TICK_WATCHER->start; 3405 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3406 }
3407
3408 utime time, time, $RUNTIMEFILE;
3409
3410 # no (long-running) fork's whatsoever before this point(!)
3411 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3412
2726 Event::loop; 3413 EV::loop;
2727} 3414}
2728 3415
2729############################################################################# 3416#############################################################################
2730# initialisation and cleanup 3417# initialisation and cleanup
2731 3418
2732# install some emergency cleanup handlers 3419# install some emergency cleanup handlers
2733BEGIN { 3420BEGIN {
3421 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3422 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3423 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2736 reentrant => 0,
2737 data => WF_AUTOCANCEL,
2738 signal => $signal,
2739 prio => 0,
2740 cb => sub {
2741 cf::cleanup "SIG$signal"; 3424 cf::cleanup "SIG$signal";
2742 },
2743 ); 3425 };
2744 } 3426 }
2745} 3427}
2746 3428
2747sub write_runtime { 3429sub write_runtime_sync {
2748 my $runtime = "$LOCALDIR/runtime";
2749
2750 # first touch the runtime file to show we are still running: 3430 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time. 3431 # the fsync below can take a very very long time.
2752 3432
2753 IO::AIO::aio_utime $runtime, undef, undef; 3433 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2754 3434
2755 my $guard = cf::lock_acquire "write_runtime"; 3435 my $guard = cf::lock_acquire "write_runtime";
2756 3436
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3437 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2758 or return; 3438 or return;
2759 3439
2760 my $value = $cf::RUNTIME + 90 + 10; 3440 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock 3441 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server. 3442 # 60 allows for the watchdog to kill the server.
… …
2772 aio_utime $fh, undef, undef; 3452 aio_utime $fh, undef, undef;
2773 3453
2774 close $fh 3454 close $fh
2775 or return; 3455 or return;
2776 3456
2777 aio_rename "$runtime~", $runtime 3457 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2778 and return; 3458 and return;
2779 3459
2780 warn "runtime file written.\n"; 3460 warn "runtime file written.\n";
2781 3461
2782 1 3462 1
3463}
3464
3465our $uuid_lock;
3466our $uuid_skip;
3467
3468sub write_uuid_sync($) {
3469 $uuid_skip ||= $_[0];
3470
3471 return if $uuid_lock;
3472 local $uuid_lock = 1;
3473
3474 my $uuid = "$LOCALDIR/uuid";
3475
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return;
3478
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3480 $uuid_skip = 0;
3481
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return;
3484
3485 # always fsync - this file is important
3486 aio_fsync $fh
3487 and return;
3488
3489 close $fh
3490 or return;
3491
3492 aio_rename "$uuid~", $uuid
3493 and return;
3494
3495 warn "uuid file written ($value).\n";
3496
3497 1
3498
3499}
3500
3501sub write_uuid($$) {
3502 my ($skip, $sync) = @_;
3503
3504 $sync ? write_uuid_sync $skip
3505 : async { write_uuid_sync $skip };
2783} 3506}
2784 3507
2785sub emergency_save() { 3508sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop; 3509 my $freeze_guard = cf::freeze_mainloop;
2787 3510
… …
2793 # and maps saved/destroyed asynchronously. 3516 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3517 warn "begin emergency player save\n";
2795 for my $login (keys %cf::PLAYER) { 3518 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3519 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3520 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3522 $pl->save;
2799 } 3523 }
2800 warn "end emergency player save\n"; 3524 warn "end emergency player save\n";
2801 3525
2802 warn "begin emergency map save\n"; 3526 warn "begin emergency map save\n";
… …
2808 warn "end emergency map save\n"; 3532 warn "end emergency map save\n";
2809 3533
2810 warn "begin emergency database checkpoint\n"; 3534 warn "begin emergency database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV; 3535 BDB::db_env_txn_checkpoint $DB_ENV;
2812 warn "end emergency database checkpoint\n"; 3536 warn "end emergency database checkpoint\n";
3537
3538 warn "begin write uuid\n";
3539 write_uuid_sync 1;
3540 warn "end write uuid\n";
2813 }; 3541 };
2814 3542
2815 warn "leave emergency perl save\n"; 3543 warn "leave emergency perl save\n";
2816} 3544}
2817 3545
2818sub post_cleanup { 3546sub post_cleanup {
2819 my ($make_core) = @_; 3547 my ($make_core) = @_;
2820 3548
2821 warn Carp::longmess "post_cleanup backtrace" 3549 warn Carp::longmess "post_cleanup backtrace"
2822 if $make_core; 3550 if $make_core;
3551
3552 my $fh = pidfile;
3553 unlink $PIDFILE if <$fh> == $$;
2823} 3554}
3555
3556# a safer delete_package, copied from Symbol
3557sub clear_package($) {
3558 my $pkg = shift;
3559
3560 # expand to full symbol table name if needed
3561 unless ($pkg =~ /^main::.*::$/) {
3562 $pkg = "main$pkg" if $pkg =~ /^::/;
3563 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3564 $pkg .= '::' unless $pkg =~ /::$/;
3565 }
3566
3567 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3568 my $stem_symtab = *{$stem}{HASH};
3569
3570 defined $stem_symtab and exists $stem_symtab->{$leaf}
3571 or return;
3572
3573 # clear all symbols
3574 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3575 for my $name (keys %$leaf_symtab) {
3576 _gv_clear *{"$pkg$name"};
3577# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3578 }
3579 warn "cleared package #$pkg\n";#d#
3580}
3581
3582our $RELOAD; # how many times to reload
2824 3583
2825sub do_reload_perl() { 3584sub do_reload_perl() {
2826 # can/must only be called in main 3585 # can/must only be called in main
2827 if ($Coro::current != $Coro::main) { 3586 if ($Coro::current != $Coro::main) {
2828 warn "can only reload from main coroutine"; 3587 warn "can only reload from main coroutine";
2829 return; 3588 return;
2830 } 3589 }
2831 3590
3591 return if $RELOAD++;
3592
3593 while ($RELOAD) {
2832 warn "reloading..."; 3594 warn "reloading...";
2833 3595
2834 warn "entering sync_job"; 3596 warn "entering sync_job";
2835 3597
2836 cf::sync_job { 3598 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark 3599 cf::write_runtime_sync; # external watchdog should not bark
2838 cf::emergency_save; 3600 cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark 3601 cf::write_runtime_sync; # external watchdog should not bark
2840 3602
2841 warn "syncing database to disk"; 3603 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3605
2844 # if anything goes wrong in here, we should simply crash as we already saved 3606 # if anything goes wrong in here, we should simply crash as we already saved
2845 3607
2846 warn "cancelling all WF_AUTOCANCEL watchers";
2847 for (Event::all_watchers) {
2848 $_->cancel if $_->data & WF_AUTOCANCEL;
2849 }
2850
2851 warn "flushing outstanding aio requests"; 3608 warn "flushing outstanding aio requests";
2852 for (;;) {
2853 BDB::flush;
2854 IO::AIO::flush;
2855 Coro::cede;
2856 last unless IO::AIO::nreqs || BDB::nreqs; 3609 while (IO::AIO::nreqs || BDB::nreqs) {
2857 warn "iterate..."; 3610 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2858 }
2859
2860 ++$RELOAD;
2861
2862 warn "cancelling all extension coros";
2863 $_->cancel for values %EXT_CORO;
2864 %EXT_CORO = ();
2865
2866 warn "removing commands";
2867 %COMMAND = ();
2868
2869 warn "removing ext commands";
2870 %EXTCMD = ();
2871
2872 warn "unloading/nuking all extensions";
2873 for my $pkg (@EXTS) {
2874 warn "... unloading $pkg";
2875
2876 if (my $cb = $pkg->can ("unload")) {
2877 eval {
2878 $cb->($pkg);
2879 1
2880 } or warn "$pkg unloaded, but with errors: $@";
2881 } 3611 }
2882 3612
2883 warn "... nuking $pkg"; 3613 warn "cancelling all extension coros";
2884 Symbol::delete_package $pkg; 3614 $_->cancel for values %EXT_CORO;
2885 } 3615 %EXT_CORO = ();
2886 3616
2887 warn "unloading all perl modules loaded from $LIBDIR"; 3617 warn "removing commands";
2888 while (my ($k, $v) = each %INC) { 3618 %COMMAND = ();
2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2890 3619
3620 warn "removing ext/exti commands";
3621 %EXTCMD = ();
3622 %EXTICMD = ();
3623
3624 warn "unloading/nuking all extensions";
3625 for my $pkg (@EXTS) {
2891 warn "... unloading $k"; 3626 warn "... unloading $pkg";
2892 delete $INC{$k};
2893 3627
2894 $k =~ s/\.pm$//;
2895 $k =~ s/\//::/g;
2896
2897 if (my $cb = $k->can ("unload_module")) { 3628 if (my $cb = $pkg->can ("unload")) {
3629 eval {
2898 $cb->(); 3630 $cb->($pkg);
3631 1
3632 } or warn "$pkg unloaded, but with errors: $@";
3633 }
3634
3635 warn "... clearing $pkg";
3636 clear_package $pkg;
2899 } 3637 }
2900 3638
2901 Symbol::delete_package $k; 3639 warn "unloading all perl modules loaded from $LIBDIR";
3640 while (my ($k, $v) = each %INC) {
3641 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3642
3643 warn "... unloading $k";
3644 delete $INC{$k};
3645
3646 $k =~ s/\.pm$//;
3647 $k =~ s/\//::/g;
3648
3649 if (my $cb = $k->can ("unload_module")) {
3650 $cb->();
3651 }
3652
3653 clear_package $k;
2902 } 3654 }
2903 3655
2904 warn "getting rid of safe::, as good as possible"; 3656 warn "getting rid of safe::, as good as possible";
2905 Symbol::delete_package "safe::$_" 3657 clear_package "safe::$_"
2906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3658 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2907 3659
2908 warn "unloading cf.pm \"a bit\""; 3660 warn "unloading cf.pm \"a bit\"";
2909 delete $INC{"cf.pm"}; 3661 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"}; 3662 delete $INC{"cf/pod.pm"};
2911 3663
2912 # don't, removes xs symbols, too, 3664 # don't, removes xs symbols, too,
2913 # and global variables created in xs 3665 # and global variables created in xs
2914 #Symbol::delete_package __PACKAGE__; 3666 #clear_package __PACKAGE__;
2915 3667
2916 warn "unload completed, starting to reload now"; 3668 warn "unload completed, starting to reload now";
2917 3669
2918 warn "reloading cf.pm"; 3670 warn "reloading cf.pm";
2919 require cf; 3671 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3672 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3673
2922 warn "loading config and database again"; 3674 warn "loading config and database again";
2923 cf::cfg_load; 3675 cf::reload_config;
2924 3676
2925 warn "loading extensions"; 3677 warn "loading extensions";
2926 cf::load_extensions; 3678 cf::load_extensions;
2927 3679
2928 warn "reattaching attachments to objects/players"; 3680 warn "reattaching attachments to objects/players";
2929 _global_reattach; # objects, sockets 3681 _global_reattach; # objects, sockets
2930 warn "reattaching attachments to maps"; 3682 warn "reattaching attachments to maps";
2931 reattach $_ for values %MAP; 3683 reattach $_ for values %MAP;
2932 warn "reattaching attachments to players"; 3684 warn "reattaching attachments to players";
2933 reattach $_ for values %PLAYER; 3685 reattach $_ for values %PLAYER;
2934 3686
2935 warn "leaving sync_job"; 3687 warn "leaving sync_job";
2936 3688
2937 1 3689 1
2938 } or do { 3690 } or do {
2939 warn $@; 3691 warn $@;
2940 warn "error while reloading, exiting."; 3692 cf::cleanup "error while reloading, exiting.";
2941 exit 1;
2942 }; 3693 };
2943 3694
2944 warn "reloaded"; 3695 warn "reloaded";
3696 --$RELOAD;
3697 }
2945}; 3698};
2946 3699
2947our $RELOAD_WATCHER; # used only during reload 3700our $RELOAD_WATCHER; # used only during reload
2948 3701
2949sub reload_perl() { 3702sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3703 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3704 # coro crashes during coro_state_free->destroy here.
2952 3705
2953 $RELOAD_WATCHER ||= Event->timer ( 3706 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
2954 reentrant => 0,
2955 after => 0,
2956 data => WF_AUTOCANCEL,
2957 cb => sub {
2958 do_reload_perl; 3707 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3708 undef $RELOAD_WATCHER;
2960 },
2961 ); 3709 };
2962} 3710}
2963 3711
2964register_command "reload" => sub { 3712register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3713 my ($who, $arg) = @_;
2966 3714
2967 if ($who->flag (FLAG_WIZ)) { 3715 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3716 $who->message ("reloading server.");
3717 async {
3718 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3719 reload_perl;
3720 };
2970 } 3721 }
2971}; 3722};
2972 3723
2973unshift @INC, $LIBDIR; 3724unshift @INC, $LIBDIR;
2974 3725
… …
2976 3727
2977our @WAIT_FOR_TICK; 3728our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 3729our @WAIT_FOR_TICK_BEGIN;
2979 3730
2980sub wait_for_tick { 3731sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main; 3732 return if tick_inhibit || $Coro::current == $Coro::main;
2983 3733
2984 my $signal = new Coro::Signal; 3734 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 3735 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 3736 $signal->wait;
2987} 3737}
2988 3738
2989sub wait_for_tick_begin { 3739sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main; 3740 return if tick_inhibit || $Coro::current == $Coro::main;
2992 3741
2993 my $signal = new Coro::Signal; 3742 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3743 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3744 $signal->wait;
2996} 3745}
2997 3746
2998 my $min = 1e6;#d# 3747sub tick {
2999 my $avg = 10;
3000$TICK_WATCHER = Event->timer (
3001 reentrant => 0,
3002 parked => 1,
3003 prio => 0,
3004 at => $NEXT_TICK || $TICK,
3005 data => WF_AUTOCANCEL,
3006 cb => sub {
3007 if ($Coro::current != $Coro::main) { 3748 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3749 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 3750 unless ++$bug_warning > 10;
3010 return; 3751 return;
3011 } 3752 }
3012 3753
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 3754 cf::server_tick; # one server iteration
3016 3755
3017 0 && sync_job {#d# 3756 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3018 for(1..10) { 3757 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3019 my $t = Event::time; 3758 Coro::async_pool {
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3759 $Coro::current->{desc} = "runtime saver";
3021 or die; 3760 write_runtime_sync
3022 3761 or warn "ERROR: unable to write runtime file: $!";
3023 $map->width (50);
3024 $map->height (50);
3025 $map->alloc;
3026 $map->_load_objects ("/tmp/x.map", 1);
3027 my $t = Event::time - $t;
3028
3029 #next unless $t < 0.0013;#d#
3030 if ($t < $min) {
3031 $min = $t;
3032 }
3033 $avg = $avg * 0.99 + $t * 0.01;
3034 }
3035 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3036 exit 0;
3037 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3038 }; 3762 };
3763 }
3039 3764
3040 $RUNTIME += $TICK;
3041 $NEXT_TICK += $TICK;
3042
3043 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3044 $NEXT_RUNTIME_WRITE = $NOW + 10;
3045 Coro::async_pool {
3046 write_runtime
3047 or warn "ERROR: unable to write runtime file: $!";
3048 };
3049 }
3050
3051# my $AFTER = Event::time;
3052# warn $AFTER - $NOW;#d#
3053
3054 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3765 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3766 $sig->send;
3056 } 3767 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3768 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3769 $sig->send;
3059 } 3770 }
3060 3771
3061 $NOW = Event::time; 3772 $LOAD = ($NOW - $TICK_START) / $TICK;
3062
3063 # if we are delayed by four ticks or more, skip them all
3064 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3065
3066 $TICK_WATCHER->at ($NEXT_TICK);
3067 $TICK_WATCHER->start;
3068
3069 $LOAD = ($NOW - $tick_start) / $TICK;
3070 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3773 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3774
3072 _post_tick; 3775 if (0) {
3073 3776 if ($NEXT_TICK) {
3074 3777 my $jitter = $TICK_START - $NEXT_TICK;
3778 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3779 warn "jitter $JITTER\n";#d#
3780 }
3075 }, 3781 }
3076); 3782}
3077 3783
3078{ 3784{
3079 BDB::max_poll_time $TICK * 0.1; 3785 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3786
3081 reentrant => 0,
3082 fd => BDB::poll_fileno,
3083 poll => 'r',
3084 prio => 0,
3085 data => WF_AUTOCANCEL,
3086 cb => \&BDB::poll_cb,
3087 );
3088 BDB::min_parallel 8; 3787 BDB::min_parallel 8;
3089 3788 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3789 $AnyEvent::BDB::WATCHER->priority (1);
3091 my $status;
3092 my $current = $Coro::current;
3093 (
3094 sub {
3095 $status = $!;
3096 $current->ready; undef $current;
3097 },
3098 sub {
3099 Coro::schedule while defined $current;
3100 $! = $status;
3101 },
3102 )
3103 };
3104 3790
3105 unless ($DB_ENV) { 3791 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3792 $DB_ENV = BDB::db_env_create;
3793 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3794 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3795 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3796 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3797 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3798
3108 cf::sync_job { 3799 cf::sync_job {
3109 eval { 3800 eval {
3110 BDB::db_env_open 3801 BDB::db_env_open
3111 $DB_ENV, 3802 $DB_ENV,
… …
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3804 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3805 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3806 0666;
3116 3807
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3808 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3118
3119 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3120 $DB_ENV->set_lk_detect;
3121 }; 3809 };
3122 3810
3123 cf::cleanup "db_env_open(db): $@" if $@; 3811 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3812 };
3125 } 3813 }
3814
3815 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3816 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3817 };
3818 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3819 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3820 };
3821 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3822 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3823 };
3126} 3824}
3127 3825
3128{ 3826{
3827 # configure IO::AIO
3828
3129 IO::AIO::min_parallel 8; 3829 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3830 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3831 undef $AnyEvent::AIO::WATCHER;
3134 reentrant => 0,
3135 data => WF_AUTOCANCEL,
3136 fd => IO::AIO::poll_fileno,
3137 poll => 'r',
3138 prio => 6,
3139 cb => \&IO::AIO::poll_cb,
3140 );
3141} 3832}
3142 3833
3143my $_log_backtrace; 3834my $_log_backtrace;
3144 3835
3145sub _log_backtrace { 3836sub _log_backtrace {
… …
3148 $msg =~ s/\n//; 3839 $msg =~ s/\n//;
3149 3840
3150 # limit the # of concurrent backtraces 3841 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3842 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3843 ++$_log_backtrace;
3844 my $perl_bt = Carp::longmess $msg;
3153 async { 3845 async {
3846 $Coro::current->{desc} = "abt $msg";
3847
3154 my @bt = fork_call { 3848 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3849 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3850 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3851 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3852 or die "addr2line: $!";
… …
3166 } 3860 }
3167 3861
3168 @funcs 3862 @funcs
3169 }; 3863 };
3170 3864
3171 LOG llevInfo, "[ABT] $msg\n"; 3865 LOG llevInfo, "[ABT] $perl_bt\n";
3866 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt; 3867 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace; 3868 --$_log_backtrace;
3174 }; 3869 };
3175 } else { 3870 } else {
3176 LOG llevInfo, "[ABT] $msg\n"; 3871 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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