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

Diff Legend

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