ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.468 by root, Thu Jan 8 19:23:44 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 off
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_readdir $LIBDIR, 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
1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1647
1648Expand deliantra pod fragments into protocol xml.
1649
1352=item $player->ext_reply ($msgid, %msg) 1650=item $player->ext_reply ($msgid, @msg)
1353 1651
1354Sends an ext reply to the player. 1652Sends an ext reply to the player.
1355 1653
1356=cut 1654=cut
1357 1655
1358sub ext_reply($$%) { 1656sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1657 my ($self, $id, @msg) = @_;
1360 1658
1361 $msg{msgid} = $id; 1659 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1660}
1365 1661
1366=item $player->ext_event ($type, %msg) 1662=item $player->ext_msg ($type, @msg)
1367 1663
1368Sends an ext event to the client. 1664Sends an ext event to the client.
1369 1665
1370=cut 1666=cut
1371 1667
1372sub ext_event($$%) { 1668sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1669 my ($self, $type, @msg) = @_;
1374 1670
1375 $self->ns->ext_event ($type, %msg); 1671 $self->ns->ext_msg ($type, @msg);
1376} 1672}
1377 1673
1378=head3 cf::region 1674=head3 cf::region
1379 1675
1380=over 4 1676=over 4
… …
1393 my ($path) = @_; 1689 my ($path) = @_;
1394 1690
1395 my ($match, $specificity); 1691 my ($match, $specificity);
1396 1692
1397 for my $region (list) { 1693 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1694 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1695 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1696 if $region->specificity > $specificity;
1401 } 1697 }
1402 } 1698 }
1403 1699
… …
1424our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1426 1722
1427sub generate_random_map { 1723sub generate_random_map {
1428 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
1429 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1729 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1523 $self->init; # pass $1 etc. 1822 $self->init; # pass $1 etc.
1524 return $self; 1823 return $self;
1525 } 1824 }
1526 } 1825 }
1527 1826
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1827 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1828 ()
1530} 1829}
1531 1830
1532sub init { 1831sub init {
1533 my ($self) = @_; 1832 my ($self) = @_;
… …
1555 1854
1556# the temporary/swap location 1855# the temporary/swap location
1557sub save_path { 1856sub save_path {
1558 my ($self) = @_; 1857 my ($self) = @_;
1559 1858
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1562} 1861}
1563 1862
1564# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1565sub uniq_path { 1864sub uniq_path {
1566 my ($self) = @_; 1865 my ($self) = @_;
1567 1866
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1570}
1571
1572# and all this just because we cannot iterate over
1573# all maps in C++...
1574sub change_all_map_light {
1575 my ($change) = @_;
1576
1577 $_->change_map_light ($change)
1578 for grep $_->outdoor, values %cf::MAP;
1579} 1869}
1580 1870
1581sub decay_objects { 1871sub decay_objects {
1582 my ($self) = @_; 1872 my ($self) = @_;
1583 1873
… …
1596 1886
1597sub load_header_from($) { 1887sub load_header_from($) {
1598 my ($self, $path) = @_; 1888 my ($self, $path) = @_;
1599 1889
1600 utf8::encode $path; 1890 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1891 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1899
1607 $self->{load_path} = $path; 1900 $self->{load_path} = $path;
1608 1901
1609 1 1902 1
1610} 1903}
… …
1664sub find { 1957sub find {
1665 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
1666 1959
1667 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
1668 1961
1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
1670 1964
1671 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
1672 my $guard = cf::lock_acquire "map_find:$path";
1673 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
1674 or return; 1967 or return;
1675 1968
1676 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
1677 1970
… …
1679 or return; 1972 or return;
1680 1973
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
1978 undef $guard1;
1684 $map->reset; 1979 $map->reset;
1685 undef $guard;
1686 return find $path; 1980 return find $path;
1687 } 1981 }
1688 1982
1689 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
1690 } 1984 }
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 1993 local $self->{deny_reset} = 1; # loading can take a long time
1700 1994
1701 my $path = $self->{path}; 1995 my $path = $self->{path};
1702 1996
1703 { 1997 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 1998 my $guard = cf::lock_acquire "map_data:$path";
1705 1999
2000 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2001 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2002
1708 $self->in_memory (cf::MAP_LOADING); 2003 $self->in_memory (cf::MAP_LOADING);
1709 2004
1710 $self->alloc; 2005 $self->alloc;
1711 2006
1712 $self->pre_load; 2007 $self->pre_load;
1713 Coro::cede; 2008 cf::cede_to_tick;
1714 2009
2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2011 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2012 $self->_load_objects ($f)
1716 or return; 2013 or return;
1717 2014
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
1719 if delete $self->{load_original}; 2016 if delete $self->{load_original};
1720 2017
1721 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2019 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2020 unless (aio_stat $uniq) {
2021 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2022 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2023 $self->_load_objects ($f);
2024 $f->resolve_delayed_derefs;
2025 }
1726 } 2026 }
1727 } 2027 }
1728 2028
1729 Coro::cede; 2029 $f->resolve_delayed_derefs;
2030
2031 cf::cede_to_tick;
1730 # now do the right thing for maps 2032 # now do the right thing for maps
1731 $self->link_multipart_objects; 2033 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2034 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2035 unless $self->difficulty;
1734 Coro::cede; 2036 cf::cede_to_tick;
1735 2037
1736 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2039 $self->decay_objects;
1738 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
1739 $self->update_buttons; 2041 $self->update_buttons;
1740 Coro::cede; 2042 cf::cede_to_tick;
1741 $self->set_darkness_map;
1742 Coro::cede;
1743 $self->activate; 2043 $self->activate;
1744 } 2044 }
1745 2045
2046 $self->{last_save} = $cf::RUNTIME;
2047 $self->last_access ($cf::RUNTIME);
2048
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2050 }
1748 2051
1749 $self->post_load; 2052 $self->post_load;
1750} 2053}
1751 2054
… …
1760 2063
1761 $self 2064 $self
1762} 2065}
1763 2066
1764# 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
1765sub load_diag { 2068sub load_neighbours {
1766 my ($map) = @_; 2069 my ($map) = @_;
1767 2070
1768 my @diag; # diagonal neighbours 2071 my @neigh; # diagonal neighbours
1769 2072
1770 for (0 .. 3) { 2073 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2074 my $neigh = $map->tile_path ($_)
1772 or next; 2075 or next;
1773 $neigh = find $neigh, $map 2076 $neigh = find $neigh, $map
1774 or next; 2077 or next;
1775 $neigh->load; 2078 $neigh->load;
1776 2079
2080 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2081 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2082 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2083 }
1780 2084
1781 for (@diag) { 2085 for (grep defined $_->[0], @neigh) {
2086 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2087 my $neigh = find $path, $origin
1783 or next; 2088 or next;
1784 $neigh->load; 2089 $neigh->load;
1785 } 2090 }
1786} 2091}
1787 2092
… …
1792} 2097}
1793 2098
1794sub do_load_sync { 2099sub do_load_sync {
1795 my ($map) = @_; 2100 my ($map) = @_;
1796 2101
2102 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2103 if $Coro::current == $Coro::main;
2104
1797 cf::sync_job { $map->load }; 2105 cf::sync_job { $map->load };
1798} 2106}
1799 2107
1800our %MAP_PREFETCH; 2108our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2109our $MAP_PREFETCHER = undef;
1802 2110
1803sub find_async { 2111sub find_async {
1804 my ($path, $origin) = @_; 2112 my ($path, $origin, $load) = @_;
1805 2113
1806 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
1807 2115
1808 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2118 }
1811 2119
1812 undef $MAP_PREFETCH{$path}; 2120 $MAP_PREFETCH{$path} |= $load;
2121
1813 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2123 $Coro::current->{desc} = "map prefetcher";
2124
1814 while (%MAP_PREFETCH) { 2125 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2126 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2127 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2128 $map->load if $v;
2129 }
1819 2130
1820 delete $MAP_PREFETCH{$path}; 2131 delete $MAP_PREFETCH{$k};
1821 } 2132 }
1822 } 2133 }
1823 undef $MAP_PREFETCHER; 2134 undef $MAP_PREFETCHER;
1824 }; 2135 };
1825 $MAP_PREFETCHER->prio (6); 2136 $MAP_PREFETCHER->prio (6);
… …
1828} 2139}
1829 2140
1830sub save { 2141sub save {
1831 my ($self) = @_; 2142 my ($self) = @_;
1832 2143
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2144 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2145
1835 $self->{last_save} = $cf::RUNTIME; 2146 $self->{last_save} = $cf::RUNTIME;
1836 2147
1837 return unless $self->dirty; 2148 return unless $self->dirty;
1838 2149
… …
1844 return if $self->{deny_save}; 2155 return if $self->{deny_save};
1845 2156
1846 local $self->{last_access} = $self->last_access;#d# 2157 local $self->{last_access} = $self->last_access;#d#
1847 2158
1848 cf::async { 2159 cf::async {
2160 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
1850 }; 2162 };
2163
2164 cf::get_slot 0.02;
1851 2165
1852 if ($uniq) { 2166 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2169 } else {
… …
1861 my ($self) = @_; 2175 my ($self) = @_;
1862 2176
1863 # save first because save cedes 2177 # save first because save cedes
1864 $self->save; 2178 $self->save;
1865 2179
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2181
1868 return if $self->players; 2182 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2184 return if $self->{deny_save};
1871 2185
2186 $self->in_memory (cf::MAP_SWAPPED);
2187
2188 $self->deactivate;
2189 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2190 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2191}
1875 2192
1876sub reset_at { 2193sub reset_at {
1877 my ($self) = @_; 2194 my ($self) = @_;
1878 2195
… …
1910 if $uniq; 2227 if $uniq;
1911 } 2228 }
1912 2229
1913 delete $cf::MAP{$self->path}; 2230 delete $cf::MAP{$self->path};
1914 2231
2232 $self->deactivate;
2233 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2234 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2235
1919 $self->unlink_save; 2236 $self->unlink_save;
1920 $self->destroy; 2237 $self->destroy;
1921} 2238}
1922 2239
1923my $nuke_counter = "aaaa"; 2240my $nuke_counter = "aaaa";
1924 2241
1925sub nuke { 2242sub nuke {
1926 my ($self) = @_; 2243 my ($self) = @_;
1927 2244
2245 {
2246 my $lock = cf::lock_acquire "map_data:$self->{path}";
2247
1928 delete $cf::MAP{$self->path}; 2248 delete $cf::MAP{$self->path};
1929 2249
1930 $self->unlink_save; 2250 $self->unlink_save;
1931 2251
1932 bless $self, "cf::map"; 2252 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2253 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2254 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2255 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2256 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2257
1938 $cf::MAP{$self->path} = $self; 2258 $cf::MAP{$self->path} = $self;
2259 }
1939 2260
1940 $self->reset; # polite request, might not happen 2261 $self->reset; # polite request, might not happen
1941} 2262}
1942 2263
1943=item $maps = cf::map::tmp_maps 2264=item $maps = cf::map::tmp_maps
… …
1985 2306
1986sub unique_maps() { 2307sub unique_maps() {
1987 [ 2308 [
1988 map { 2309 map {
1989 utf8::decode $_; 2310 utf8::decode $_;
1990 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
1991 ? normalise $_ 2314 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2316 ]
1995} 2317}
1996 2318
1997package cf;
1998
1999=back 2319=back
2000 2320
2001=head3 cf::object 2321=head3 cf::object
2002 2322
2003=cut 2323=cut
… …
2006 2326
2007=over 4 2327=over 4
2008 2328
2009=item $ob->inv_recursive 2329=item $ob->inv_recursive
2010 2330
2011Returns 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.
2012 2333
2013=cut 2334=cut
2014 2335
2015sub inv_recursive_; 2336sub inv_recursive_;
2016sub inv_recursive_ { 2337sub inv_recursive_ {
… …
2019 2340
2020sub inv_recursive { 2341sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2022} 2343}
2023 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
2024package cf; 2373package cf;
2025 2374
2026=back 2375=back
2027 2376
2028=head3 cf::object::player 2377=head3 cf::object::player
… …
2034Sends 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>
2035can 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
2036dialogue with the given NPC character. 2385dialogue with the given NPC character.
2037 2386
2038=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};
2039 2402
2040# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2404# with dialog boxes.
2042#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
2043sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
… …
2050 2413
2051 } else { 2414 } else {
2052 my $pl = $self->contr; 2415 my $pl = $self->contr;
2053 2416
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2417 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2420
2060 } else { 2421 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2424 }
2064 } 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 (@_);
2065} 2436}
2066 2437
2067=item $player_object->may ("access") 2438=item $player_object->may ("access")
2068 2439
2069Returns wether the given player is authorized to access resource "access" 2440Returns wether the given player is authorized to access resource "access"
… …
2082 2453
2083=item $player_object->enter_link 2454=item $player_object->enter_link
2084 2455
2085Freezes 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}>).
2086 2457
2087The 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.
2088I<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.
2089 2462
2090Will never block. 2463Will never block.
2091 2464
2092=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2093 2466
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2521 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2522 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2523 if $x <=0 && $y <= 0;
2151 2524
2152 $map->load; 2525 $map->load;
2153 $map->load_diag; 2526 $map->load_neighbours;
2154 2527
2155 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2156 $self->activate_recursive; 2530 $self->activate_recursive;
2157 2531
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2160} 2534}
2161 2535
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2536=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2537
2164Moves 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
2165her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2166that 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
2167the 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 >>.
2168 2546
2169=cut 2547=cut
2170 2548
2171our $GOTOGEN; 2549our $GOTOGEN;
2172 2550
2173sub cf::object::player::goto { 2551sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2552 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2553
2176 # 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
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2555 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2556
2179 $self->enter_link; 2557 $self->enter_link;
2180 2558
2181 (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
2182 my $map = eval { 2581 my $map = eval {
2183 my $map = cf::map::find $path; 2582 my $map = defined $path ? cf::map::find $path : undef;
2184 2583
2185 if ($map) { 2584 if ($map) {
2186 $map = $map->customise_for ($self); 2585 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2586 $map = $check->($map) if $check && $map;
2188 } else { 2587 } else {
2189 $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);
2190 } 2589 }
2191 2590
2192 $map 2591 $map
2193 }; 2592 };
2194 2593
… …
2199 2598
2200 if ($gen == $self->{_goto_generation}) { 2599 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2600 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2601 $self->leave_link ($map, $x, $y);
2203 } 2602 }
2603
2604 $done->() if $done;
2204 })->prio (1); 2605 })->prio (1);
2205} 2606}
2206 2607
2207=item $player_object->enter_exit ($exit_object) 2608=item $player_object->enter_exit ($exit_object)
2208 2609
… …
2228} 2629}
2229 2630
2230sub prepare_random_map { 2631sub prepare_random_map {
2231 my ($exit) = @_; 2632 my ($exit) = @_;
2232 2633
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2636 # that depends on the exit object
2238 2637
2239 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
… …
2241 if ($exit->map) { 2640 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2246 } 2647 }
2247 2648
2248 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2249 2650
2250 my $data = cf::to_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2253 2654
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2657 undef $fh;
2257 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2258 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2261 } 2666 }
2262} 2667}
2263 2668
2264sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2266 2671
2267 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2268 2673
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2674 $self->enter_link;
2281 2675
2282 (async { 2676 (async {
2283 $self->deactivate_recursive; # just to be sure 2677 $Coro::current->{desc} = "enter_exit";
2678
2284 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
2285 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2286 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
2287 1; 2700 1
2288 }) { 2701 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "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. "
2291 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2706
2294 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
… …
2313 2726
2314 utf8::encode $text; 2727 utf8::encode $text;
2315 $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);
2316} 2729}
2317 2730
2731=item $client->send_msg ($channel, $msg, $color, [extra...])
2732
2733Send a drawinfo or msg packet to the client, formatting the msg for the
2734client if neccessary. C<$type> should be a string identifying the type of
2735the message, with C<log> being the default. If C<$color> is negative, suppress
2736the message unless the client supports the msg packet.
2737
2738=cut
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/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2801 },
2802 "c/uptime" => {
2803 id => "infobox",
2804 title => "Uptime",
2805 reply => undef,
2806 tooltip => "How long the server has been running since last restart",
2807 },
2808 "c/mapinfo" => {
2809 id => "infobox",
2810 title => "Map Info",
2811 reply => undef,
2812 tooltip => "Information related to the maps",
2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2828);
2829
2830sub cf::client::send_msg {
2831 my ($self, $channel, $msg, $color, @extra) = @_;
2832
2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2835
2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837
2838 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel};
2841
2842 $self->ext_msg (channel_info => $channel);
2843 $channel = $channel->{id};
2844
2845 } elsif (ref $channel) {
2846 # send meta info to client, if not yet sent
2847 unless (exists $self->{channel}{$channel->{id}}) {
2848 $self->{channel}{$channel->{id}} = $channel;
2849 $self->ext_msg (channel_info => $channel);
2850 }
2851
2852 $channel = $channel->{id};
2853 }
2854
2855 return unless @extra || length $msg;
2856
2857 # default colour, mask it out
2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2859 if $color & cf::NDI_DEF;
2860
2861 my $pkt = "msg "
2862 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 );
2865
2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2869
2870 # split very large packets
2871 if (8192 < length $pkt and $self->{can_lzf}) {
2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2873 $pkt = "frag";
2874 }
2875
2876 $self->send_packet ($pkt);
2877}
2878
2318=item $client->ext_event ($type, %msg) 2879=item $client->ext_msg ($type, @msg)
2319 2880
2320Sends an exti event to the client. 2881Sends an ext event to the client.
2321 2882
2322=cut 2883=cut
2323 2884
2324sub cf::client::ext_event($$%) { 2885sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2886 my ($self, $type, @msg) = @_;
2326 2887
2888 if ($self->extcmd == 2) {
2889 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2890 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2891 push @msg, msgtype => "event_$type";
2328 $self->send_packet ("ext " . cf::to_json \%msg); 2892 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2893 }
2894}
2895
2896=item $client->ext_reply ($msgid, @msg)
2897
2898Sends an ext reply to the client.
2899
2900=cut
2901
2902sub cf::client::ext_reply($$@) {
2903 my ($self, $id, @msg) = @_;
2904
2905 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2907 } elsif ($self->extcmd == 1) {
2908 #TODO: version 1, remove
2909 unshift @msg, msgtype => "reply", msgid => $id;
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2911 }
2329} 2912}
2330 2913
2331=item $success = $client->query ($flags, "text", \&cb) 2914=item $success = $client->query ($flags, "text", \&cb)
2332 2915
2333Queues a query to the client, calling the given callback with 2916Queues a query to the client, calling the given callback with
2334the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2917the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2335C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2918C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2336 2919
2337Queries can fail, so check the return code. Or don't, as queries will become 2920Queries can fail, so check the return code. Or don't, as queries will
2338reliable at some point in the future. 2921become reliable at some point in the future.
2339 2922
2340=cut 2923=cut
2341 2924
2342sub cf::client::query { 2925sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2926 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2934 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2935 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2936
2354 $self->send_packet ($self->{query_queue}[0][0]) 2937 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2938 if @{ $self->{query_queue} } == 1;
2939
2940 1
2356} 2941}
2357 2942
2358cf::client->attach ( 2943cf::client->attach (
2944 on_connect => sub {
2945 my ($ns) = @_;
2946
2947 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2948 },
2359 on_reply => sub { 2949 on_reply => sub {
2360 my ($ns, $msg) = @_; 2950 my ($ns, $msg) = @_;
2361 2951
2362 # this weird shuffling is so that direct followup queries 2952 # this weird shuffling is so that direct followup queries
2363 # get handled first 2953 # get handled first
… …
2375 } else { 2965 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2966 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2967 }
2378 } 2968 }
2379 }, 2969 },
2970 on_exticmd => sub {
2971 my ($ns, $buf) = @_;
2972
2973 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2974
2975 if (ref $msg) {
2976 my ($type, $reply, @payload) =
2977 "ARRAY" eq ref $msg
2978 ? @$msg
2979 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2980
2981 my @reply;
2982
2983 if (my $cb = $EXTICMD{$type}) {
2984 @reply = $cb->($ns, @payload);
2985 }
2986
2987 $ns->ext_reply ($reply, @reply)
2988 if $reply;
2989
2990 } else {
2991 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2992 }
2993
2994 cf::override;
2995 },
2380); 2996);
2381 2997
2382=item $client->async (\&cb) 2998=item $client->async (\&cb)
2383 2999
2384Create a new coroutine, running the specified callback. The coroutine will 3000Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 3041our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3042our $safe_hole = new Safe::Hole;
2427 3043
2428$SIG{FPE} = 'IGNORE'; 3044$SIG{FPE} = 'IGNORE';
2429 3045
2430$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3046$safe->permit_only (Opcode::opset qw(
3047 :base_core :base_mem :base_orig :base_math
3048 grepstart grepwhile mapstart mapwhile
3049 sort time
3050));
2431 3051
2432# here we export the classes and methods available to script code 3052# here we export the classes and methods available to script code
2433 3053
2434=pod 3054=pod
2435 3055
2436The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
2437 3057
2438 cf::object contr pay_amount pay_player map 3058 cf::object
3059 contr pay_amount pay_player map x y force_find force_add destroy
3060 insert remove name archname title slaying race decrease split
3061 value
3062
2439 cf::object::player player 3063 cf::object::player
2440 cf::player peaceful 3064 player
2441 cf::map trigger 3065
3066 cf::player
3067 peaceful
3068
3069 cf::map
3070 trigger
2442 3071
2443=cut 3072=cut
2444 3073
2445for ( 3074for (
2446 ["cf::object" => qw(contr pay_amount pay_player map)], 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3076 insert remove inv nrof name archname title slaying race
3077 decrease split destroy change_exp value msg lore send_msg)],
2447 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
2449 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
2450) { 3081) {
2451 no strict 'refs'; 3082 no strict 'refs';
2452 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
2453 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2470 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
2471 3102
2472 my $qcode = $code; 3103 my $qcode = $code;
2473 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2474 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
2475 3108
2476 local $_; 3109 local $_;
2477 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
2478 3111
2479 my $eval = 3112 my $eval =
… …
2527# the server's init and main functions 3160# the server's init and main functions
2528 3161
2529sub load_facedata($) { 3162sub load_facedata($) {
2530 my ($path) = @_; 3163 my ($path) = @_;
2531 3164
3165 # HACK to clear player env face cache, we need some signal framework
3166 # for this (global event?)
3167 %ext::player_env::MUSIC_FACE_CACHE = ();
3168
3169 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3170
2532 warn "loading facedata from $path\n"; 3171 warn "loading facedata from $path\n";
2533 3172
2534 my $facedata; 3173 my $facedata;
2535 0 < aio_load $path, $facedata 3174 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3175 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 3177 $facedata = Coro::Storable::thaw $facedata;
2539 3178
2540 $facedata->{version} == 2 3179 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3180 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 3181
3182 # patch in the exptable
3183 $facedata->{resource}{"res/exp_table"} = {
3184 type => FT_RSRC,
3185 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3186 };
3187 cf::cede_to_tick;
3188
2543 { 3189 {
2544 my $faces = $facedata->{faceinfo}; 3190 my $faces = $facedata->{faceinfo};
2545 3191
2546 while (my ($face, $info) = each %$faces) { 3192 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3193 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3194
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3195 cf::face::set_visibility $idx, $info->{visibility};
3196 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3197 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3198 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3199
3200 cf::cede_to_tick;
2552 } 3201 }
2553 3202
2554 while (my ($face, $info) = each %$faces) { 3203 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3204 next unless $info->{smooth};
3205
2556 my $idx = cf::face::find $face 3206 my $idx = cf::face::find $face
2557 or next; 3207 or next;
3208
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3209 if (my $smooth = cf::face::find $info->{smooth}) {
3210 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3211 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3212 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3213 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3214 }
2563 Coro::cede; 3215
3216 cf::cede_to_tick;
2564 } 3217 }
2565 } 3218 }
2566 3219
2567 { 3220 {
2568 my $anims = $facedata->{animinfo}; 3221 my $anims = $facedata->{animinfo};
2569 3222
2570 while (my ($anim, $info) = each %$anims) { 3223 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3224 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3225 cf::cede_to_tick;
2573 } 3226 }
2574 3227
2575 cf::anim::invalidate_all; # d'oh 3228 cf::anim::invalidate_all; # d'oh
2576 } 3229 }
2577 3230
3231 {
3232 # TODO: for gcfclient pleasure, we should give resources
3233 # that gcfclient doesn't grok a >10000 face index.
3234 my $res = $facedata->{resource};
3235
3236 while (my ($name, $info) = each %$res) {
3237 if (defined $info->{type}) {
3238 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3239 my $data;
3240
3241 if ($info->{type} & 1) {
3242 # prepend meta info
3243
3244 my $meta = $enc->encode ({
3245 name => $name,
3246 %{ $info->{meta} || {} },
3247 });
3248
3249 $data = pack "(w/a*)*", $meta, $info->{data};
3250 } else {
3251 $data = $info->{data};
3252 }
3253
3254 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3255 cf::face::set_type $idx, $info->{type};
3256 } else {
3257 $RESOURCE{$name} = $info;
3258 }
3259
3260 cf::cede_to_tick;
3261 }
3262 }
3263
3264 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3265
2578 1 3266 1
2579} 3267}
2580 3268
3269cf::global->attach (on_resource_update => sub {
3270 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3271 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3272
3273 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3274 my $sound = $soundconf->{compat}[$_]
3275 or next;
3276
3277 my $face = cf::face::find "sound/$sound->[1]";
3278 cf::sound::set $sound->[0] => $face;
3279 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3280 }
3281
3282 while (my ($k, $v) = each %{$soundconf->{event}}) {
3283 my $face = cf::face::find "sound/$v";
3284 cf::sound::set $k => $face;
3285 }
3286 }
3287});
3288
3289register_exticmd fx_want => sub {
3290 my ($ns, $want) = @_;
3291
3292 while (my ($k, $v) = each %$want) {
3293 $ns->fx_want ($k, $v);
3294 }
3295};
3296
3297sub load_resource_file($) {
3298 my $guard = lock_acquire "load_resource_file";
3299
3300 my $status = load_resource_file_ $_[0];
3301 get_slot 0.1, 100;
3302 cf::arch::commit_load;
3303
3304 $status
3305}
3306
2581sub reload_regions { 3307sub reload_regions {
3308 # HACK to clear player env face cache, we need some signal framework
3309 # for this (global event?)
3310 %ext::player_env::MUSIC_FACE_CACHE = ();
3311
2582 load_resource_file "$MAPDIR/regions" 3312 load_resource_file "$MAPDIR/regions"
2583 or die "unable to load regions file\n"; 3313 or die "unable to load regions file\n";
3314
3315 for (cf::region::list) {
3316 $_->{match} = qr/$_->{match}/
3317 if exists $_->{match};
3318 }
2584} 3319}
2585 3320
2586sub reload_facedata { 3321sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3322 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3323 or die "unable to load facedata\n";
… …
2599} 3334}
2600 3335
2601sub reload_resources { 3336sub reload_resources {
2602 warn "reloading resource files...\n"; 3337 warn "reloading resource files...\n";
2603 3338
3339 reload_facedata;
3340 reload_archetypes;
2604 reload_regions; 3341 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3342 reload_treasures;
2609 3343
2610 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
2611} 3345}
2612 3346
2613sub init { 3347sub reload_config {
2614 reload_resources;
2615}
2616
2617sub cfg_load {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3349 or return;
2620 3350
2621 local $/; 3351 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3352 *CFG = YAML::Load <$fh>;
2623 3353
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3354 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3355
2626 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3356 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2627 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3357 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2633 }; 3363 };
2634 warn $@ if $@; 3364 warn $@ if $@;
2635 } 3365 }
2636} 3366}
2637 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
2638sub main { 3387sub main {
3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401
2639 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
2641 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2642 (async { 3405 (async {
2643 Event::one_event; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3407 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
2645 }; 3409 };
2646 3410
2647 cfg_load; 3411 evthread_start IO::AIO::poll_fileno;
3412
3413 cf::sync_job {
3414 reload_resources;
3415 reload_config;
2648 db_init; 3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
2649 load_extensions; 3429 load_extensions;
2650 3430
2651 $TICK_WATCHER->start; 3431 utime time, time, $RUNTIMEFILE;
3432
3433 # no (long-running) fork's whatsoever before this point(!)
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3437 };
3438
2652 Event::loop; 3439 EV::loop;
2653} 3440}
2654 3441
2655############################################################################# 3442#############################################################################
2656# initialisation and cleanup 3443# initialisation and cleanup
2657 3444
2658# install some emergency cleanup handlers 3445# install some emergency cleanup handlers
2659BEGIN { 3446BEGIN {
3447 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3448 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3449 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3450 cf::cleanup "SIG$signal";
2668 },
2669 ); 3451 };
2670 } 3452 }
2671} 3453}
2672 3454
2673sub write_runtime { 3455sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime";
2675
2676 # first touch the runtime file to show we are still running: 3456 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3457 # the fsync below can take a very very long time.
2678 3458
2679 IO::AIO::aio_utime $runtime, undef, undef; 3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3460
2681 my $guard = cf::lock_acquire "write_runtime"; 3461 my $guard = cf::lock_acquire "write_runtime";
2682 3462
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2684 or return; 3464 or return;
2685 3465
2686 my $value = $cf::RUNTIME + 90 + 10; 3466 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3467 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3468 # 60 allows for the watchdog to kill the server.
… …
2698 aio_utime $fh, undef, undef; 3478 aio_utime $fh, undef, undef;
2699 3479
2700 close $fh 3480 close $fh
2701 or return; 3481 or return;
2702 3482
2703 aio_rename "$runtime~", $runtime 3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3484 and return;
2705 3485
2706 warn "runtime file written.\n"; 3486 warn "runtime file written.\n";
2707 3487
2708 1 3488 1
3489}
3490
3491our $uuid_lock;
3492our $uuid_skip;
3493
3494sub write_uuid_sync($) {
3495 $uuid_skip ||= $_[0];
3496
3497 return if $uuid_lock;
3498 local $uuid_lock = 1;
3499
3500 my $uuid = "$LOCALDIR/uuid";
3501
3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3503 or return;
3504
3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3513 $uuid_skip = 0;
3514
3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3516 and return;
3517
3518 # always fsync - this file is important
3519 aio_fsync $fh
3520 and return;
3521
3522 close $fh
3523 or return;
3524
3525 aio_rename "$uuid~", $uuid
3526 and return;
3527
3528 warn "uuid file written ($value).\n";
3529
3530 1
3531
3532}
3533
3534sub write_uuid($$) {
3535 my ($skip, $sync) = @_;
3536
3537 $sync ? write_uuid_sync $skip
3538 : async { write_uuid_sync $skip };
2709} 3539}
2710 3540
2711sub emergency_save() { 3541sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
2713 3543
2714 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
2715 3545
2716 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
2717 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
2718 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
2719 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
2721 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3558 $pl->valid or next;
3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3560 $pl->save;
2725 } 3561 }
2726 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
2727 3563
2728 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
2729 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
2730 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
2731 $map->valid or next; 3567 $map->valid or next;
2732 $map->save; 3568 $map->save;
2733 } 3569 }
2734 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
2735 3571
2736 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
2738 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3575
3576 warn "emergency_perl_save: begin write uuid\n";
3577 write_uuid_sync 1;
3578 warn "emergency_perl_save: end write uuid\n";
2739 }; 3579 };
2740 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
2741 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
2742} 3587}
2743 3588
2744sub post_cleanup { 3589sub post_cleanup {
2745 my ($make_core) = @_; 3590 my ($make_core) = @_;
2746 3591
2747 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
2748 if $make_core; 3593 if $make_core;
3594
3595 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$;
3597}
3598
3599# a safer delete_package, copied from Symbol
3600sub clear_package($) {
3601 my $pkg = shift;
3602
3603 # expand to full symbol table name if needed
3604 unless ($pkg =~ /^main::.*::$/) {
3605 $pkg = "main$pkg" if $pkg =~ /^::/;
3606 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3607 $pkg .= '::' unless $pkg =~ /::$/;
3608 }
3609
3610 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3611 my $stem_symtab = *{$stem}{HASH};
3612
3613 defined $stem_symtab and exists $stem_symtab->{$leaf}
3614 or return;
3615
3616 # clear all symbols
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 }
3622 warn "cleared package $pkg\n";#d#
2749} 3623}
2750 3624
2751sub do_reload_perl() { 3625sub do_reload_perl() {
2752 # can/must only be called in main 3626 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
2754 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
2755 return; 3629 return;
2756 } 3630 }
2757 3631
3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3635
3636 while ($RELOAD) {
2758 warn "reloading..."; 3637 warn "reloading...";
2759 3638
2760 warn "entering sync_job"; 3639 warn "entering sync_job";
2761 3640
2762 cf::sync_job { 3641 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3643 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3644 cf::write_runtime_sync; # external watchdog should not bark
2766 3645
2767 warn "syncing database to disk"; 3646 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3647 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3648
2770 # if anything goes wrong in here, we should simply crash as we already saved 3649 # if anything goes wrong in here, we should simply crash as we already saved
2771 3650
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests"; 3651 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3652 while (IO::AIO::nreqs || BDB::nreqs) {
2783 warn "iterate..."; 3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = ();
2791
2792 warn "removing commands";
2793 %COMMAND = ();
2794
2795 warn "removing ext commands";
2796 %EXTCMD = ();
2797
2798 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg";
2801
2802 if (my $cb = $pkg->can ("unload")) {
2803 eval {
2804 $cb->($pkg);
2805 1
2806 } or warn "$pkg unloaded, but with errors: $@";
2807 } 3654 }
2808 3655
2809 warn "... nuking $pkg"; 3656 warn "cancelling all extension coros";
2810 Symbol::delete_package $pkg; 3657 $_->cancel for values %EXT_CORO;
2811 } 3658 %EXT_CORO = ();
2812 3659
2813 warn "unloading all perl modules loaded from $LIBDIR"; 3660 warn "removing commands";
2814 while (my ($k, $v) = each %INC) { 3661 %COMMAND = ();
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 3662
3663 warn "removing ext/exti commands";
3664 %EXTCMD = ();
3665 %EXTICMD = ();
3666
3667 warn "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) {
2817 warn "... unloading $k"; 3669 warn "... unloading $pkg";
2818 delete $INC{$k};
2819 3670
2820 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g;
2822
2823 if (my $cb = $k->can ("unload_module")) { 3671 if (my $cb = $pkg->can ("unload")) {
3672 eval {
2824 $cb->(); 3673 $cb->($pkg);
3674 1
3675 } or warn "$pkg unloaded, but with errors: $@";
3676 }
3677
3678 warn "... clearing $pkg";
3679 clear_package $pkg;
2825 } 3680 }
2826 3681
2827 Symbol::delete_package $k; 3682 warn "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685
3686 warn "... unloading $k";
3687 delete $INC{$k};
3688
3689 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g;
3691
3692 if (my $cb = $k->can ("unload_module")) {
3693 $cb->();
3694 }
3695
3696 clear_package $k;
2828 } 3697 }
2829 3698
2830 warn "getting rid of safe::, as good as possible"; 3699 warn "getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 3700 clear_package "safe::$_"
2832 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2833 3702
2834 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
2837 3706
2838 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
2839 # and global variables created in xs 3708 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
2841 3710
2842 warn "unload completed, starting to reload now"; 3711 warn "unload completed, starting to reload now";
2843 3712
2844 warn "reloading cf.pm"; 3713 warn "reloading cf.pm";
2845 require cf; 3714 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3716
2848 warn "loading config and database again"; 3717 warn "loading config and database again";
2849 cf::cfg_load; 3718 cf::reload_config;
2850 3719
2851 warn "loading extensions"; 3720 warn "loading extensions";
2852 cf::load_extensions; 3721 cf::load_extensions;
2853 3722
3723 if ($REATTACH_ON_RELOAD) {
2854 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
2857 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
2860 3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734
2861 warn "leaving sync_job"; 3735 warn "leaving sync_job";
2862 3736
2863 1 3737 1
2864 } or do { 3738 } or do {
2865 warn $@; 3739 warn $@;
2866 warn "error while reloading, exiting."; 3740 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3741 };
2869 3742
2870 warn "reloaded"; 3743 warn "reloaded";
3744 --$RELOAD;
3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
2871}; 3749};
2872 3750
2873our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
2874 3752
2875sub reload_perl() { 3753sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
2878 3756
2879 $RELOAD_WATCHER ||= Event->timer ( 3757 $RELOAD_WATCHER ||= cf::async {
2880 reentrant => 0, 3758 Coro::AIO::aio_wait cache_extensions;
2881 after => 0, 3759
2882 data => WF_AUTOCANCEL, 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
2883 cb => sub {
2884 do_reload_perl; 3761 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
2886 }, 3763 };
2887 ); 3764 };
2888} 3765}
2889 3766
2890register_command "reload" => sub { 3767register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
2892 3769
2893 if ($who->flag (FLAG_WIZ)) { 3770 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3771 $who->message ("reloading server.");
3772 async {
3773 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3774 reload_perl;
3775 };
2896 } 3776 }
2897}; 3777};
2898 3778
2899unshift @INC, $LIBDIR; 3779unshift @INC, $LIBDIR;
2900 3780
… …
2902 3782
2903our @WAIT_FOR_TICK; 3783our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3784our @WAIT_FOR_TICK_BEGIN;
2905 3785
2906sub wait_for_tick { 3786sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3787 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3788
2910 my $signal = new Coro::Signal; 3789 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3790 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3791 $signal->wait;
2913} 3792}
2914 3793
2915sub wait_for_tick_begin { 3794sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3796
2919 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3798 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3799 $signal->wait;
2922} 3800}
2923 3801
2924 my $min = 1e6;#d# 3802sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3803 if ($Coro::current != $Coro::main) {
2934 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3804 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2935 unless ++$bug_warning > 10; 3805 unless ++$bug_warning > 10;
2936 return; 3806 return;
2937 } 3807 }
2938 3808
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3809 cf::server_tick; # one server iteration
2942 3810
2943 0 && sync_job {#d# 3811 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3812 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3813 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3814 $Coro::current->{desc} = "runtime saver";
2947 or die; 3815 write_runtime_sync
2948 3816 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3817 };
3818 }
2965 3819
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3820 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3821 $sig->send;
2982 } 3822 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3823 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3824 $sig->send;
2985 } 3825 }
2986 3826
2987 $NOW = Event::time; 3827 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3828 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3829
2998 _post_tick; 3830 if (0) {
2999 3831 if ($NEXT_TICK) {
3000 3832 my $jitter = $TICK_START - $NEXT_TICK;
3833 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3834 warn "jitter $JITTER\n";#d#
3835 }
3001 }, 3836 }
3002); 3837}
3003 3838
3004{ 3839{
3005 BDB::max_poll_time $TICK * 0.1; 3840 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3841
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3842 BDB::min_parallel 8;
3015 3843 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3844 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3845
3031 unless ($DB_ENV) { 3846 unless ($DB_ENV) {
3032 $DB_ENV = BDB::db_env_create; 3847 $DB_ENV = BDB::db_env_create;
3848 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3849 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3850 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3851 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3852 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3033 3853
3034 cf::sync_job { 3854 cf::sync_job {
3035 eval { 3855 eval {
3036 BDB::db_env_open 3856 BDB::db_env_open
3037 $DB_ENV, 3857 $DB_ENV,
… …
3039 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3859 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3860 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3861 0666;
3042 3862
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3863 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3864 };
3048 3865
3049 cf::cleanup "db_env_open(db): $@" if $@; 3866 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3867 };
3051 } 3868 }
3869
3870 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3871 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3872 };
3873 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3874 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3875 };
3876 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3877 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3878 };
3052} 3879}
3053 3880
3054{ 3881{
3882 # configure IO::AIO
3883
3055 IO::AIO::min_parallel 8; 3884 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3885 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3886 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3887}
3068 3888
3069my $_log_backtrace; 3889my $_log_backtrace;
3070 3890
3071sub _log_backtrace { 3891sub _log_backtrace {
… …
3074 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3075 3895
3076 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3079 async { 3900 async {
3901 $Coro::current->{desc} = "abt $msg";
3902
3080 my @bt = fork_call { 3903 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3905 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3906 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3084 or die "addr2line: $!"; 3907 or die "addr2line: $!";
… …
3092 } 3915 }
3093 3916
3094 @funcs 3917 @funcs
3095 }; 3918 };
3096 3919
3097 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 3923 --$_log_backtrace;
3100 }; 3924 };
3101 } else { 3925 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3103 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3104 } 3928 }
3105} 3929}
3106 3930
3107# load additional modules 3931# load additional modules
3108use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3109 3933
3110END { cf::emergency_save } 3934END { cf::emergency_save }
3111 3935
31121 39361
3113 3937

Diff Legend

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