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

Diff Legend

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