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.286 by root, Sun Jun 24 04:27:20 2007 UTC vs.
Revision 1.472 by root, Sat Jun 6 21:43:13 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 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1157 aio_close $fh;
955 1158
956 if (@$objs) { 1159 if (@$objs) {
957 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1165 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
964 } 1167 }
965 } else { 1168 } else {
966 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
967 } 1170 }
968 1171
969 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
970 } else { 1176 } else {
971 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
972 } 1178 }
973 } else { 1179 } else {
974 aio_unlink $filename; 1180 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
976 } 1182 }
977 } 1183 };
978} 1184}
979 1185
980sub object_freezer_as_string { 1186sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1187 my ($rdata, $objs) = @_;
982 1188
… …
994 or return; 1200 or return;
995 1201
996 unless (aio_stat "$filename.pst") { 1202 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1203 (aio_load "$filename.pst", $av) >= 0
998 or return; 1204 or return;
1205
999 $av = eval { (Storable::thaw $av)->{objs} }; 1206 my $st = eval { Coro::Storable::thaw $av };
1207 $av = $st->{objs};
1000 } 1208 }
1001 1209
1210 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1211 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1212 $decname, length $data, scalar @{$av || []};
1213
1004 return ($data, $av); 1214 ($data, $av)
1005} 1215}
1006 1216
1007=head2 COMMAND CALLBACKS 1217=head2 COMMAND CALLBACKS
1008 1218
1009=over 4 1219=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1239 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1240}
1031 1241
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1242=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1243
1034Register a callback fro execution when the client sends an extcmd packet. 1244Register a callback for execution when the client sends an (synchronous)
1245extcmd packet. Ext commands will be processed in the order they are
1246received by the server, like other user commands. The first argument is
1247the logged-in player. Ext commands can only be processed after a player
1248has logged in successfully.
1035 1249
1036If the callback returns something, it is sent back as if reply was being 1250If the callback returns something, it is sent back as if reply was being
1037called. 1251called.
1038 1252
1253=item cf::register_exticmd $name => \&callback($ns,$packet);
1254
1255Register a callback for execution when the client sends an (asynchronous)
1256exticmd packet. Exti commands are processed by the server as soon as they
1257are received, i.e. out of order w.r.t. other commands. The first argument
1258is a client socket. Exti commands can be received anytime, even before
1259log-in.
1260
1261If the callback returns something, it is sent back as if reply was being
1262called.
1263
1039=cut 1264=cut
1040 1265
1041sub register_extcmd { 1266sub register_extcmd {
1042 my ($name, $cb) = @_; 1267 my ($name, $cb) = @_;
1043 1268
1044 $EXTCMD{$name} = $cb; 1269 $EXTCMD{$name} = $cb;
1045} 1270}
1271
1272sub register_exticmd {
1273 my ($name, $cb) = @_;
1274
1275 $EXTICMD{$name} = $cb;
1276}
1277
1278use File::Glob ();
1046 1279
1047cf::player->attach ( 1280cf::player->attach (
1048 on_command => sub { 1281 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1050 1283
… …
1058 cf::override; 1291 cf::override;
1059 }, 1292 },
1060 on_extcmd => sub { 1293 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1294 my ($pl, $buf) = @_;
1062 1295
1063 my $msg = eval { from_json $buf }; 1296 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1297
1065 if (ref $msg) { 1298 if (ref $msg) {
1299 my ($type, $reply, @payload) =
1300 "ARRAY" eq ref $msg
1301 ? @$msg
1302 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1303
1304 my @reply;
1305
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1306 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1307 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1308 }
1309
1310 $pl->ext_reply ($reply, @reply)
1311 if $reply;
1312
1071 } else { 1313 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1314 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1315 }
1074 1316
1075 cf::override; 1317 cf::override;
1076 }, 1318 },
1077); 1319);
1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1078 1333
1079sub load_extensions { 1334sub load_extensions {
1080 cf::sync_job { 1335 cf::sync_job {
1081 my %todo; 1336 my %todo;
1082 1337
… …
1102 1357
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1360
1106 $ext{source} = 1361 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1109 . $source 1364 . $source
1110 . "\n};\n1"; 1365 . "\n};\n1";
1111 1366
1112 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
… …
1128 my $msg = $@ ? "$v->{path}: $@\n" 1383 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1384 : "$v->{base}: extension inactive.\n";
1130 1385
1131 if (exists $v->{meta}{mandatory}) { 1386 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1387 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1388 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1389 }
1136 1390
1137 warn $msg; 1391 warn $msg;
1138 } 1392 }
1139 1393
… …
1153 1407
1154=back 1408=back
1155 1409
1156=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1157 1411
1158Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1159 1413
1160=cut 1414=cut
1161 1415
1162package cf::player; 1416package cf::player;
1163 1417
1164use Coro::AIO; 1418use Coro::AIO;
1165 1419
1166=head3 cf::player 1420=head3 cf::player
1167 1421
1168=over 4 1422=over 4
1423
1424=item cf::player::num_playing
1425
1426Returns the official number of playing players, as per the Crossfire metaserver rules.
1427
1428=cut
1429
1430sub num_playing {
1431 scalar grep
1432 $_->ob->map
1433 && !$_->hidden
1434 && !$_->ob->flag (cf::FLAG_WIZ),
1435 cf::player::list
1436}
1169 1437
1170=item cf::player::find $login 1438=item cf::player::find $login
1171 1439
1172Returns the given player object, loading it if necessary (might block). 1440Returns the given player object, loading it if necessary (might block).
1173 1441
… …
1192 1460
1193sub exists($) { 1461sub exists($) {
1194 my ($login) = @_; 1462 my ($login) = @_;
1195 1463
1196 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1198} 1466}
1199 1467
1200sub find($) { 1468sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1470 my $login = $_[0];
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1477 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1478 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1479 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1480 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1481
1214 my $pl = load_pl path $login 1482 my $f = new_from_file cf::object::thawer path $login
1215 or return; 1483 or return;
1484
1485 my $pl = cf::player::load_pl $f
1486 or return;
1487
1488 local $cf::PLAYER_LOADING{$login} = $pl;
1489 $f->resolve_delayed_derefs;
1216 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1217 } 1491 }
1218 } 1492 }
1219} 1493}
1220 1494
… …
1229 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1230 1504
1231 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1233 1507
1508 cf::get_slot 0.01;
1509
1234 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1235 Coro::cede; 1511 cf::cede_to_tick;
1236} 1512}
1237 1513
1238sub new($) { 1514sub new($) {
1239 my ($login) = @_; 1515 my ($login) = @_;
1240 1516
… …
1246 $cf::PLAYER{$login} = $self; 1522 $cf::PLAYER{$login} = $self;
1247 1523
1248 $self 1524 $self
1249} 1525}
1250 1526
1527=item $player->send_msg ($channel, $msg, $color, [extra...])
1528
1529=cut
1530
1531sub send_msg {
1532 my $ns = shift->ns
1533 or return;
1534 $ns->send_msg (@_);
1535}
1536
1251=item $pl->quit_character 1537=item $pl->quit_character
1252 1538
1253Nukes the player without looking back. If logged in, the connection will 1539Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1540be destroyed. May block for a long time.
1255 1541
… …
1259 my ($pl) = @_; 1545 my ($pl) = @_;
1260 1546
1261 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1262 1548
1263 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1264 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1265 1551
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1270 1558
1271 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1308 or return []; 1596 or return [];
1309 1597
1310 my @logins; 1598 my @logins;
1311 1599
1312 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1601 my $path = path $login;
1602
1603 # a .pst is a dead give-away for a valid player
1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1609 }
1316 1610
1317 utf8::decode $login; 1611 utf8::decode $login;
1318 push @logins, $login; 1612 push @logins, $login;
1319 } 1613 }
1320 1614
… …
1347 } 1641 }
1348 1642
1349 \@paths 1643 \@paths
1350} 1644}
1351 1645
1352=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1353 1647
1354Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1355 1649
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) 1650=item $player->ext_reply ($msgid, @msg)
1386 1651
1387Sends an ext reply to the player. 1652Sends an ext reply to the player.
1388 1653
1389=cut 1654=cut
1390 1655
1391sub ext_reply($$%) { 1656sub ext_reply($$@) {
1392 my ($self, $id, %msg) = @_; 1657 my ($self, $id, @msg) = @_;
1393 1658
1394 $msg{msgid} = $id; 1659 $self->ns->ext_reply ($id, @msg)
1395
1396 $self->send ("ext " . cf::to_json \%msg);
1397} 1660}
1398 1661
1399=item $player->ext_event ($type, %msg) 1662=item $player->ext_msg ($type, @msg)
1400 1663
1401Sends an ext event to the client. 1664Sends an ext event to the client.
1402 1665
1403=cut 1666=cut
1404 1667
1405sub ext_event($$%) { 1668sub ext_msg($$@) {
1406 my ($self, $type, %msg) = @_; 1669 my ($self, $type, @msg) = @_;
1407 1670
1408 $self->ns->ext_event ($type, %msg); 1671 $self->ns->ext_msg ($type, @msg);
1409} 1672}
1410 1673
1411=head3 cf::region 1674=head3 cf::region
1412 1675
1413=over 4 1676=over 4
… …
1426 my ($path) = @_; 1689 my ($path) = @_;
1427 1690
1428 my ($match, $specificity); 1691 my ($match, $specificity);
1429 1692
1430 for my $region (list) { 1693 for my $region (list) {
1431 if ($region->match && $path =~ $region->match) { 1694 if ($region->{match} && $path =~ $region->{match}) {
1432 ($match, $specificity) = ($region, $region->specificity) 1695 ($match, $specificity) = ($region, $region->specificity)
1433 if $region->specificity > $specificity; 1696 if $region->specificity > $specificity;
1434 } 1697 }
1435 } 1698 }
1436 1699
… …
1457our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1458our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1459 1722
1460sub generate_random_map { 1723sub generate_random_map {
1461 my ($self, $rmp) = @_; 1724 my ($self, $rmp) = @_;
1725
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727
1462 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1463 $self->_create_random_map ( 1729 $self->_create_random_map (
1464 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1465 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1466 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1556 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1557 return $self; 1823 return $self;
1558 } 1824 }
1559 } 1825 }
1560 1826
1561 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1562 () 1828 ()
1563} 1829}
1564 1830
1565sub init { 1831sub init {
1566 my ($self) = @_; 1832 my ($self) = @_;
… …
1588 1854
1589# the temporary/swap location 1855# the temporary/swap location
1590sub save_path { 1856sub save_path {
1591 my ($self) = @_; 1857 my ($self) = @_;
1592 1858
1593 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1594 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1595} 1861}
1596 1862
1597# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1598sub uniq_path { 1864sub uniq_path {
1599 my ($self) = @_; 1865 my ($self) = @_;
1600 1866
1601 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1602 "$UNIQUEDIR/$path" 1868 "$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} 1869}
1613 1870
1614sub decay_objects { 1871sub decay_objects {
1615 my ($self) = @_; 1872 my ($self) = @_;
1616 1873
… …
1629 1886
1630sub load_header_from($) { 1887sub load_header_from($) {
1631 my ($self, $path) = @_; 1888 my ($self, $path) = @_;
1632 1889
1633 utf8::encode $path; 1890 utf8::encode $path;
1634 #aio_open $path, O_RDONLY, 0 1891 my $f = new_from_file cf::object::thawer $path
1635 # or return;
1636
1637 $self->_load_header ($path)
1638 or return; 1892 or return;
1893
1894 $self->_load_header ($f)
1895 or return;
1896
1897 local $MAP_LOADING{$self->{path}} = $self;
1898 $f->resolve_delayed_derefs;
1639 1899
1640 $self->{load_path} = $path; 1900 $self->{load_path} = $path;
1641 1901
1642 1 1902 1
1643} 1903}
… …
1697sub find { 1957sub find {
1698 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1699 1959
1700 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1701 1961
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1702 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1703 1964
1704 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1705 my $guard = cf::lock_acquire "map_find:$path";
1706 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1707 or return; 1967 or return;
1708 1968
1709 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1710 1970
… …
1712 or return; 1972 or return;
1713 1973
1714 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1715 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1716 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1978 undef $guard1;
1717 $map->reset; 1979 $map->reset;
1718 undef $guard;
1719 return find $path; 1980 return find $path;
1720 } 1981 }
1721 1982
1722 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
1723 } 1984 }
… …
1732 local $self->{deny_reset} = 1; # loading can take a long time 1993 local $self->{deny_reset} = 1; # loading can take a long time
1733 1994
1734 my $path = $self->{path}; 1995 my $path = $self->{path};
1735 1996
1736 { 1997 {
1737 my $guard = cf::lock_acquire "map_load:$path"; 1998 my $guard = cf::lock_acquire "map_data:$path";
1738 1999
2000 return unless $self->valid;
1739 return if $self->in_memory != cf::MAP_SWAPPED; 2001 return unless $self->in_memory == cf::MAP_SWAPPED;
1740 2002
1741 $self->in_memory (cf::MAP_LOADING); 2003 $self->in_memory (cf::MAP_LOADING);
1742 2004
1743 $self->alloc; 2005 $self->alloc;
1744 2006
1745 $self->pre_load; 2007 $self->pre_load;
1746 Coro::cede; 2008 cf::cede_to_tick;
1747 2009
2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block;
1748 $self->_load_objects ($self->{load_path}, 1) 2012 $self->_load_objects ($f)
1749 or return; 2013 or return;
1750 2014
1751 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
1752 if delete $self->{load_original}; 2016 if delete $self->{load_original};
1753 2017
1754 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
1755 utf8::encode $uniq; 2019 utf8::encode $uniq;
1756 if (aio_open $uniq, O_RDONLY, 0) { 2020 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) {
1757 $self->clear_unique_items; 2022 $self->clear_unique_items;
1758 $self->_load_objects ($uniq, 0); 2023 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs;
2025 }
1759 } 2026 }
1760 } 2027 }
1761 2028
1762 Coro::cede; 2029 $f->resolve_delayed_derefs;
2030
2031 cf::cede_to_tick;
1763 # now do the right thing for maps 2032 # now do the right thing for maps
1764 $self->link_multipart_objects; 2033 $self->link_multipart_objects;
1765 $self->difficulty ($self->estimate_difficulty) 2034 $self->difficulty ($self->estimate_difficulty)
1766 unless $self->difficulty; 2035 unless $self->difficulty;
1767 Coro::cede; 2036 cf::cede_to_tick;
1768 2037
1769 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
1770 $self->decay_objects; 2039 $self->decay_objects;
1771 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
1772 $self->update_buttons; 2041 $self->update_buttons;
1773 Coro::cede; 2042 cf::cede_to_tick;
1774 $self->set_darkness_map;
1775 Coro::cede;
1776 $self->activate; 2043 $self->activate;
1777 } 2044 }
1778 2045
2046 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME);
2048
1779 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
1780 } 2050 }
1781 2051
1782 $self->post_load; 2052 $self->post_load;
1783} 2053}
1784 2054
… …
1793 2063
1794 $self 2064 $self
1795} 2065}
1796 2066
1797# find and load all maps in the 3x3 area around a map 2067# find and load all maps in the 3x3 area around a map
1798sub load_diag { 2068sub load_neighbours {
1799 my ($map) = @_; 2069 my ($map) = @_;
1800 2070
1801 my @diag; # diagonal neighbours 2071 my @neigh; # diagonal neighbours
1802 2072
1803 for (0 .. 3) { 2073 for (0 .. 3) {
1804 my $neigh = $map->tile_path ($_) 2074 my $neigh = $map->tile_path ($_)
1805 or next; 2075 or next;
1806 $neigh = find $neigh, $map 2076 $neigh = find $neigh, $map
1807 or next; 2077 or next;
1808 $neigh->load; 2078 $neigh->load;
1809 2079
2080 push @neigh,
1810 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2081 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1811 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2082 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1812 } 2083 }
1813 2084
1814 for (@diag) { 2085 for (grep defined $_->[0], @neigh) {
2086 my ($path, $origin) = @$_;
1815 my $neigh = find @$_ 2087 my $neigh = find $path, $origin
1816 or next; 2088 or next;
1817 $neigh->load; 2089 $neigh->load;
1818 } 2090 }
1819} 2091}
1820 2092
… …
1825} 2097}
1826 2098
1827sub do_load_sync { 2099sub do_load_sync {
1828 my ($map) = @_; 2100 my ($map) = @_;
1829 2101
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main;
2104
1830 cf::sync_job { $map->load }; 2105 cf::sync_job { $map->load };
1831} 2106}
1832 2107
1833our %MAP_PREFETCH; 2108our %MAP_PREFETCH;
1834our $MAP_PREFETCHER = undef; 2109our $MAP_PREFETCHER = undef;
1835 2110
1836sub find_async { 2111sub find_async {
1837 my ($path, $origin) = @_; 2112 my ($path, $origin, $load) = @_;
1838 2113
1839 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
1840 2115
1841 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
1842 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1843 } 2118 }
1844 2119
1845 undef $MAP_PREFETCH{$path}; 2120 $MAP_PREFETCH{$path} |= $load;
2121
1846 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2123 $Coro::current->{desc} = "map prefetcher";
2124
1847 while (%MAP_PREFETCH) { 2125 while (%MAP_PREFETCH) {
1848 for my $path (keys %MAP_PREFETCH) { 2126 while (my ($k, $v) = each %MAP_PREFETCH) {
1849 my $map = find $path 2127 if (my $map = find $k) {
1850 or next;
1851 $map->load; 2128 $map->load if $v;
2129 }
1852 2130
1853 delete $MAP_PREFETCH{$path}; 2131 delete $MAP_PREFETCH{$k};
1854 } 2132 }
1855 } 2133 }
1856 undef $MAP_PREFETCHER; 2134 undef $MAP_PREFETCHER;
1857 }; 2135 };
1858 $MAP_PREFETCHER->prio (6); 2136 $MAP_PREFETCHER->prio (6);
… …
1861} 2139}
1862 2140
1863sub save { 2141sub save {
1864 my ($self) = @_; 2142 my ($self) = @_;
1865 2143
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2145
1868 $self->{last_save} = $cf::RUNTIME; 2146 $self->{last_save} = $cf::RUNTIME;
1869 2147
1870 return unless $self->dirty; 2148 return unless $self->dirty;
1871 2149
… …
1877 return if $self->{deny_save}; 2155 return if $self->{deny_save};
1878 2156
1879 local $self->{last_access} = $self->last_access;#d# 2157 local $self->{last_access} = $self->last_access;#d#
1880 2158
1881 cf::async { 2159 cf::async {
2160 $Coro::current->{desc} = "map player save";
1882 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
1883 }; 2162 };
2163
2164 cf::get_slot 0.02;
1884 2165
1885 if ($uniq) { 2166 if ($uniq) {
1886 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1887 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1888 } else { 2169 } else {
… …
1894 my ($self) = @_; 2175 my ($self) = @_;
1895 2176
1896 # save first because save cedes 2177 # save first because save cedes
1897 $self->save; 2178 $self->save;
1898 2179
1899 my $lock = cf::lock_acquire "map_data:" . $self->path; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
1900 2181
1901 return if $self->players; 2182 return if $self->players;
1902 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
1903 return if $self->{deny_save}; 2184 return if $self->{deny_save};
1904 2185
2186 $self->in_memory (cf::MAP_SWAPPED);
2187
2188 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP;
1905 $self->clear; 2190 $self->clear;
1906 $self->in_memory (cf::MAP_SWAPPED);
1907} 2191}
1908 2192
1909sub reset_at { 2193sub reset_at {
1910 my ($self) = @_; 2194 my ($self) = @_;
1911 2195
… …
1943 if $uniq; 2227 if $uniq;
1944 } 2228 }
1945 2229
1946 delete $cf::MAP{$self->path}; 2230 delete $cf::MAP{$self->path};
1947 2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
1948 $self->clear; 2234 $self->clear;
1949
1950 $_->clear_links_to ($self) for values %cf::MAP;
1951 2235
1952 $self->unlink_save; 2236 $self->unlink_save;
1953 $self->destroy; 2237 $self->destroy;
1954} 2238}
1955 2239
1956my $nuke_counter = "aaaa"; 2240my $nuke_counter = "aaaa";
1957 2241
1958sub nuke { 2242sub nuke {
1959 my ($self) = @_; 2243 my ($self) = @_;
1960 2244
2245 {
2246 my $lock = cf::lock_acquire "map_data:$self->{path}";
2247
1961 delete $cf::MAP{$self->path}; 2248 delete $cf::MAP{$self->path};
1962 2249
1963 $self->unlink_save; 2250 $self->unlink_save;
1964 2251
1965 bless $self, "cf::map"; 2252 bless $self, "cf::map";
1966 delete $self->{deny_reset}; 2253 delete $self->{deny_reset};
1967 $self->{deny_save} = 1; 2254 $self->{deny_save} = 1;
1968 $self->reset_timeout (1); 2255 $self->reset_timeout (1);
1969 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1970 2257
1971 $cf::MAP{$self->path} = $self; 2258 $cf::MAP{$self->path} = $self;
2259 }
1972 2260
1973 $self->reset; # polite request, might not happen 2261 $self->reset; # polite request, might not happen
1974} 2262}
1975 2263
1976=item $maps = cf::map::tmp_maps 2264=item $maps = cf::map::tmp_maps
… …
2018 2306
2019sub unique_maps() { 2307sub unique_maps() {
2020 [ 2308 [
2021 map { 2309 map {
2022 utf8::decode $_; 2310 utf8::decode $_;
2023 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2024 ? normalise $_ 2314 : normalise $_
2025 : ()
2026 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2027 ] 2316 ]
2028} 2317}
2029 2318
2030package cf;
2031
2032=back 2319=back
2033 2320
2034=head3 cf::object 2321=head3 cf::object
2035 2322
2036=cut 2323=cut
… …
2039 2326
2040=over 4 2327=over 4
2041 2328
2042=item $ob->inv_recursive 2329=item $ob->inv_recursive
2043 2330
2044Returns the inventory of the object _and_ their inventories, recursively. 2331Returns the inventory of the object I<and> their inventories, recursively,
2332but I<not> the object itself.
2045 2333
2046=cut 2334=cut
2047 2335
2048sub inv_recursive_; 2336sub inv_recursive_;
2049sub inv_recursive_ { 2337sub inv_recursive_ {
… …
2052 2340
2053sub inv_recursive { 2341sub inv_recursive {
2054 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2055} 2343}
2056 2344
2345=item $ref = $ob->ref
2346
2347Creates and returns a persistent reference to an object that can be stored as a string.
2348
2349=item $ob = cf::object::deref ($refstring)
2350
2351returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2352even if the object actually exists. May block.
2353
2354=cut
2355
2356sub deref {
2357 my ($ref) = @_;
2358
2359 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2360 my ($uuid, $name) = ($1, $2);
2361 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2362 or return;
2363 $pl->ob->uuid eq $uuid
2364 or return;
2365
2366 $pl->ob
2367 } else {
2368 warn "$ref: cannot resolve object reference\n";
2369 undef
2370 }
2371}
2372
2057package cf; 2373package cf;
2058 2374
2059=back 2375=back
2060 2376
2061=head3 cf::object::player 2377=head3 cf::object::player
… …
2067Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2383Sends 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 2384can be C<undef>. Does the right thing when the player is currently in a
2069dialogue with the given NPC character. 2385dialogue with the given NPC character.
2070 2386
2071=cut 2387=cut
2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2072 2402
2073# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2074# with dialog boxes. 2404# with dialog boxes.
2075#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2076sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
… …
2083 2413
2084 } else { 2414 } else {
2085 my $pl = $self->contr; 2415 my $pl = $self->contr;
2086 2416
2087 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2088 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2089 $diag->{pl}->ext_reply ( 2419 $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 2420
2096 } else { 2421 } else {
2097 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2098 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2099 } 2424 }
2100 } 2425 }
2426}
2427
2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2429
2430=cut
2431
2432sub cf::object::send_msg {
2433 my $pl = shift->contr
2434 or return;
2435 $pl->send_msg (@_);
2101} 2436}
2102 2437
2103=item $player_object->may ("access") 2438=item $player_object->may ("access")
2104 2439
2105Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
… …
2118 2453
2119=item $player_object->enter_link 2454=item $player_object->enter_link
2120 2455
2121Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2122 2457
2123The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2124I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2125 2462
2126Will never block. 2463Will never block.
2127 2464
2128=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2129 2466
… …
2184 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2185 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2186 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2187 2524
2188 $map->load; 2525 $map->load;
2189 $map->load_diag; 2526 $map->load_neighbours;
2190 2527
2191 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2192 $self->activate_recursive; 2530 $self->activate_recursive;
2193 2531
2194 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2195 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2196} 2534}
2197 2535
2198=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2199 2537
2200Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2201her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2202that has to return the map if sucecssful, and then unfreezes the player on 2540that has to return the map if sucecssful, and then unfreezes the player on
2203the new (success) or old (failed) map position. 2541the new (success) or old (failed) map position. In either case, $done will
2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2204 2546
2205=cut 2547=cut
2206 2548
2207our $GOTOGEN; 2549our $GOTOGEN;
2208 2550
2209sub cf::object::player::goto { 2551sub cf::object::player::goto {
2210 my ($self, $path, $x, $y, $check) = @_; 2552 my ($self, $path, $x, $y, $check, $done) = @_;
2211 2553
2212 # do generation counting so two concurrent goto's will be executed in-order 2554 # do generation counting so two concurrent goto's will be executed in-order
2213 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2214 2556
2215 $self->enter_link; 2557 $self->enter_link;
2216 2558
2217 (async { 2559 (async {
2560 $Coro::current->{desc} = "player::goto $path $x $y";
2561
2562 # *tag paths override both path and x|y
2563 if ($path =~ /^\*(.*)$/) {
2564 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2565 my $ob = $obs[rand @obs];
2566
2567 # see if we actually can go there
2568 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2569 $ob = $obs[rand @obs];
2570 } else {
2571 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2572 }
2573 # else put us there anyways for now #d#
2574
2575 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2576 } else {
2577 ($path, $x, $y) = (undef, undef, undef);
2578 }
2579 }
2580
2218 my $map = eval { 2581 my $map = eval {
2219 my $map = cf::map::find $path; 2582 my $map = defined $path ? cf::map::find $path : undef;
2220 2583
2221 if ($map) { 2584 if ($map) {
2222 $map = $map->customise_for ($self); 2585 $map = $map->customise_for ($self);
2223 $map = $check->($map) if $check && $map; 2586 $map = $check->($map) if $check && $map;
2224 } else { 2587 } else {
2225 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2588 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2226 } 2589 }
2227 2590
2228 $map 2591 $map
2229 }; 2592 };
2230 2593
… …
2235 2598
2236 if ($gen == $self->{_goto_generation}) { 2599 if ($gen == $self->{_goto_generation}) {
2237 delete $self->{_goto_generation}; 2600 delete $self->{_goto_generation};
2238 $self->leave_link ($map, $x, $y); 2601 $self->leave_link ($map, $x, $y);
2239 } 2602 }
2603
2604 $done->() if $done;
2240 })->prio (1); 2605 })->prio (1);
2241} 2606}
2242 2607
2243=item $player_object->enter_exit ($exit_object) 2608=item $player_object->enter_exit ($exit_object)
2244 2609
… …
2264} 2629}
2265 2630
2266sub prepare_random_map { 2631sub prepare_random_map {
2267 my ($exit) = @_; 2632 my ($exit) = @_;
2268 2633
2269 my $guard = cf::lock_acquire "exit_prepare:$exit";
2270
2271 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2272 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2273 # that depends on the exit object 2636 # that depends on the exit object
2274 2637
2275 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
… …
2277 if ($exit->map) { 2640 if ($exit->map) {
2278 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2279 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2280 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2281 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2282 } 2647 }
2283 2648
2284 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2285 2650
2286 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2287 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2288 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2289 2654
2290 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2291 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2292 undef $fh; 2657 undef $fh;
2293 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2294 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2295 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2296 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2297 } 2666 }
2298} 2667}
2299 2668
2300sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2301 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2302 2671
2303 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2304 2673
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; 2674 $self->enter_link;
2317 2675
2318 (async { 2676 (async {
2319 $self->deactivate_recursive; # just to be sure 2677 $Coro::current->{desc} = "enter_exit";
2678
2320 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2321 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2322 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2323 1; 2700 1
2324 }) { 2701 }) {
2325 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2326 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2327 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2328 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2329 2706
2330 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2349 2726
2350 utf8::encode $text; 2727 utf8::encode $text;
2351 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2728 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2352} 2729}
2353 2730
2354=item $client->send_msg ($color, $type, $msg, [extra...]) 2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2355 2732
2356Send a drawinfo or msg packet to the client, formatting the msg for the 2733Send 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 2734client 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 2735the message, with C<log> being the default. If C<$color> is negative, suppress
2359the message unless the client supports the msg packet. 2736the message unless the client supports the msg packet.
2360 2737
2361=cut 2738=cut
2362 2739
2740# non-persistent channels (usually the info channel)
2741our %CHANNEL = (
2742 "c/identify" => {
2743 id => "infobox",
2744 title => "Identify",
2745 reply => undef,
2746 tooltip => "Items recently identified",
2747 },
2748 "c/examine" => {
2749 id => "infobox",
2750 title => "Examine",
2751 reply => undef,
2752 tooltip => "Signs and other items you examined",
2753 },
2754 "c/book" => {
2755 id => "infobox",
2756 title => "Book",
2757 reply => undef,
2758 tooltip => "The contents of a note or book",
2759 },
2760 "c/lookat" => {
2761 id => "infobox",
2762 title => "Look",
2763 reply => undef,
2764 tooltip => "What you saw there",
2765 },
2766 "c/who" => {
2767 id => "infobox",
2768 title => "Players",
2769 reply => undef,
2770 tooltip => "Shows players who are currently online",
2771 },
2772 "c/body" => {
2773 id => "infobox",
2774 title => "Body Parts",
2775 reply => undef,
2776 tooltip => "Shows which body parts you posess and are available",
2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2813 },
2814 "c/uptime" => {
2815 id => "infobox",
2816 title => "Uptime",
2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart",
2819 },
2820 "c/mapinfo" => {
2821 id => "infobox",
2822 title => "Map Info",
2823 reply => undef,
2824 tooltip => "Information related to the maps",
2825 },
2826 "c/party" => {
2827 id => "party",
2828 title => "Party",
2829 reply => "gsay ",
2830 tooltip => "Messages and chat related to your party",
2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2840);
2841
2363sub cf::client::send_msg { 2842sub cf::client::send_msg {
2364 my ($self, $color, $type, $msg, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2365 2844
2366 $msg = $self->pl->expand_cfpod ($msg); 2845 $msg = $self->pl->expand_cfpod ($msg)
2846 unless $color & cf::NDI_VERBATIM;
2367 2847
2368 if ($self->can_msg) { 2848 $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 2849
2381 if ($color >= 0) { 2850 # check predefined channels, for the benefit of C
2382 if (0 && $msg =~ /\[/) { 2851 if ($CHANNEL{$channel}) {
2383 $self->send_packet ("drawextinfo $color 4 0 $msg") 2852 $channel = $CHANNEL{$channel};
2384 } else { 2853
2385 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2854 $self->ext_msg (channel_info => $channel);
2386 $self->send_packet ("drawinfo $color $msg") 2855 $channel = $channel->{id};
2856
2857 } elsif (ref $channel) {
2858 # send meta info to client, if not yet sent
2859 unless (exists $self->{channel}{$channel->{id}}) {
2860 $self->{channel}{$channel->{id}} = $channel;
2861 $self->ext_msg (channel_info => $channel);
2387 } 2862 }
2388 }
2389 }
2390}
2391 2863
2864 $channel = $channel->{id};
2865 }
2866
2867 return unless @extra || length $msg;
2868
2869 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF;
2872
2873 my $pkt = "msg "
2874 . $self->{json_coder}->encode (
2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2876 );
2877
2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2881
2882 # split very large packets
2883 if (8192 < length $pkt and $self->{can_lzf}) {
2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2885 $pkt = "frag";
2886 }
2887
2888 $self->send_packet ($pkt);
2889}
2890
2392=item $client->ext_event ($type, %msg) 2891=item $client->ext_msg ($type, @msg)
2393 2892
2394Sends an exti event to the client. 2893Sends an ext event to the client.
2395 2894
2396=cut 2895=cut
2397 2896
2398sub cf::client::ext_event($$%) { 2897sub cf::client::ext_msg($$@) {
2399 my ($self, $type, %msg) = @_; 2898 my ($self, $type, @msg) = @_;
2400 2899
2900 if ($self->extcmd == 2) {
2901 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2902 } elsif ($self->extcmd == 1) { # TODO: remove
2401 $msg{msgtype} = "event_$type"; 2903 push @msg, msgtype => "event_$type";
2402 $self->send_packet ("ext " . cf::to_json \%msg); 2904 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2905 }
2906}
2907
2908=item $client->ext_reply ($msgid, @msg)
2909
2910Sends an ext reply to the client.
2911
2912=cut
2913
2914sub cf::client::ext_reply($$@) {
2915 my ($self, $id, @msg) = @_;
2916
2917 if ($self->extcmd == 2) {
2918 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2919 } elsif ($self->extcmd == 1) {
2920 #TODO: version 1, remove
2921 unshift @msg, msgtype => "reply", msgid => $id;
2922 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2923 }
2403} 2924}
2404 2925
2405=item $success = $client->query ($flags, "text", \&cb) 2926=item $success = $client->query ($flags, "text", \&cb)
2406 2927
2407Queues a query to the client, calling the given callback with 2928Queues a query to the client, calling the given callback with
2408the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2929the 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>. 2930C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2410 2931
2411Queries can fail, so check the return code. Or don't, as queries will become 2932Queries can fail, so check the return code. Or don't, as queries will
2412reliable at some point in the future. 2933become reliable at some point in the future.
2413 2934
2414=cut 2935=cut
2415 2936
2416sub cf::client::query { 2937sub cf::client::query {
2417 my ($self, $flags, $text, $cb) = @_; 2938 my ($self, $flags, $text, $cb) = @_;
… …
2425 utf8::encode $text; 2946 utf8::encode $text;
2426 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2947 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2427 2948
2428 $self->send_packet ($self->{query_queue}[0][0]) 2949 $self->send_packet ($self->{query_queue}[0][0])
2429 if @{ $self->{query_queue} } == 1; 2950 if @{ $self->{query_queue} } == 1;
2951
2952 1
2430} 2953}
2431 2954
2432cf::client->attach ( 2955cf::client->attach (
2956 on_connect => sub {
2957 my ($ns) = @_;
2958
2959 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2960 },
2433 on_reply => sub { 2961 on_reply => sub {
2434 my ($ns, $msg) = @_; 2962 my ($ns, $msg) = @_;
2435 2963
2436 # this weird shuffling is so that direct followup queries 2964 # this weird shuffling is so that direct followup queries
2437 # get handled first 2965 # get handled first
… …
2449 } else { 2977 } else {
2450 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2978 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2451 } 2979 }
2452 } 2980 }
2453 }, 2981 },
2982 on_exticmd => sub {
2983 my ($ns, $buf) = @_;
2984
2985 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2986
2987 if (ref $msg) {
2988 my ($type, $reply, @payload) =
2989 "ARRAY" eq ref $msg
2990 ? @$msg
2991 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2992
2993 my @reply;
2994
2995 if (my $cb = $EXTICMD{$type}) {
2996 @reply = $cb->($ns, @payload);
2997 }
2998
2999 $ns->ext_reply ($reply, @reply)
3000 if $reply;
3001
3002 } else {
3003 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
3004 }
3005
3006 cf::override;
3007 },
2454); 3008);
2455 3009
2456=item $client->async (\&cb) 3010=item $client->async (\&cb)
2457 3011
2458Create a new coroutine, running the specified callback. The coroutine will 3012Create a new coroutine, running the specified callback. The coroutine will
… …
2499our $safe = new Safe "safe"; 3053our $safe = new Safe "safe";
2500our $safe_hole = new Safe::Hole; 3054our $safe_hole = new Safe::Hole;
2501 3055
2502$SIG{FPE} = 'IGNORE'; 3056$SIG{FPE} = 'IGNORE';
2503 3057
2504$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3058$safe->permit_only (Opcode::opset qw(
3059 :base_core :base_mem :base_orig :base_math
3060 grepstart grepwhile mapstart mapwhile
3061 sort time
3062));
2505 3063
2506# here we export the classes and methods available to script code 3064# here we export the classes and methods available to script code
2507 3065
2508=pod 3066=pod
2509 3067
2510The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
2511 3069
2512 cf::object contr pay_amount pay_player map 3070 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease split
3073 value
3074
2513 cf::object::player player 3075 cf::object::player
2514 cf::player peaceful 3076 player
2515 cf::map trigger 3077
3078 cf::player
3079 peaceful
3080
3081 cf::map
3082 trigger
2516 3083
2517=cut 3084=cut
2518 3085
2519for ( 3086for (
2520 ["cf::object" => qw(contr pay_amount pay_player map)], 3087 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3088 insert remove inv nrof name archname title slaying race
3089 decrease split destroy change_exp value msg lore send_msg)],
2521 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
2522 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
2523 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
2524) { 3093) {
2525 no strict 'refs'; 3094 no strict 'refs';
2526 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
2527 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2544 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
2545 3114
2546 my $qcode = $code; 3115 my $qcode = $code;
2547 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2548 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
2549 3120
2550 local $_; 3121 local $_;
2551 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
2552 3123
2553 my $eval = 3124 my $eval =
… …
2601# the server's init and main functions 3172# the server's init and main functions
2602 3173
2603sub load_facedata($) { 3174sub load_facedata($) {
2604 my ($path) = @_; 3175 my ($path) = @_;
2605 3176
3177 # HACK to clear player env face cache, we need some signal framework
3178 # for this (global event?)
3179 %ext::player_env::MUSIC_FACE_CACHE = ();
3180
3181 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3182
2606 warn "loading facedata from $path\n"; 3183 warn "loading facedata from $path\n";
2607 3184
2608 my $facedata; 3185 my $facedata;
2609 0 < aio_load $path, $facedata 3186 0 < aio_load $path, $facedata
2610 or die "$path: $!"; 3187 or die "$path: $!";
… …
2612 $facedata = Coro::Storable::thaw $facedata; 3189 $facedata = Coro::Storable::thaw $facedata;
2613 3190
2614 $facedata->{version} == 2 3191 $facedata->{version} == 2
2615 or cf::cleanup "$path: version mismatch, cannot proceed."; 3192 or cf::cleanup "$path: version mismatch, cannot proceed.";
2616 3193
3194 # patch in the exptable
3195 $facedata->{resource}{"res/exp_table"} = {
3196 type => FT_RSRC,
3197 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3198 };
3199 cf::cede_to_tick;
3200
2617 { 3201 {
2618 my $faces = $facedata->{faceinfo}; 3202 my $faces = $facedata->{faceinfo};
2619 3203
2620 while (my ($face, $info) = each %$faces) { 3204 while (my ($face, $info) = each %$faces) {
2621 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3205 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3206
2622 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3207 cf::face::set_visibility $idx, $info->{visibility};
3208 cf::face::set_magicmap $idx, $info->{magicmap};
2623 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3209 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2624 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3210 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2625 Coro::cede; 3211
3212 cf::cede_to_tick;
2626 } 3213 }
2627 3214
2628 while (my ($face, $info) = each %$faces) { 3215 while (my ($face, $info) = each %$faces) {
2629 next unless $info->{smooth}; 3216 next unless $info->{smooth};
3217
2630 my $idx = cf::face::find $face 3218 my $idx = cf::face::find $face
2631 or next; 3219 or next;
3220
2632 if (my $smooth = cf::face::find $info->{smooth}) { 3221 if (my $smooth = cf::face::find $info->{smooth}) {
3222 cf::face::set_smooth $idx, $smooth;
2633 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3223 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2634 } else { 3224 } else {
2635 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3225 warn "smooth face '$info->{smooth}' not found for face '$face'";
2636 } 3226 }
2637 Coro::cede; 3227
3228 cf::cede_to_tick;
2638 } 3229 }
2639 } 3230 }
2640 3231
2641 { 3232 {
2642 my $anims = $facedata->{animinfo}; 3233 my $anims = $facedata->{animinfo};
2643 3234
2644 while (my ($anim, $info) = each %$anims) { 3235 while (my ($anim, $info) = each %$anims) {
2645 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3236 cf::anim::set $anim, $info->{frames}, $info->{facings};
2646 Coro::cede; 3237 cf::cede_to_tick;
2647 } 3238 }
2648 3239
2649 cf::anim::invalidate_all; # d'oh 3240 cf::anim::invalidate_all; # d'oh
2650 } 3241 }
2651 3242
3243 {
3244 # TODO: for gcfclient pleasure, we should give resources
3245 # that gcfclient doesn't grok a >10000 face index.
3246 my $res = $facedata->{resource};
3247
3248 while (my ($name, $info) = each %$res) {
3249 if (defined $info->{type}) {
3250 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3251 my $data;
3252
3253 if ($info->{type} & 1) {
3254 # prepend meta info
3255
3256 my $meta = $enc->encode ({
3257 name => $name,
3258 %{ $info->{meta} || {} },
3259 });
3260
3261 $data = pack "(w/a*)*", $meta, $info->{data};
3262 } else {
3263 $data = $info->{data};
3264 }
3265
3266 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3267 cf::face::set_type $idx, $info->{type};
3268 } else {
3269 $RESOURCE{$name} = $info;
3270 }
3271
3272 cf::cede_to_tick;
3273 }
3274 }
3275
3276 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3277
2652 1 3278 1
2653} 3279}
2654 3280
3281cf::global->attach (on_resource_update => sub {
3282 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3283 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3284
3285 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3286 my $sound = $soundconf->{compat}[$_]
3287 or next;
3288
3289 my $face = cf::face::find "sound/$sound->[1]";
3290 cf::sound::set $sound->[0] => $face;
3291 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3292 }
3293
3294 while (my ($k, $v) = each %{$soundconf->{event}}) {
3295 my $face = cf::face::find "sound/$v";
3296 cf::sound::set $k => $face;
3297 }
3298 }
3299});
3300
3301register_exticmd fx_want => sub {
3302 my ($ns, $want) = @_;
3303
3304 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v);
3306 }
3307};
3308
3309sub load_resource_file($) {
3310 my $guard = lock_acquire "load_resource_file";
3311
3312 my $status = load_resource_file_ $_[0];
3313 get_slot 0.1, 100;
3314 cf::arch::commit_load;
3315
3316 $status
3317}
3318
2655sub reload_regions { 3319sub reload_regions {
3320 # HACK to clear player env face cache, we need some signal framework
3321 # for this (global event?)
3322 %ext::player_env::MUSIC_FACE_CACHE = ();
3323
2656 load_resource_file "$MAPDIR/regions" 3324 load_resource_file "$MAPDIR/regions"
2657 or die "unable to load regions file\n"; 3325 or die "unable to load regions file\n";
3326
3327 for (cf::region::list) {
3328 $_->{match} = qr/$_->{match}/
3329 if exists $_->{match};
3330 }
2658} 3331}
2659 3332
2660sub reload_facedata { 3333sub reload_facedata {
2661 load_facedata "$DATADIR/facedata" 3334 load_facedata "$DATADIR/facedata"
2662 or die "unable to load facedata\n"; 3335 or die "unable to load facedata\n";
… …
2673} 3346}
2674 3347
2675sub reload_resources { 3348sub reload_resources {
2676 warn "reloading resource files...\n"; 3349 warn "reloading resource files...\n";
2677 3350
3351 reload_facedata;
3352 reload_archetypes;
2678 reload_regions; 3353 reload_regions;
2679 reload_facedata;
2680 #reload_archetypes;#d#
2681 reload_archetypes;
2682 reload_treasures; 3354 reload_treasures;
2683 3355
2684 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
2685} 3357}
2686 3358
2687sub init { 3359sub reload_config {
2688 reload_resources;
2689}
2690
2691sub cfg_load {
2692 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
2693 or return; 3361 or return;
2694 3362
2695 local $/; 3363 local $/;
2696 *CFG = YAML::Syck::Load <$fh>; 3364 *CFG = YAML::Load <$fh>;
2697 3365
2698 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3366 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2699 3367
2700 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3368 $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}; 3369 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2707 }; 3375 };
2708 warn $@ if $@; 3376 warn $@ if $@;
2709 } 3377 }
2710} 3378}
2711 3379
3380sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!";
3383 flock $fh, &Fcntl::LOCK_EX
3384 or die "$PIDFILE: flock: $!";
3385 $fh
3386}
3387
3388# make sure only one server instance is running at any one time
3389sub atomic {
3390 my $fh = pidfile;
3391
3392 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0;
3394
3395 seek $fh, 0, 0;
3396 print $fh $$;
3397}
3398
2712sub main { 3399sub main {
3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413
2713 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
2714 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
2715 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2716 (async { 3417 (async {
2717 Event::one_event; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3419 EV::loop EV::LOOP_ONESHOT;
2718 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
2719 }; 3421 };
2720 3422
2721 cfg_load; 3423 evthread_start IO::AIO::poll_fileno;
3424
3425 cf::sync_job {
3426 reload_resources;
3427 reload_config;
2722 db_init; 3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
2723 load_extensions; 3441 load_extensions;
2724 3442
2725 $TICK_WATCHER->start; 3443 utime time, time, $RUNTIMEFILE;
3444
3445 # no (long-running) fork's whatsoever before this point(!)
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3450
2726 Event::loop; 3451 EV::loop;
2727} 3452}
2728 3453
2729############################################################################# 3454#############################################################################
2730# initialisation and cleanup 3455# initialisation and cleanup
2731 3456
2732# install some emergency cleanup handlers 3457# install some emergency cleanup handlers
2733BEGIN { 3458BEGIN {
3459 our %SIGWATCHER = ();
2734 for my $signal (qw(INT HUP TERM)) { 3460 for my $signal (qw(INT HUP TERM)) {
2735 Event->signal ( 3461 $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"; 3462 cf::cleanup "SIG$signal";
2742 },
2743 ); 3463 };
2744 } 3464 }
2745} 3465}
2746 3466
2747sub write_runtime { 3467sub write_runtime_sync {
2748 my $runtime = "$LOCALDIR/runtime";
2749
2750 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
2751 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
2752 3470
2753 IO::AIO::aio_utime $runtime, undef, undef; 3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2754 3472
2755 my $guard = cf::lock_acquire "write_runtime"; 3473 my $guard = cf::lock_acquire "write_runtime";
2756 3474
2757 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2758 or return; 3476 or return;
2759 3477
2760 my $value = $cf::RUNTIME + 90 + 10; 3478 my $value = $cf::RUNTIME + 90 + 10;
2761 # 10 is the runtime save interval, for a monotonic clock 3479 # 10 is the runtime save interval, for a monotonic clock
2762 # 60 allows for the watchdog to kill the server. 3480 # 60 allows for the watchdog to kill the server.
… …
2772 aio_utime $fh, undef, undef; 3490 aio_utime $fh, undef, undef;
2773 3491
2774 close $fh 3492 close $fh
2775 or return; 3493 or return;
2776 3494
2777 aio_rename "$runtime~", $runtime 3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2778 and return; 3496 and return;
2779 3497
2780 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
2781 3499
2782 1 3500 1
3501}
3502
3503our $uuid_lock;
3504our $uuid_skip;
3505
3506sub write_uuid_sync($) {
3507 $uuid_skip ||= $_[0];
3508
3509 return if $uuid_lock;
3510 local $uuid_lock = 1;
3511
3512 my $uuid = "$LOCALDIR/uuid";
3513
3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3515 or return;
3516
3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3525 $uuid_skip = 0;
3526
3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3528 and return;
3529
3530 # always fsync - this file is important
3531 aio_fsync $fh
3532 and return;
3533
3534 close $fh
3535 or return;
3536
3537 aio_rename "$uuid~", $uuid
3538 and return;
3539
3540 warn "uuid file written ($value).\n";
3541
3542 1
3543
3544}
3545
3546sub write_uuid($$) {
3547 my ($skip, $sync) = @_;
3548
3549 $sync ? write_uuid_sync $skip
3550 : async { write_uuid_sync $skip };
2783} 3551}
2784 3552
2785sub emergency_save() { 3553sub emergency_save() {
2786 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
2787 3555
2788 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
2789 3557
2790 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
2791 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
2792 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
2793 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
2794 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
2795 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
2796 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
2797 $pl->valid or next; 3570 $pl->valid or next;
3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2798 $pl->save; 3572 $pl->save;
2799 } 3573 }
2800 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
2801 3575
2802 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
2803 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
2804 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
2805 $map->valid or next; 3579 $map->valid or next;
2806 $map->save; 3580 $map->save;
2807 } 3581 }
2808 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
2809 3583
2810 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
2811 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
2812 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3587
3588 warn "emergency_perl_save: begin write uuid\n";
3589 write_uuid_sync 1;
3590 warn "emergency_perl_save: end write uuid\n";
2813 }; 3591 };
2814 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
2815 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
2816} 3599}
2817 3600
2818sub post_cleanup { 3601sub post_cleanup {
2819 my ($make_core) = @_; 3602 my ($make_core) = @_;
2820 3603
2821 warn Carp::longmess "post_cleanup backtrace" 3604 warn Carp::longmess "post_cleanup backtrace"
2822 if $make_core; 3605 if $make_core;
3606
3607 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$;
3609}
3610
3611# a safer delete_package, copied from Symbol
3612sub clear_package($) {
3613 my $pkg = shift;
3614
3615 # expand to full symbol table name if needed
3616 unless ($pkg =~ /^main::.*::$/) {
3617 $pkg = "main$pkg" if $pkg =~ /^::/;
3618 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3619 $pkg .= '::' unless $pkg =~ /::$/;
3620 }
3621
3622 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3623 my $stem_symtab = *{$stem}{HASH};
3624
3625 defined $stem_symtab and exists $stem_symtab->{$leaf}
3626 or return;
3627
3628 # clear all symbols
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 }
3634 warn "cleared package $pkg\n";#d#
2823} 3635}
2824 3636
2825sub do_reload_perl() { 3637sub do_reload_perl() {
2826 # can/must only be called in main 3638 # can/must only be called in main
2827 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
2828 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
2829 return; 3641 return;
2830 } 3642 }
2831 3643
3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3647
3648 while ($RELOAD) {
2832 warn "reloading..."; 3649 warn "reloading...";
2833 3650
2834 warn "entering sync_job"; 3651 warn "entering sync_job";
2835 3652
2836 cf::sync_job { 3653 cf::sync_job {
2837 cf::write_runtime; # external watchdog should not bark 3654 cf::write_runtime_sync; # external watchdog should not bark
2838 cf::emergency_save; 3655 cf::emergency_save;
2839 cf::write_runtime; # external watchdog should not bark 3656 cf::write_runtime_sync; # external watchdog should not bark
2840 3657
2841 warn "syncing database to disk"; 3658 warn "syncing database to disk";
2842 BDB::db_env_txn_checkpoint $DB_ENV; 3659 BDB::db_env_txn_checkpoint $DB_ENV;
2843 3660
2844 # if anything goes wrong in here, we should simply crash as we already saved 3661 # if anything goes wrong in here, we should simply crash as we already saved
2845 3662
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"; 3663 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; 3664 while (IO::AIO::nreqs || BDB::nreqs) {
2857 warn "iterate..."; 3665 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 } 3666 }
2882 3667
2883 warn "... nuking $pkg"; 3668 warn "cancelling all extension coros";
2884 Symbol::delete_package $pkg; 3669 $_->cancel for values %EXT_CORO;
2885 } 3670 %EXT_CORO = ();
2886 3671
2887 warn "unloading all perl modules loaded from $LIBDIR"; 3672 warn "removing commands";
2888 while (my ($k, $v) = each %INC) { 3673 %COMMAND = ();
2889 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2890 3674
3675 warn "removing ext/exti commands";
3676 %EXTCMD = ();
3677 %EXTICMD = ();
3678
3679 warn "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) {
2891 warn "... unloading $k"; 3681 warn "... unloading $pkg";
2892 delete $INC{$k};
2893 3682
2894 $k =~ s/\.pm$//;
2895 $k =~ s/\//::/g;
2896
2897 if (my $cb = $k->can ("unload_module")) { 3683 if (my $cb = $pkg->can ("unload")) {
3684 eval {
2898 $cb->(); 3685 $cb->($pkg);
3686 1
3687 } or warn "$pkg unloaded, but with errors: $@";
3688 }
3689
3690 warn "... clearing $pkg";
3691 clear_package $pkg;
2899 } 3692 }
2900 3693
2901 Symbol::delete_package $k; 3694 warn "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697
3698 warn "... unloading $k";
3699 delete $INC{$k};
3700
3701 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g;
3703
3704 if (my $cb = $k->can ("unload_module")) {
3705 $cb->();
3706 }
3707
3708 clear_package $k;
2902 } 3709 }
2903 3710
2904 warn "getting rid of safe::, as good as possible"; 3711 warn "getting rid of safe::, as good as possible";
2905 Symbol::delete_package "safe::$_" 3712 clear_package "safe::$_"
2906 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2907 3714
2908 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
2909 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
2910 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2911 3718
2912 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
2913 # and global variables created in xs 3720 # and global variables created in xs
2914 #Symbol::delete_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
2915 3722
2916 warn "unload completed, starting to reload now"; 3723 warn "unload completed, starting to reload now";
2917 3724
2918 warn "reloading cf.pm"; 3725 warn "reloading cf.pm";
2919 require cf; 3726 require cf;
2920 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2921 3728
2922 warn "loading config and database again"; 3729 warn "loading config and database again";
2923 cf::cfg_load; 3730 cf::reload_config;
2924 3731
2925 warn "loading extensions"; 3732 warn "loading extensions";
2926 cf::load_extensions; 3733 cf::load_extensions;
2927 3734
3735 if ($REATTACH_ON_RELOAD) {
2928 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
2929 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
2930 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
2931 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
2932 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
2933 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
2934 3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746
2935 warn "leaving sync_job"; 3747 warn "leaving sync_job";
2936 3748
2937 1 3749 1
2938 } or do { 3750 } or do {
2939 warn $@; 3751 warn $@;
2940 warn "error while reloading, exiting."; 3752 cf::cleanup "error while reloading, exiting.";
2941 exit 1;
2942 }; 3753 };
2943 3754
2944 warn "reloaded"; 3755 warn "reloaded";
3756 --$RELOAD;
3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
2945}; 3761};
2946 3762
2947our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
2948 3764
2949sub reload_perl() { 3765sub reload_perl() {
2950 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
2951 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
2952 3768
2953 $RELOAD_WATCHER ||= Event->timer ( 3769 $RELOAD_WATCHER ||= cf::async {
2954 reentrant => 0, 3770 Coro::AIO::aio_wait cache_extensions;
2955 after => 0, 3771
2956 data => WF_AUTOCANCEL, 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2957 cb => sub {
2958 do_reload_perl; 3773 do_reload_perl;
2959 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
2960 }, 3775 };
2961 ); 3776 };
2962} 3777}
2963 3778
2964register_command "reload" => sub { 3779register_command "reload" => sub {
2965 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
2966 3781
2967 if ($who->flag (FLAG_WIZ)) { 3782 if ($who->flag (FLAG_WIZ)) {
2968 $who->message ("reloading server."); 3783 $who->message ("reloading server.");
3784 async {
3785 $Coro::current->{desc} = "perl_reload";
2969 async { reload_perl }; 3786 reload_perl;
3787 };
2970 } 3788 }
2971}; 3789};
2972 3790
2973unshift @INC, $LIBDIR; 3791unshift @INC, $LIBDIR;
2974 3792
… …
2976 3794
2977our @WAIT_FOR_TICK; 3795our @WAIT_FOR_TICK;
2978our @WAIT_FOR_TICK_BEGIN; 3796our @WAIT_FOR_TICK_BEGIN;
2979 3797
2980sub wait_for_tick { 3798sub wait_for_tick {
2981 return unless $TICK_WATCHER->is_active;
2982 return if $Coro::current == $Coro::main; 3799 return if tick_inhibit || $Coro::current == $Coro::main;
2983 3800
2984 my $signal = new Coro::Signal; 3801 my $signal = new Coro::Signal;
2985 push @WAIT_FOR_TICK, $signal; 3802 push @WAIT_FOR_TICK, $signal;
2986 $signal->wait; 3803 $signal->wait;
2987} 3804}
2988 3805
2989sub wait_for_tick_begin { 3806sub wait_for_tick_begin {
2990 return unless $TICK_WATCHER->is_active;
2991 return if $Coro::current == $Coro::main; 3807 return if tick_inhibit || $Coro::current == $Coro::main;
2992 3808
2993 my $signal = new Coro::Signal; 3809 my $signal = new Coro::Signal;
2994 push @WAIT_FOR_TICK_BEGIN, $signal; 3810 push @WAIT_FOR_TICK_BEGIN, $signal;
2995 $signal->wait; 3811 $signal->wait;
2996} 3812}
2997 3813
2998 my $min = 1e6;#d# 3814sub 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) { 3815 if ($Coro::current != $Coro::main) {
3008 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3816 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3009 unless ++$bug_warning > 10; 3817 unless ++$bug_warning > 10;
3010 return; 3818 return;
3011 } 3819 }
3012 3820
3013 $NOW = $tick_start = Event::time;
3014
3015 cf::server_tick; # one server iteration 3821 cf::server_tick; # one server iteration
3016 3822
3017 0 && sync_job {#d# 3823 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3018 for(1..10) { 3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3019 my $t = Event::time; 3825 Coro::async_pool {
3020 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3826 $Coro::current->{desc} = "runtime saver";
3021 or die; 3827 write_runtime_sync
3022 3828 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 }; 3829 };
3830 }
3039 3831
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) { 3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3055 $sig->send; 3833 $sig->send;
3056 } 3834 }
3057 while (my $sig = shift @WAIT_FOR_TICK) { 3835 while (my $sig = shift @WAIT_FOR_TICK) {
3058 $sig->send; 3836 $sig->send;
3059 } 3837 }
3060 3838
3061 $NOW = Event::time; 3839 $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; 3840 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3071 3841
3072 _post_tick; 3842 if (0) {
3073 3843 if ($NEXT_TICK) {
3074 3844 my $jitter = $TICK_START - $NEXT_TICK;
3845 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3846 warn "jitter $JITTER\n";#d#
3847 }
3075 }, 3848 }
3076); 3849}
3077 3850
3078{ 3851{
3079 BDB::max_poll_time $TICK * 0.1; 3852 # configure BDB
3080 $BDB_POLL_WATCHER = Event->io ( 3853
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; 3854 BDB::min_parallel 8;
3089 3855 BDB::max_poll_reqs $TICK * 0.1;
3090 BDB::set_sync_prepare { 3856 $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 3857
3105 unless ($DB_ENV) { 3858 unless ($DB_ENV) {
3106 $DB_ENV = BDB::db_env_create; 3859 $DB_ENV = BDB::db_env_create;
3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3863 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3864 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3107 3865
3108 cf::sync_job { 3866 cf::sync_job {
3109 eval { 3867 eval {
3110 BDB::db_env_open 3868 BDB::db_env_open
3111 $DB_ENV, 3869 $DB_ENV,
… …
3113 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3871 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3114 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3872 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3115 0666; 3873 0666;
3116 3874
3117 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3875 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 }; 3876 };
3122 3877
3123 cf::cleanup "db_env_open(db): $@" if $@; 3878 cf::cleanup "db_env_open(db): $@" if $@;
3124 }; 3879 };
3125 } 3880 }
3881
3882 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3883 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3884 };
3885 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3886 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3887 };
3888 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3889 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3890 };
3126} 3891}
3127 3892
3128{ 3893{
3894 # configure IO::AIO
3895
3129 IO::AIO::min_parallel 8; 3896 IO::AIO::min_parallel 8;
3130
3131 undef $Coro::AIO::WATCHER;
3132 IO::AIO::max_poll_time $TICK * 0.1; 3897 IO::AIO::max_poll_time $TICK * 0.1;
3133 $AIO_POLL_WATCHER = Event->io ( 3898 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} 3899}
3142 3900
3143my $_log_backtrace; 3901my $_log_backtrace;
3144 3902
3145sub _log_backtrace { 3903sub _log_backtrace {
… …
3148 $msg =~ s/\n//; 3906 $msg =~ s/\n//;
3149 3907
3150 # limit the # of concurrent backtraces 3908 # limit the # of concurrent backtraces
3151 if ($_log_backtrace < 2) { 3909 if ($_log_backtrace < 2) {
3152 ++$_log_backtrace; 3910 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg;
3153 async { 3912 async {
3913 $Coro::current->{desc} = "abt $msg";
3914
3154 my @bt = fork_call { 3915 my @bt = fork_call {
3155 @addr = map { sprintf "%x", $_ } @addr; 3916 @addr = map { sprintf "%x", $_ } @addr;
3156 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3917 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3157 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3918 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3158 or die "addr2line: $!"; 3919 or die "addr2line: $!";
… …
3166 } 3927 }
3167 3928
3168 @funcs 3929 @funcs
3169 }; 3930 };
3170 3931
3171 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $perl_bt\n";
3933 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3172 LOG llevInfo, "[ABT] $_\n" for @bt; 3934 LOG llevInfo, "[ABT] $_\n" for @bt;
3173 --$_log_backtrace; 3935 --$_log_backtrace;
3174 }; 3936 };
3175 } else { 3937 } else {
3176 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $msg\n";
3177 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3178 } 3940 }
3179} 3941}
3180 3942
3181# load additional modules 3943# load additional modules
3182use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3183 3945
3184END { cf::emergency_save } 3946END { cf::emergency_save }
3185 3947
31861 39481
3187 3949

Diff Legend

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