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.281 by root, Sat Jun 16 23:22:59 2007 UTC vs.
Revision 1.457 by root, Wed Oct 1 05:50:19 2008 UTC

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

Diff Legend

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