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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.282 by elmex, Tue Jun 19 18:15:34 2007 UTC vs.
Revision 1.454 by root, Thu Sep 25 12:14:32 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};
211 267
212############################################################################# 268#############################################################################
213 269
… …
236 $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;
237 $d 293 $d
238 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
239} 295}
240 296
241use JSON::XS qw(to_json from_json); # TODO# replace by JSON::PC once working
242
243=item $ref = cf::from_json $json 297=item $ref = cf::decode_json $json
244 298
245Converts a JSON string into the corresponding perl data structure. 299Converts a JSON string into the corresponding perl data structure.
246 300
247=item $json = cf::to_json $ref 301=item $json = cf::encode_json $ref
248 302
249Converts 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}
250 325
251=item cf::lock_wait $string 326=item cf::lock_wait $string
252 327
253Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
254 329
… …
257Wait 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
258a 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,
259for example when the coroutine gets canceled), the lock is automatically 334for example when the coroutine gets canceled), the lock is automatically
260returned. 335returned.
261 336
337Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro.
339
262Lock 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
263uses map_find and cf::map::load uses map_load). 341uses map_find and cf::map::load uses map_load).
264 342
265=item $locked = cf::lock_active $string 343=item $locked = cf::lock_active $string
266 344
267Return 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.
268 346
269=cut 347=cut
270 348
271our %LOCK; 349our %LOCK;
350our %LOCKER;#d#
272 351
273sub lock_wait($) { 352sub lock_wait($) {
274 my ($key) = @_; 353 my ($key) = @_;
275 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
276 # wait for lock, if any 360 # wait for lock, if any
277 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
278 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
279 Coro::schedule; 364 Coro::schedule;
280 } 365 }
281} 366}
282 367
… …
285 370
286 # wait, to be sure we are not locked 371 # wait, to be sure we are not locked
287 lock_wait $key; 372 lock_wait $key;
288 373
289 $LOCK{$key} = []; 374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
290 376
291 Coro::guard { 377 Coro::guard {
378 delete $LOCKER{$key};#d#
292 # wake up all waiters, to be on the safe side 379 # wake up all waiters, to be on the safe side
293 $_->ready for @{ delete $LOCK{$key} }; 380 $_->ready for @{ delete $LOCK{$key} };
294 } 381 }
295} 382}
296 383
… …
299 386
300 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
301} 388}
302 389
303sub freeze_mainloop { 390sub freeze_mainloop {
304 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
305 392
306 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
307 $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 }
308 }; 454 }
309 $TICK_WATCHER->stop; 455};
310 $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;
311} 469}
312 470
313=item cf::async { BLOCK } 471=item cf::async { BLOCK }
314 472
315Currently the same as Coro::async_pool, meaning you cannot use 473Currently the same as Coro::async_pool, meaning you cannot use
… …
320 478
321BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
322 480
323=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
324 482
325The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
326is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
327partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 485partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
328acceptable. 486acceptable.
329 487
330If 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
331the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
… …
336 494
337sub sync_job(&) { 495sub sync_job(&) {
338 my ($job) = @_; 496 my ($job) = @_;
339 497
340 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
341 my $time = Event::time; 499 my $time = EV::time;
342 500
343 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
344 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
345 503
346 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
347 # (but this is cancel-safe) 505
348 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
349 507
350 my $busy = 1; 508 my $busy = 1;
351 my @res; 509 my @res;
352 510
353 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
354 @res = eval { $job->() }; 513 @res = eval { $job->() };
355 warn $@ if $@; 514 warn $@ if $@;
356 undef $busy; 515 undef $busy;
357 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
358 517
359 while ($busy) { 518 while ($busy) {
360 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
361 } 523 }
524 }
362 525
363 $time = Event::time - $time; 526 my $time = EV::time - $time;
364 527
365 LOG llevError | logBacktrace, Carp::longmess "long sync job"
366 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
367
368 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
369 529
370 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
371 } else { 531 } else {
372 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
373 533
… …
398=item fork_call { }, $args 558=item fork_call { }, $args
399 559
400Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
401process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
402Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
403never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
404 564
405=cut 565=cut
406 566
407sub fork_call(&@) { 567sub fork_call(&@) {
408 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
409 569
410# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 570 # we seemingly have to make a local copy of the whole thing,
411# or die "socketpair: $!"; 571 # otherwise perl prematurely frees the stuff :/
412 pipe my $fh1, my $fh2 572 # TODO: investigate and fix (likely this will be rather laborious)
413 or die "pipe: $!";
414 573
415 if (my $pid = fork) { 574 my @res = Coro::Util::fork_eval {
416 close $fh2;
417
418 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
419 $res = Coro::Storable::thaw $res;
420
421 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
422
423 die $$res unless "ARRAY" eq ref $res;
424
425 return wantarray ? @$res : $res->[-1];
426 } else {
427 reset_signals; 575 reset_signals;
428 local $SIG{__WARN__}; 576 &$cb
429 local $SIG{__DIE__}; 577 }, @args;
430 eval {
431 close $fh1;
432 578
433 my @res = eval { $cb->(@args) }; 579 wantarray ? @res : $res[-1]
434 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 580}
435 };
436 581
437 warn $@ if $@; 582=item $coin = coin_from_name $name
438 _exit 0; 583
439 } 584=cut
585
586our %coin_alias = (
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);
602
603sub coin_from_name($) {
604 $coin_alias{$_[0]}
605 ? cf::arch::find $coin_alias{$_[0]}
606 : undef
440} 607}
441 608
442=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
443 610
444Returns a single value from the environment database. 611Returns a single value from the environment database.
… …
446=item cf::db_put $family => $key => $value 613=item cf::db_put $family => $key => $value
447 614
448Stores the given C<$value> in the family. It can currently store binary 615Stores the given C<$value> in the family. It can currently store binary
449data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 616data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
450 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
451=cut 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}
452 641
453our $DB; 642our $DB;
454 643
455sub db_init { 644sub db_init {
456 unless ($DB) {
457 $DB = BDB::db_create $DB_ENV;
458
459 cf::sync_job { 645 cf::sync_job {
460 eval { 646 $DB ||= db_table "db";
461 $DB->set_flags (BDB::CHKSUM);
462
463 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
464 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
465 cf::cleanup "db_open(db): $!" if $!;
466 };
467 cf::cleanup "db_open(db): $@" if $@;
468 };
469 } 647 };
470} 648}
471 649
472sub db_get($$) { 650sub db_get($$) {
473 my $key = "$_[0]/$_[1]"; 651 my $key = "$_[0]/$_[1]";
474 652
… …
524 if (1) { 702 if (1) {
525 $md5 = 703 $md5 =
526 join "\x00", 704 join "\x00",
527 $processversion, 705 $processversion,
528 map { 706 map {
529 Coro::cede; 707 cf::cede_to_tick;
530 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
531 } 0.. $#$src; 709 } 0.. $#$src;
532 710
533 711
534 my $dbmd5 = db_get cache => "$id/md5"; 712 my $dbmd5 = db_get cache => "$id/md5";
… …
572 750
573############################################################################# 751#############################################################################
574 752
575=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
576 754
577Many 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
578attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
579to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
580 758
581In 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>
582C<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
583Crossfire TRT). 761Deliantra).
584 762
585=over 4 763=over 4
586 764
587=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
588 766
… …
632=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
633 811
634Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
635given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
636 814
637Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
638that 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.
639 817
640These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
641 819
642=over 4 820=over 4
… …
840 "; 1018 ";
841 die if $@; 1019 die if $@;
842} 1020}
843 1021
844our $override; 1022our $override;
845our @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?
846 1024
847sub override { 1025sub override {
848 $override = 1; 1026 $override = 1;
849 @invoke_results = (); 1027 @INVOKE_RESULTS = (@_);
850} 1028}
851 1029
852sub do_invoke { 1030sub do_invoke {
853 my $event = shift; 1031 my $event = shift;
854 my $callbacks = shift; 1032 my $callbacks = shift;
855 1033
856 @invoke_results = (); 1034 @INVOKE_RESULTS = ();
857 1035
858 local $override; 1036 local $override;
859 1037
860 for (@$callbacks) { 1038 for (@$callbacks) {
861 eval { &{$_->[1]} }; 1039 eval { &{$_->[1]} };
… …
870 } 1048 }
871 1049
872 0 1050 0
873} 1051}
874 1052
875=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
876 1054
877=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
878 1056
879Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
880 1058
881This 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
882removed 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
883results (if you must, access C<@cf::invoke_results> directly). 1061results (if you must, access C<@cf::INVOKE_RESULTS> directly).
884 1062
885=back 1063=back
886 1064
887=cut 1065=cut
888 1066
889############################################################################# 1067#############################################################################
890# 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}
891 1111
892sub reattach { 1112sub reattach {
893 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
894 my ($obj) = @_; 1114 my ($obj) = @_;
895 1115
1116 # no longer needed after getting rid of delete_package?
896 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
897 1118
898 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
899 1120
900 @$registry = (); 1121 @$registry = ();
901 1122
… …
916cf::attachable->attach ( 1137cf::attachable->attach (
917 prio => -1000000, 1138 prio => -1000000,
918 on_instantiate => sub { 1139 on_instantiate => sub {
919 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
920 1141
921 $data = from_json $data; 1142 $data = decode_json $data;
922 1143
923 for (@$data) { 1144 for (@$data) {
924 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
925 1146
926 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
… …
942sub object_freezer_save { 1163sub object_freezer_save {
943 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
944 1165
945 sync_job { 1166 sync_job {
946 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
947 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
948 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
949 1171
950 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
951 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
952 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
953 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
954 close $fh; 1176 aio_close $fh;
955 1177
956 if (@$objs) { 1178 if (@$objs) {
957 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) {
958 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
959 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
960 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
961 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
962 close $fh; 1184 aio_close $fh;
963 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
964 } 1186 }
965 } else { 1187 } else {
966 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
967 } 1189 }
… …
972 } 1194 }
973 } else { 1195 } else {
974 aio_unlink $filename; 1196 aio_unlink $filename;
975 aio_unlink "$filename.pst"; 1197 aio_unlink "$filename.pst";
976 } 1198 }
977 } 1199 };
978} 1200}
979 1201
980sub object_freezer_as_string { 1202sub object_freezer_as_string {
981 my ($rdata, $objs) = @_; 1203 my ($rdata, $objs) = @_;
982 1204
… …
994 or return; 1216 or return;
995 1217
996 unless (aio_stat "$filename.pst") { 1218 unless (aio_stat "$filename.pst") {
997 (aio_load "$filename.pst", $av) >= 0 1219 (aio_load "$filename.pst", $av) >= 0
998 or return; 1220 or return;
1221
999 $av = eval { (Storable::thaw $av)->{objs} }; 1222 my $st = eval { Coro::Storable::thaw $av };
1223 $av = $st->{objs};
1000 } 1224 }
1001 1225
1226 utf8::decode (my $decname = $filename);
1002 warn sprintf "loading %s (%d)\n", 1227 warn sprintf "loading %s (%d,%d)\n",
1003 $filename, length $data, scalar @{$av || []}; 1228 $decname, length $data, scalar @{$av || []};
1229
1004 return ($data, $av); 1230 ($data, $av)
1005} 1231}
1006 1232
1007=head2 COMMAND CALLBACKS 1233=head2 COMMAND CALLBACKS
1008 1234
1009=over 4 1235=over 4
… …
1029 push @{ $COMMAND{$name} }, [$caller, $cb]; 1255 push @{ $COMMAND{$name} }, [$caller, $cb];
1030} 1256}
1031 1257
1032=item cf::register_extcmd $name => \&callback($pl,$packet); 1258=item cf::register_extcmd $name => \&callback($pl,$packet);
1033 1259
1034Register a callback fro 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.
1035 1265
1036If 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
1037called. 1267called.
1038 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
1039=cut 1280=cut
1040 1281
1041sub register_extcmd { 1282sub register_extcmd {
1042 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1043 1284
1044 $EXTCMD{$name} = $cb; 1285 $EXTCMD{$name} = $cb;
1286}
1287
1288sub register_exticmd {
1289 my ($name, $cb) = @_;
1290
1291 $EXTICMD{$name} = $cb;
1045} 1292}
1046 1293
1047cf::player->attach ( 1294cf::player->attach (
1048 on_command => sub { 1295 on_command => sub {
1049 my ($pl, $name, $params) = @_; 1296 my ($pl, $name, $params) = @_;
… …
1058 cf::override; 1305 cf::override;
1059 }, 1306 },
1060 on_extcmd => sub { 1307 on_extcmd => sub {
1061 my ($pl, $buf) = @_; 1308 my ($pl, $buf) = @_;
1062 1309
1063 my $msg = eval { from_json $buf }; 1310 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1064 1311
1065 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
1066 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1320 if (my $cb = $EXTCMD{$type}) {
1067 if (my %reply = $cb->($pl, $msg)) { 1321 @reply = $cb->($pl, @payload);
1068 $pl->ext_reply ($msg->{msgid}, %reply);
1069 }
1070 } 1322 }
1323
1324 $pl->ext_reply ($reply, @reply)
1325 if $reply;
1326
1071 } else { 1327 } else {
1072 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1328 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1073 } 1329 }
1074 1330
1075 cf::override; 1331 cf::override;
… …
1102 1358
1103 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1359 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1104 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1360 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1105 1361
1106 $ext{source} = 1362 $ext{source} =
1107 "package $pkg; use strict; use utf8;\n" 1363 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1108 . "#line 1 \"$path\"\n{\n" 1364 . "#line 1 \"$path\"\n{\n"
1109 . $source 1365 . $source
1110 . "\n};\n1"; 1366 . "\n};\n1";
1111 1367
1112 $todo{$base} = \%ext; 1368 $todo{$base} = \%ext;
… …
1128 my $msg = $@ ? "$v->{path}: $@\n" 1384 my $msg = $@ ? "$v->{path}: $@\n"
1129 : "$v->{base}: extension inactive.\n"; 1385 : "$v->{base}: extension inactive.\n";
1130 1386
1131 if (exists $v->{meta}{mandatory}) { 1387 if (exists $v->{meta}{mandatory}) {
1132 warn $msg; 1388 warn $msg;
1133 warn "mandatory extension failed to load, exiting.\n"; 1389 cf::cleanup "mandatory extension failed to load, exiting.";
1134 exit 1;
1135 } 1390 }
1136 1391
1137 warn $msg; 1392 warn $msg;
1138 } 1393 }
1139 1394
… …
1153 1408
1154=back 1409=back
1155 1410
1156=head2 CORE EXTENSIONS 1411=head2 CORE EXTENSIONS
1157 1412
1158Functions and methods that extend core crossfire objects. 1413Functions and methods that extend core deliantra objects.
1159 1414
1160=cut 1415=cut
1161 1416
1162package cf::player; 1417package cf::player;
1163 1418
1164use Coro::AIO; 1419use Coro::AIO;
1165 1420
1166=head3 cf::player 1421=head3 cf::player
1167 1422
1168=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}
1169 1438
1170=item cf::player::find $login 1439=item cf::player::find $login
1171 1440
1172Returns the given player object, loading it if necessary (might block). 1441Returns the given player object, loading it if necessary (might block).
1173 1442
… …
1192 1461
1193sub exists($) { 1462sub exists($) {
1194 my ($login) = @_; 1463 my ($login) = @_;
1195 1464
1196 $cf::PLAYER{$login} 1465 $cf::PLAYER{$login}
1197 or cf::sync_job { !aio_stat path $login } 1466 or !aio_stat path $login
1198} 1467}
1199 1468
1200sub find($) { 1469sub find($) {
1201 return $cf::PLAYER{$_[0]} || do { 1470 return $cf::PLAYER{$_[0]} || do {
1202 my $login = $_[0]; 1471 my $login = $_[0];
… …
1209 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1478 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1210 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1479 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1211 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1480 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1212 aio_unlink +(playerdir $login) . "/$login.pl"; 1481 aio_unlink +(playerdir $login) . "/$login.pl";
1213 1482
1214 my $pl = load_pl path $login 1483 my $f = new_from_file cf::object::thawer path $login
1215 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;
1216 $cf::PLAYER{$login} = $pl 1491 $cf::PLAYER{$login} = $pl
1217 } 1492 }
1218 } 1493 }
1219} 1494}
1220 1495
… …
1229 return if $pl->{deny_save}; 1504 return if $pl->{deny_save};
1230 1505
1231 aio_mkdir playerdir $pl, 0770; 1506 aio_mkdir playerdir $pl, 0770;
1232 $pl->{last_save} = $cf::RUNTIME; 1507 $pl->{last_save} = $cf::RUNTIME;
1233 1508
1509 cf::get_slot 0.01;
1510
1234 $pl->save_pl ($path); 1511 $pl->save_pl ($path);
1235 Coro::cede; 1512 cf::cede_to_tick;
1236} 1513}
1237 1514
1238sub new($) { 1515sub new($) {
1239 my ($login) = @_; 1516 my ($login) = @_;
1240 1517
… …
1246 $cf::PLAYER{$login} = $self; 1523 $cf::PLAYER{$login} = $self;
1247 1524
1248 $self 1525 $self
1249} 1526}
1250 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
1251=item $pl->quit_character 1538=item $pl->quit_character
1252 1539
1253Nukes the player without looking back. If logged in, the connection will 1540Nukes the player without looking back. If logged in, the connection will
1254be destroyed. May block for a long time. 1541be destroyed. May block for a long time.
1255 1542
… …
1259 my ($pl) = @_; 1546 my ($pl) = @_;
1260 1547
1261 my $name = $pl->ob->name; 1548 my $name = $pl->ob->name;
1262 1549
1263 $pl->{deny_save} = 1; 1550 $pl->{deny_save} = 1;
1264 $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
1265 1552
1266 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1553 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1267 $pl->deactivate; 1554 $pl->deactivate;
1555 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1556 $pl->ob->check_score;
1268 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1557 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1269 $pl->ns->destroy if $pl->ns; 1558 $pl->ns->destroy if $pl->ns;
1270 1559
1271 my $path = playerdir $pl; 1560 my $path = playerdir $pl;
1272 my $temp = "$path~$cf::RUNTIME~deleting~"; 1561 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1308 or return []; 1597 or return [];
1309 1598
1310 my @logins; 1599 my @logins;
1311 1600
1312 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") {
1313 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1607 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1314 aio_read $fh, 0, 512, my $buf, 0 or next; 1608 aio_read $fh, 0, 512, my $buf, 0 or next;
1315 $buf !~ /^password -------------$/m or next; # official not-valid tag 1609 $buf !~ /^password -------------$/m or next; # official not-valid tag
1610 }
1316 1611
1317 utf8::decode $login; 1612 utf8::decode $login;
1318 push @logins, $login; 1613 push @logins, $login;
1319 } 1614 }
1320 1615
… …
1347 } 1642 }
1348 1643
1349 \@paths 1644 \@paths
1350} 1645}
1351 1646
1647=item $protocol_xml = $player->expand_cfpod ($cfpod)
1648
1649Expand deliantra pod fragments into protocol xml.
1650
1352=item $player->ext_reply ($msgid, %msg) 1651=item $player->ext_reply ($msgid, @msg)
1353 1652
1354Sends an ext reply to the player. 1653Sends an ext reply to the player.
1355 1654
1356=cut 1655=cut
1357 1656
1358sub ext_reply($$%) { 1657sub ext_reply($$@) {
1359 my ($self, $id, %msg) = @_; 1658 my ($self, $id, @msg) = @_;
1360 1659
1361 $msg{msgid} = $id; 1660 $self->ns->ext_reply ($id, @msg)
1362
1363 $self->send ("ext " . cf::to_json \%msg);
1364} 1661}
1365 1662
1366=item $player->ext_event ($type, %msg) 1663=item $player->ext_msg ($type, @msg)
1367 1664
1368Sends an ext event to the client. 1665Sends an ext event to the client.
1369 1666
1370=cut 1667=cut
1371 1668
1372sub ext_event($$%) { 1669sub ext_msg($$@) {
1373 my ($self, $type, %msg) = @_; 1670 my ($self, $type, @msg) = @_;
1374 1671
1375 $self->ns->ext_event ($type, %msg); 1672 $self->ns->ext_msg ($type, @msg);
1376} 1673}
1377 1674
1378=head3 cf::region 1675=head3 cf::region
1379 1676
1380=over 4 1677=over 4
… …
1393 my ($path) = @_; 1690 my ($path) = @_;
1394 1691
1395 my ($match, $specificity); 1692 my ($match, $specificity);
1396 1693
1397 for my $region (list) { 1694 for my $region (list) {
1398 if ($region->match && $path =~ $region->match) { 1695 if ($region->{match} && $path =~ $region->{match}) {
1399 ($match, $specificity) = ($region, $region->specificity) 1696 ($match, $specificity) = ($region, $region->specificity)
1400 if $region->specificity > $specificity; 1697 if $region->specificity > $specificity;
1401 } 1698 }
1402 } 1699 }
1403 1700
… …
1424our $MAX_RESET = 3600; 1721our $MAX_RESET = 3600;
1425our $DEFAULT_RESET = 3000; 1722our $DEFAULT_RESET = 3000;
1426 1723
1427sub generate_random_map { 1724sub generate_random_map {
1428 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
1429 # mit "rum" bekleckern, nicht 1729 # mit "rum" bekleckern, nicht
1430 $self->_create_random_map ( 1730 $self->_create_random_map (
1431 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1731 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1432 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1732 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1433 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1733 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
… …
1523 $self->init; # pass $1 etc. 1823 $self->init; # pass $1 etc.
1524 return $self; 1824 return $self;
1525 } 1825 }
1526 } 1826 }
1527 1827
1528 Carp::carp "unable to resolve path '$path' (base '$base')."; 1828 Carp::cluck "unable to resolve path '$path' (base '$base').";
1529 () 1829 ()
1530} 1830}
1531 1831
1532sub init { 1832sub init {
1533 my ($self) = @_; 1833 my ($self) = @_;
… …
1555 1855
1556# the temporary/swap location 1856# the temporary/swap location
1557sub save_path { 1857sub save_path {
1558 my ($self) = @_; 1858 my ($self) = @_;
1559 1859
1560 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1860 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1561 "$TMPDIR/$path.map" 1861 "$TMPDIR/$path.map"
1562} 1862}
1563 1863
1564# the unique path, undef == no special unique path 1864# the unique path, undef == no special unique path
1565sub uniq_path { 1865sub uniq_path {
1566 my ($self) = @_; 1866 my ($self) = @_;
1567 1867
1568 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1868 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1569 "$UNIQUEDIR/$path" 1869 "$UNIQUEDIR/$path"
1570} 1870}
1571 1871
1572# and all this just because we cannot iterate over 1872# and all this just because we cannot iterate over
1573# all maps in C++... 1873# all maps in C++...
… …
1596 1896
1597sub load_header_from($) { 1897sub load_header_from($) {
1598 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1599 1899
1600 utf8::encode $path; 1900 utf8::encode $path;
1601 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1602 # or return;
1603
1604 $self->_load_header ($path)
1605 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;
1606 1909
1607 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1608 1911
1609 1 1912 1
1610} 1913}
… …
1664sub find { 1967sub find {
1665 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1666 1969
1667 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1668 1971
1972 cf::lock_wait "map_data:$path";#d#remove
1669 cf::lock_wait "map_find:$path"; 1973 cf::lock_wait "map_find:$path";
1670 1974
1671 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1976 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1672 my $guard = cf::lock_acquire "map_find:$path"; 1977 my $guard2 = cf::lock_acquire "map_find:$path";
1978
1673 my $map = new_from_path cf::map $path 1979 my $map = new_from_path cf::map $path
1674 or return; 1980 or return;
1675 1981
1676 $map->{last_save} = $cf::RUNTIME; 1982 $map->{last_save} = $cf::RUNTIME;
1677 1983
… …
1679 or return; 1985 or return;
1680 1986
1681 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1987 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1682 # doing this can freeze the server in a sync job, obviously 1988 # doing this can freeze the server in a sync job, obviously
1683 #$cf::WAIT_FOR_TICK->wait; 1989 #$cf::WAIT_FOR_TICK->wait;
1990 undef $guard2;
1991 undef $guard1;
1684 $map->reset; 1992 $map->reset;
1685 undef $guard;
1686 return find $path; 1993 return find $path;
1687 } 1994 }
1688 1995
1689 $cf::MAP{$path} = $map 1996 $cf::MAP{$path} = $map
1690 } 1997 }
… …
1699 local $self->{deny_reset} = 1; # loading can take a long time 2006 local $self->{deny_reset} = 1; # loading can take a long time
1700 2007
1701 my $path = $self->{path}; 2008 my $path = $self->{path};
1702 2009
1703 { 2010 {
1704 my $guard = cf::lock_acquire "map_load:$path"; 2011 my $guard = cf::lock_acquire "map_data:$path";
1705 2012
2013 return unless $self->valid;
1706 return if $self->in_memory != cf::MAP_SWAPPED; 2014 return unless $self->in_memory == cf::MAP_SWAPPED;
1707 2015
1708 $self->in_memory (cf::MAP_LOADING); 2016 $self->in_memory (cf::MAP_LOADING);
1709 2017
1710 $self->alloc; 2018 $self->alloc;
1711 2019
1712 $self->pre_load; 2020 $self->pre_load;
1713 Coro::cede; 2021 cf::cede_to_tick;
1714 2022
2023 my $f = new_from_file cf::object::thawer $self->{load_path};
2024 $f->skip_block;
1715 $self->_load_objects ($self->{load_path}, 1) 2025 $self->_load_objects ($f)
1716 or return; 2026 or return;
1717 2027
1718 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2028 $self->post_load_original
1719 if delete $self->{load_original}; 2029 if delete $self->{load_original};
1720 2030
1721 if (my $uniq = $self->uniq_path) { 2031 if (my $uniq = $self->uniq_path) {
1722 utf8::encode $uniq; 2032 utf8::encode $uniq;
1723 if (aio_open $uniq, O_RDONLY, 0) { 2033 unless (aio_stat $uniq) {
2034 if (my $f = new_from_file cf::object::thawer $uniq) {
1724 $self->clear_unique_items; 2035 $self->clear_unique_items;
1725 $self->_load_objects ($uniq, 0); 2036 $self->_load_objects ($f);
2037 $f->resolve_delayed_derefs;
2038 }
1726 } 2039 }
1727 } 2040 }
1728 2041
1729 Coro::cede; 2042 $f->resolve_delayed_derefs;
2043
2044 cf::cede_to_tick;
1730 # now do the right thing for maps 2045 # now do the right thing for maps
1731 $self->link_multipart_objects; 2046 $self->link_multipart_objects;
1732 $self->difficulty ($self->estimate_difficulty) 2047 $self->difficulty ($self->estimate_difficulty)
1733 unless $self->difficulty; 2048 unless $self->difficulty;
1734 Coro::cede; 2049 cf::cede_to_tick;
1735 2050
1736 unless ($self->{deny_activate}) { 2051 unless ($self->{deny_activate}) {
1737 $self->decay_objects; 2052 $self->decay_objects;
1738 $self->fix_auto_apply; 2053 $self->fix_auto_apply;
1739 $self->update_buttons; 2054 $self->update_buttons;
1740 Coro::cede; 2055 cf::cede_to_tick;
1741 $self->set_darkness_map; 2056 $self->set_darkness_map;
1742 Coro::cede; 2057 cf::cede_to_tick;
1743 $self->activate; 2058 $self->activate;
1744 } 2059 }
1745 2060
2061 $self->{last_save} = $cf::RUNTIME;
2062 $self->last_access ($cf::RUNTIME);
2063
1746 $self->in_memory (cf::MAP_IN_MEMORY); 2064 $self->in_memory (cf::MAP_ACTIVE);
1747 } 2065 }
1748 2066
1749 $self->post_load; 2067 $self->post_load;
1750} 2068}
1751 2069
… …
1760 2078
1761 $self 2079 $self
1762} 2080}
1763 2081
1764# 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
1765sub load_diag { 2083sub load_neighbours {
1766 my ($map) = @_; 2084 my ($map) = @_;
1767 2085
1768 my @diag; # diagonal neighbours 2086 my @neigh; # diagonal neighbours
1769 2087
1770 for (0 .. 3) { 2088 for (0 .. 3) {
1771 my $neigh = $map->tile_path ($_) 2089 my $neigh = $map->tile_path ($_)
1772 or next; 2090 or next;
1773 $neigh = find $neigh, $map 2091 $neigh = find $neigh, $map
1774 or next; 2092 or next;
1775 $neigh->load; 2093 $neigh->load;
1776 2094
2095 push @neigh,
1777 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2096 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1778 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2097 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1779 } 2098 }
1780 2099
1781 for (@diag) { 2100 for (grep defined $_->[0], @neigh) {
2101 my ($path, $origin) = @$_;
1782 my $neigh = find @$_ 2102 my $neigh = find $path, $origin
1783 or next; 2103 or next;
1784 $neigh->load; 2104 $neigh->load;
1785 } 2105 }
1786} 2106}
1787 2107
… …
1792} 2112}
1793 2113
1794sub do_load_sync { 2114sub do_load_sync {
1795 my ($map) = @_; 2115 my ($map) = @_;
1796 2116
2117 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2118 if $Coro::current == $Coro::main;
2119
1797 cf::sync_job { $map->load }; 2120 cf::sync_job { $map->load };
1798} 2121}
1799 2122
1800our %MAP_PREFETCH; 2123our %MAP_PREFETCH;
1801our $MAP_PREFETCHER = undef; 2124our $MAP_PREFETCHER = undef;
1802 2125
1803sub find_async { 2126sub find_async {
1804 my ($path, $origin) = @_; 2127 my ($path, $origin, $load) = @_;
1805 2128
1806 $path = normalise $path, $origin && $origin->{path}; 2129 $path = normalise $path, $origin && $origin->{path};
1807 2130
1808 if (my $map = $cf::MAP{$path}) { 2131 if (my $map = $cf::MAP{$path}) {
1809 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2132 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1810 } 2133 }
1811 2134
1812 undef $MAP_PREFETCH{$path}; 2135 $MAP_PREFETCH{$path} |= $load;
2136
1813 $MAP_PREFETCHER ||= cf::async { 2137 $MAP_PREFETCHER ||= cf::async {
2138 $Coro::current->{desc} = "map prefetcher";
2139
1814 while (%MAP_PREFETCH) { 2140 while (%MAP_PREFETCH) {
1815 for my $path (keys %MAP_PREFETCH) { 2141 while (my ($k, $v) = each %MAP_PREFETCH) {
1816 my $map = find $path 2142 if (my $map = find $k) {
1817 or next;
1818 $map->load; 2143 $map->load if $v;
2144 }
1819 2145
1820 delete $MAP_PREFETCH{$path}; 2146 delete $MAP_PREFETCH{$k};
1821 } 2147 }
1822 } 2148 }
1823 undef $MAP_PREFETCHER; 2149 undef $MAP_PREFETCHER;
1824 }; 2150 };
1825 $MAP_PREFETCHER->prio (6); 2151 $MAP_PREFETCHER->prio (6);
… …
1828} 2154}
1829 2155
1830sub save { 2156sub save {
1831 my ($self) = @_; 2157 my ($self) = @_;
1832 2158
1833 my $lock = cf::lock_acquire "map_data:" . $self->path; 2159 my $lock = cf::lock_acquire "map_data:$self->{path}";
1834 2160
1835 $self->{last_save} = $cf::RUNTIME; 2161 $self->{last_save} = $cf::RUNTIME;
1836 2162
1837 return unless $self->dirty; 2163 return unless $self->dirty;
1838 2164
… …
1844 return if $self->{deny_save}; 2170 return if $self->{deny_save};
1845 2171
1846 local $self->{last_access} = $self->last_access;#d# 2172 local $self->{last_access} = $self->last_access;#d#
1847 2173
1848 cf::async { 2174 cf::async {
2175 $Coro::current->{desc} = "map player save";
1849 $_->contr->save for $self->players; 2176 $_->contr->save for $self->players;
1850 }; 2177 };
2178
2179 cf::get_slot 0.02;
1851 2180
1852 if ($uniq) { 2181 if ($uniq) {
1853 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2182 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1854 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2183 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1855 } else { 2184 } else {
… …
1861 my ($self) = @_; 2190 my ($self) = @_;
1862 2191
1863 # save first because save cedes 2192 # save first because save cedes
1864 $self->save; 2193 $self->save;
1865 2194
1866 my $lock = cf::lock_acquire "map_data:" . $self->path; 2195 my $lock = cf::lock_acquire "map_data:$self->{path}";
1867 2196
1868 return if $self->players; 2197 return if $self->players;
1869 return if $self->in_memory != cf::MAP_IN_MEMORY; 2198 return if $self->in_memory != cf::MAP_ACTIVE;
1870 return if $self->{deny_save}; 2199 return if $self->{deny_save};
1871 2200
2201 $self->in_memory (cf::MAP_SWAPPED);
2202
2203 $self->deactivate;
2204 $_->clear_links_to ($self) for values %cf::MAP;
1872 $self->clear; 2205 $self->clear;
1873 $self->in_memory (cf::MAP_SWAPPED);
1874} 2206}
1875 2207
1876sub reset_at { 2208sub reset_at {
1877 my ($self) = @_; 2209 my ($self) = @_;
1878 2210
… …
1910 if $uniq; 2242 if $uniq;
1911 } 2243 }
1912 2244
1913 delete $cf::MAP{$self->path}; 2245 delete $cf::MAP{$self->path};
1914 2246
2247 $self->deactivate;
2248 $_->clear_links_to ($self) for values %cf::MAP;
1915 $self->clear; 2249 $self->clear;
1916
1917 $_->clear_links_to ($self) for values %cf::MAP;
1918 2250
1919 $self->unlink_save; 2251 $self->unlink_save;
1920 $self->destroy; 2252 $self->destroy;
1921} 2253}
1922 2254
1923my $nuke_counter = "aaaa"; 2255my $nuke_counter = "aaaa";
1924 2256
1925sub nuke { 2257sub nuke {
1926 my ($self) = @_; 2258 my ($self) = @_;
1927 2259
2260 {
2261 my $lock = cf::lock_acquire "map_data:$self->{path}";
2262
1928 delete $cf::MAP{$self->path}; 2263 delete $cf::MAP{$self->path};
1929 2264
1930 $self->unlink_save; 2265 $self->unlink_save;
1931 2266
1932 bless $self, "cf::map"; 2267 bless $self, "cf::map";
1933 delete $self->{deny_reset}; 2268 delete $self->{deny_reset};
1934 $self->{deny_save} = 1; 2269 $self->{deny_save} = 1;
1935 $self->reset_timeout (1); 2270 $self->reset_timeout (1);
1936 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2271 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1937 2272
1938 $cf::MAP{$self->path} = $self; 2273 $cf::MAP{$self->path} = $self;
2274 }
1939 2275
1940 $self->reset; # polite request, might not happen 2276 $self->reset; # polite request, might not happen
1941} 2277}
1942 2278
1943=item $maps = cf::map::tmp_maps 2279=item $maps = cf::map::tmp_maps
… …
1985 2321
1986sub unique_maps() { 2322sub unique_maps() {
1987 [ 2323 [
1988 map { 2324 map {
1989 utf8::decode $_; 2325 utf8::decode $_;
1990 /\.map$/ 2326 s/\.map$//; # TODO future compatibility hack
2327 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2328 ? ()
1991 ? normalise $_ 2329 : normalise $_
1992 : ()
1993 } @{ aio_readdir $UNIQUEDIR or [] } 2330 } @{ aio_readdir $UNIQUEDIR or [] }
1994 ] 2331 ]
1995} 2332}
1996 2333
1997package cf;
1998
1999=back 2334=back
2000 2335
2001=head3 cf::object 2336=head3 cf::object
2002 2337
2003=cut 2338=cut
… …
2006 2341
2007=over 4 2342=over 4
2008 2343
2009=item $ob->inv_recursive 2344=item $ob->inv_recursive
2010 2345
2011Returns 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.
2012 2348
2013=cut 2349=cut
2014 2350
2015sub inv_recursive_; 2351sub inv_recursive_;
2016sub inv_recursive_ { 2352sub inv_recursive_ {
… …
2019 2355
2020sub inv_recursive { 2356sub inv_recursive {
2021 inv_recursive_ inv $_[0] 2357 inv_recursive_ inv $_[0]
2022} 2358}
2023 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
2024package cf; 2388package cf;
2025 2389
2026=back 2390=back
2027 2391
2028=head3 cf::object::player 2392=head3 cf::object::player
… …
2034Sends 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>
2035can 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
2036dialogue with the given NPC character. 2400dialogue with the given NPC character.
2037 2401
2038=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};
2039 2417
2040# rough implementation of a future "reply" method that works 2418# rough implementation of a future "reply" method that works
2041# with dialog boxes. 2419# with dialog boxes.
2042#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
2043sub cf::object::player::reply($$$;$) { 2421sub cf::object::player::reply($$$;$) {
… …
2050 2428
2051 } else { 2429 } else {
2052 my $pl = $self->contr; 2430 my $pl = $self->contr;
2053 2431
2054 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2432 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2055 my $diag = $pl->{npc_dialog}; 2433 my $dialog = $pl->{npc_dialog};
2056 $diag->{pl}->ext_reply ( 2434 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2057 $diag->{id}, msgtype => "reply", msg => $msg, add_topics => []
2058 );
2059 2435
2060 } else { 2436 } else {
2061 $msg = $npc->name . " says: $msg" if $npc; 2437 $msg = $npc->name . " says: $msg" if $npc;
2062 $self->message ($msg, $flags); 2438 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2063 } 2439 }
2064 } 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 (@_);
2065} 2451}
2066 2452
2067=item $player_object->may ("access") 2453=item $player_object->may ("access")
2068 2454
2069Returns wether the given player is authorized to access resource "access" 2455Returns wether the given player is authorized to access resource "access"
… …
2082 2468
2083=item $player_object->enter_link 2469=item $player_object->enter_link
2084 2470
2085Freezes 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}>).
2086 2472
2087The 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.
2088I<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.
2089 2477
2090Will never block. 2478Will never block.
2091 2479
2092=item $player_object->leave_link ($map, $x, $y) 2480=item $player_object->leave_link ($map, $x, $y)
2093 2481
… …
2148 # use -1 or undef as default coordinates, not 0, 0 2536 # use -1 or undef as default coordinates, not 0, 0
2149 ($x, $y) = ($map->enter_x, $map->enter_y) 2537 ($x, $y) = ($map->enter_x, $map->enter_y)
2150 if $x <=0 && $y <= 0; 2538 if $x <=0 && $y <= 0;
2151 2539
2152 $map->load; 2540 $map->load;
2153 $map->load_diag; 2541 $map->load_neighbours;
2154 2542
2155 return unless $self->contr->active; 2543 return unless $self->contr->active;
2544 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2156 $self->activate_recursive; 2545 $self->activate_recursive;
2157 2546
2158 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2547 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2159 $self->enter_map ($map, $x, $y); 2548 $self->enter_map ($map, $x, $y);
2160} 2549}
2161 2550
2162=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2551=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2163 2552
2164Moves 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
2165her, loading and preparing them map, calling the provided $check callback 2554her, loading and preparing them map, calling the provided $check callback
2166that 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
2167the 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 >>.
2168 2561
2169=cut 2562=cut
2170 2563
2171our $GOTOGEN; 2564our $GOTOGEN;
2172 2565
2173sub cf::object::player::goto { 2566sub cf::object::player::goto {
2174 my ($self, $path, $x, $y, $check) = @_; 2567 my ($self, $path, $x, $y, $check, $done) = @_;
2175 2568
2176 # 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
2177 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2570 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2178 2571
2179 $self->enter_link; 2572 $self->enter_link;
2180 2573
2181 (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
2182 my $map = eval { 2596 my $map = eval {
2183 my $map = cf::map::find $path; 2597 my $map = defined $path ? cf::map::find $path : undef;
2184 2598
2185 if ($map) { 2599 if ($map) {
2186 $map = $map->customise_for ($self); 2600 $map = $map->customise_for ($self);
2187 $map = $check->($map) if $check && $map; 2601 $map = $check->($map) if $check && $map;
2188 } else { 2602 } else {
2189 $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);
2190 } 2604 }
2191 2605
2192 $map 2606 $map
2193 }; 2607 };
2194 2608
… …
2199 2613
2200 if ($gen == $self->{_goto_generation}) { 2614 if ($gen == $self->{_goto_generation}) {
2201 delete $self->{_goto_generation}; 2615 delete $self->{_goto_generation};
2202 $self->leave_link ($map, $x, $y); 2616 $self->leave_link ($map, $x, $y);
2203 } 2617 }
2618
2619 $done->() if $done;
2204 })->prio (1); 2620 })->prio (1);
2205} 2621}
2206 2622
2207=item $player_object->enter_exit ($exit_object) 2623=item $player_object->enter_exit ($exit_object)
2208 2624
… …
2228} 2644}
2229 2645
2230sub prepare_random_map { 2646sub prepare_random_map {
2231 my ($exit) = @_; 2647 my ($exit) = @_;
2232 2648
2233 my $guard = cf::lock_acquire "exit_prepare:$exit";
2234
2235 # all this does is basically replace the /! path by 2649 # all this does is basically replace the /! path by
2236 # a new random map path (?random/...) with a seed 2650 # a new random map path (?random/...) with a seed
2237 # that depends on the exit object 2651 # that depends on the exit object
2238 2652
2239 my $rmp = parse_random_map_params $exit->msg; 2653 my $rmp = parse_random_map_params $exit->msg;
… …
2241 if ($exit->map) { 2655 if ($exit->map) {
2242 $rmp->{region} = $exit->region->name; 2656 $rmp->{region} = $exit->region->name;
2243 $rmp->{origin_map} = $exit->map->path; 2657 $rmp->{origin_map} = $exit->map->path;
2244 $rmp->{origin_x} = $exit->x; 2658 $rmp->{origin_x} = $exit->x;
2245 $rmp->{origin_y} = $exit->y; 2659 $rmp->{origin_y} = $exit->y;
2660
2661 $exit->map->touch;
2246 } 2662 }
2247 2663
2248 $rmp->{random_seed} ||= $exit->random_seed; 2664 $rmp->{random_seed} ||= $exit->random_seed;
2249 2665
2250 my $data = cf::to_json $rmp; 2666 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2251 my $md5 = Digest::MD5::md5_hex $data; 2667 my $md5 = Digest::MD5::md5_hex $data;
2252 my $meta = "$RANDOMDIR/$md5.meta"; 2668 my $meta = "$RANDOMDIR/$md5.meta";
2253 2669
2254 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2670 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2255 aio_write $fh, 0, (length $data), $data, 0; 2671 aio_write $fh, 0, (length $data), $data, 0;
2256 undef $fh; 2672 undef $fh;
2257 aio_rename "$meta~", $meta; 2673 aio_rename "$meta~", $meta;
2258 2674
2675 my $slaying = "?random/$md5";
2676
2677 if ($exit->valid) {
2259 $exit->slaying ("?random/$md5"); 2678 $exit->slaying ("?random/$md5");
2260 $exit->msg (undef); 2679 $exit->msg (undef);
2680 }
2261 } 2681 }
2262} 2682}
2263 2683
2264sub cf::object::player::enter_exit { 2684sub cf::object::player::enter_exit {
2265 my ($self, $exit) = @_; 2685 my ($self, $exit) = @_;
2266 2686
2267 return unless $self->type == cf::PLAYER; 2687 return unless $self->type == cf::PLAYER;
2268 2688
2269 if ($exit->slaying eq "/!") {
2270 #TODO: this should de-fi-ni-te-ly not be a sync-job
2271 # the problem is that $exit might not survive long enough
2272 # so it needs to be done right now, right here
2273 cf::sync_job { prepare_random_map $exit };
2274 }
2275
2276 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2277 my $hp = $exit->stats->hp;
2278 my $sp = $exit->stats->sp;
2279
2280 $self->enter_link; 2689 $self->enter_link;
2281 2690
2282 (async { 2691 (async {
2283 $self->deactivate_recursive; # just to be sure 2692 $Coro::current->{desc} = "enter_exit";
2693
2284 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
2285 $self->goto ($slaying, $hp, $sp); 2709 $self->goto ($map, $x, $y);
2286 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
2287 1; 2715 1
2288 }) { 2716 }) {
2289 $self->message ("Something went wrong deep within the crossfire server. " 2717 $self->message ("Something went wrong deep within the deliantra server. "
2290 . "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. "
2291 . "Please report this to the dungeon master!", 2719 . "Please report this to the dungeon master!",
2292 cf::NDI_UNIQUE | cf::NDI_RED); 2720 cf::NDI_UNIQUE | cf::NDI_RED);
2293 2721
2294 warn "ERROR in enter_exit: $@"; 2722 warn "ERROR in enter_exit: $@";
… …
2313 2741
2314 utf8::encode $text; 2742 utf8::encode $text;
2315 $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);
2316} 2744}
2317 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
2318=item $client->ext_event ($type, %msg) 2897=item $client->ext_msg ($type, @msg)
2319 2898
2320Sends an exti event to the client. 2899Sends an ext event to the client.
2321 2900
2322=cut 2901=cut
2323 2902
2324sub cf::client::ext_event($$%) { 2903sub cf::client::ext_msg($$@) {
2325 my ($self, $type, %msg) = @_; 2904 my ($self, $type, @msg) = @_;
2326 2905
2906 if ($self->extcmd == 2) {
2907 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2908 } elsif ($self->extcmd == 1) { # TODO: remove
2327 $msg{msgtype} = "event_$type"; 2909 push @msg, msgtype => "event_$type";
2328 $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 }
2329} 2930}
2330 2931
2331=item $success = $client->query ($flags, "text", \&cb) 2932=item $success = $client->query ($flags, "text", \&cb)
2332 2933
2333Queues a query to the client, calling the given callback with 2934Queues a query to the client, calling the given callback with
2334the 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>,
2335C<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>.
2336 2937
2337Queries 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
2338reliable at some point in the future. 2939become reliable at some point in the future.
2339 2940
2340=cut 2941=cut
2341 2942
2342sub cf::client::query { 2943sub cf::client::query {
2343 my ($self, $flags, $text, $cb) = @_; 2944 my ($self, $flags, $text, $cb) = @_;
… …
2351 utf8::encode $text; 2952 utf8::encode $text;
2352 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2953 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2353 2954
2354 $self->send_packet ($self->{query_queue}[0][0]) 2955 $self->send_packet ($self->{query_queue}[0][0])
2355 if @{ $self->{query_queue} } == 1; 2956 if @{ $self->{query_queue} } == 1;
2957
2958 1
2356} 2959}
2357 2960
2358cf::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 },
2359 on_reply => sub { 2967 on_reply => sub {
2360 my ($ns, $msg) = @_; 2968 my ($ns, $msg) = @_;
2361 2969
2362 # this weird shuffling is so that direct followup queries 2970 # this weird shuffling is so that direct followup queries
2363 # get handled first 2971 # get handled first
… …
2375 } else { 2983 } else {
2376 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2984 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2377 } 2985 }
2378 } 2986 }
2379 }, 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 },
2380); 3014);
2381 3015
2382=item $client->async (\&cb) 3016=item $client->async (\&cb)
2383 3017
2384Create a new coroutine, running the specified callback. The coroutine will 3018Create a new coroutine, running the specified callback. The coroutine will
… …
2425our $safe = new Safe "safe"; 3059our $safe = new Safe "safe";
2426our $safe_hole = new Safe::Hole; 3060our $safe_hole = new Safe::Hole;
2427 3061
2428$SIG{FPE} = 'IGNORE'; 3062$SIG{FPE} = 'IGNORE';
2429 3063
2430$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));
2431 3069
2432# here we export the classes and methods available to script code 3070# here we export the classes and methods available to script code
2433 3071
2434=pod 3072=pod
2435 3073
2436The following functions and methods are available within a safe environment: 3074The following functions and methods are available within a safe environment:
2437 3075
2438 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
2439 cf::object::player player 3080 cf::object::player
2440 cf::player peaceful 3081 player
2441 cf::map trigger 3082
3083 cf::player
3084 peaceful
3085
3086 cf::map
3087 trigger
2442 3088
2443=cut 3089=cut
2444 3090
2445for ( 3091for (
2446 ["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)],
2447 ["cf::object::player" => qw(player)], 3095 ["cf::object::player" => qw(player)],
2448 ["cf::player" => qw(peaceful)], 3096 ["cf::player" => qw(peaceful)],
2449 ["cf::map" => qw(trigger)], 3097 ["cf::map" => qw(trigger)],
2450) { 3098) {
2451 no strict 'refs'; 3099 no strict 'refs';
… …
2527# the server's init and main functions 3175# the server's init and main functions
2528 3176
2529sub load_facedata($) { 3177sub load_facedata($) {
2530 my ($path) = @_; 3178 my ($path) = @_;
2531 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;
3185
2532 warn "loading facedata from $path\n"; 3186 warn "loading facedata from $path\n";
2533 3187
2534 my $facedata; 3188 my $facedata;
2535 0 < aio_load $path, $facedata 3189 0 < aio_load $path, $facedata
2536 or die "$path: $!"; 3190 or die "$path: $!";
… …
2538 $facedata = Coro::Storable::thaw $facedata; 3192 $facedata = Coro::Storable::thaw $facedata;
2539 3193
2540 $facedata->{version} == 2 3194 $facedata->{version} == 2
2541 or cf::cleanup "$path: version mismatch, cannot proceed."; 3195 or cf::cleanup "$path: version mismatch, cannot proceed.";
2542 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
2543 { 3204 {
2544 my $faces = $facedata->{faceinfo}; 3205 my $faces = $facedata->{faceinfo};
2545 3206
2546 while (my ($face, $info) = each %$faces) { 3207 while (my ($face, $info) = each %$faces) {
2547 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3208 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3209
2548 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3210 cf::face::set_visibility $idx, $info->{visibility};
3211 cf::face::set_magicmap $idx, $info->{magicmap};
2549 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3212 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2550 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3213 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2551 Coro::cede; 3214
3215 cf::cede_to_tick;
2552 } 3216 }
2553 3217
2554 while (my ($face, $info) = each %$faces) { 3218 while (my ($face, $info) = each %$faces) {
2555 next unless $info->{smooth}; 3219 next unless $info->{smooth};
3220
2556 my $idx = cf::face::find $face 3221 my $idx = cf::face::find $face
2557 or next; 3222 or next;
3223
2558 if (my $smooth = cf::face::find $info->{smooth}) { 3224 if (my $smooth = cf::face::find $info->{smooth}) {
3225 cf::face::set_smooth $idx, $smooth;
2559 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3226 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2560 } else { 3227 } else {
2561 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3228 warn "smooth face '$info->{smooth}' not found for face '$face'";
2562 } 3229 }
2563 Coro::cede; 3230
3231 cf::cede_to_tick;
2564 } 3232 }
2565 } 3233 }
2566 3234
2567 { 3235 {
2568 my $anims = $facedata->{animinfo}; 3236 my $anims = $facedata->{animinfo};
2569 3237
2570 while (my ($anim, $info) = each %$anims) { 3238 while (my ($anim, $info) = each %$anims) {
2571 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3239 cf::anim::set $anim, $info->{frames}, $info->{facings};
2572 Coro::cede; 3240 cf::cede_to_tick;
2573 } 3241 }
2574 3242
2575 cf::anim::invalidate_all; # d'oh 3243 cf::anim::invalidate_all; # d'oh
2576 } 3244 }
2577 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
2578 1 3281 1
2579} 3282}
2580 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
2581sub 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
2582 load_resource_file "$MAPDIR/regions" 3327 load_resource_file "$MAPDIR/regions"
2583 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 }
2584} 3334}
2585 3335
2586sub reload_facedata { 3336sub reload_facedata {
2587 load_facedata "$DATADIR/facedata" 3337 load_facedata "$DATADIR/facedata"
2588 or die "unable to load facedata\n"; 3338 or die "unable to load facedata\n";
… …
2599} 3349}
2600 3350
2601sub reload_resources { 3351sub reload_resources {
2602 warn "reloading resource files...\n"; 3352 warn "reloading resource files...\n";
2603 3353
3354 reload_facedata;
3355 reload_archetypes;
2604 reload_regions; 3356 reload_regions;
2605 reload_facedata;
2606 #reload_archetypes;#d#
2607 reload_archetypes;
2608 reload_treasures; 3357 reload_treasures;
2609 3358
2610 warn "finished reloading resource files\n"; 3359 warn "finished reloading resource files\n";
2611} 3360}
2612 3361
2613sub init { 3362sub reload_config {
2614 reload_resources;
2615}
2616
2617sub cfg_load {
2618 open my $fh, "<:utf8", "$CONFDIR/config" 3363 open my $fh, "<:utf8", "$CONFDIR/config"
2619 or return; 3364 or return;
2620 3365
2621 local $/; 3366 local $/;
2622 *CFG = YAML::Syck::Load <$fh>; 3367 *CFG = YAML::Load <$fh>;
2623 3368
2624 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3369 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2625 3370
2626 $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};
2627 $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};
… …
2633 }; 3378 };
2634 warn $@ if $@; 3379 warn $@ if $@;
2635 } 3380 }
2636} 3381}
2637 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
2638sub 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
2639 # we must not ever block the main coroutine 3418 # we must not ever block the main coroutine
2640 local $Coro::idle = sub { 3419 local $Coro::idle = sub {
2641 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#
2642 (async { 3421 (async {
2643 Event::one_event; 3422 $Coro::current->{desc} = "IDLE BUG HANDLER";
3423 EV::loop EV::LOOP_ONESHOT;
2644 })->prio (Coro::PRIO_MAX); 3424 })->prio (Coro::PRIO_MAX);
2645 }; 3425 };
2646 3426
2647 cfg_load; 3427 evthread_start IO::AIO::poll_fileno;
3428
3429 cf::sync_job {
3430 reload_resources;
3431 reload_config;
2648 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
2649 load_extensions; 3445 load_extensions;
2650 3446
2651 $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
2652 Event::loop; 3455 EV::loop;
2653} 3456}
2654 3457
2655############################################################################# 3458#############################################################################
2656# initialisation and cleanup 3459# initialisation and cleanup
2657 3460
2658# install some emergency cleanup handlers 3461# install some emergency cleanup handlers
2659BEGIN { 3462BEGIN {
3463 our %SIGWATCHER = ();
2660 for my $signal (qw(INT HUP TERM)) { 3464 for my $signal (qw(INT HUP TERM)) {
2661 Event->signal ( 3465 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2662 reentrant => 0,
2663 data => WF_AUTOCANCEL,
2664 signal => $signal,
2665 prio => 0,
2666 cb => sub {
2667 cf::cleanup "SIG$signal"; 3466 cf::cleanup "SIG$signal";
2668 },
2669 ); 3467 };
2670 } 3468 }
2671} 3469}
2672 3470
2673sub write_runtime { 3471sub write_runtime_sync {
2674 my $runtime = "$LOCALDIR/runtime";
2675
2676 # first touch the runtime file to show we are still running: 3472 # first touch the runtime file to show we are still running:
2677 # the fsync below can take a very very long time. 3473 # the fsync below can take a very very long time.
2678 3474
2679 IO::AIO::aio_utime $runtime, undef, undef; 3475 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2680 3476
2681 my $guard = cf::lock_acquire "write_runtime"; 3477 my $guard = cf::lock_acquire "write_runtime";
2682 3478
2683 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3479 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2684 or return; 3480 or return;
2685 3481
2686 my $value = $cf::RUNTIME + 90 + 10; 3482 my $value = $cf::RUNTIME + 90 + 10;
2687 # 10 is the runtime save interval, for a monotonic clock 3483 # 10 is the runtime save interval, for a monotonic clock
2688 # 60 allows for the watchdog to kill the server. 3484 # 60 allows for the watchdog to kill the server.
… …
2698 aio_utime $fh, undef, undef; 3494 aio_utime $fh, undef, undef;
2699 3495
2700 close $fh 3496 close $fh
2701 or return; 3497 or return;
2702 3498
2703 aio_rename "$runtime~", $runtime 3499 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2704 and return; 3500 and return;
2705 3501
2706 warn "runtime file written.\n"; 3502 warn "runtime file written.\n";
2707 3503
2708 1 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 if ($value < 1024) {
3524 warn "cowardly refusing to write low uuid value ($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 };
2709} 3555}
2710 3556
2711sub emergency_save() { 3557sub emergency_save() {
2712 my $freeze_guard = cf::freeze_mainloop; 3558 my $freeze_guard = cf::freeze_mainloop;
2713 3559
… …
2719 # and maps saved/destroyed asynchronously. 3565 # and maps saved/destroyed asynchronously.
2720 warn "begin emergency player save\n"; 3566 warn "begin emergency player save\n";
2721 for my $login (keys %cf::PLAYER) { 3567 for my $login (keys %cf::PLAYER) {
2722 my $pl = $cf::PLAYER{$login} or next; 3568 my $pl = $cf::PLAYER{$login} or next;
2723 $pl->valid or next; 3569 $pl->valid or next;
3570 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2724 $pl->save; 3571 $pl->save;
2725 } 3572 }
2726 warn "end emergency player save\n"; 3573 warn "end emergency player save\n";
2727 3574
2728 warn "begin emergency map save\n"; 3575 warn "begin emergency map save\n";
… …
2734 warn "end emergency map save\n"; 3581 warn "end emergency map save\n";
2735 3582
2736 warn "begin emergency database checkpoint\n"; 3583 warn "begin emergency database checkpoint\n";
2737 BDB::db_env_txn_checkpoint $DB_ENV; 3584 BDB::db_env_txn_checkpoint $DB_ENV;
2738 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";
2739 }; 3590 };
2740 3591
2741 warn "leave emergency perl save\n"; 3592 warn "leave emergency perl save\n";
2742} 3593}
2743 3594
2744sub post_cleanup { 3595sub post_cleanup {
2745 my ($make_core) = @_; 3596 my ($make_core) = @_;
2746 3597
2747 warn Carp::longmess "post_cleanup backtrace" 3598 warn Carp::longmess "post_cleanup backtrace"
2748 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#
2749} 3629}
2750 3630
2751sub do_reload_perl() { 3631sub do_reload_perl() {
2752 # can/must only be called in main 3632 # can/must only be called in main
2753 if ($Coro::current != $Coro::main) { 3633 if ($Coro::current != $Coro::main) {
2754 warn "can only reload from main coroutine"; 3634 warn "can only reload from main coroutine";
2755 return; 3635 return;
2756 } 3636 }
2757 3637
3638 return if $RELOAD++;
3639
3640 while ($RELOAD) {
2758 warn "reloading..."; 3641 warn "reloading...";
2759 3642
2760 warn "entering sync_job"; 3643 warn "entering sync_job";
2761 3644
2762 cf::sync_job { 3645 cf::sync_job {
2763 cf::write_runtime; # external watchdog should not bark 3646 cf::write_runtime_sync; # external watchdog should not bark
2764 cf::emergency_save; 3647 cf::emergency_save;
2765 cf::write_runtime; # external watchdog should not bark 3648 cf::write_runtime_sync; # external watchdog should not bark
2766 3649
2767 warn "syncing database to disk"; 3650 warn "syncing database to disk";
2768 BDB::db_env_txn_checkpoint $DB_ENV; 3651 BDB::db_env_txn_checkpoint $DB_ENV;
2769 3652
2770 # 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
2771 3654
2772 warn "cancelling all WF_AUTOCANCEL watchers";
2773 for (Event::all_watchers) {
2774 $_->cancel if $_->data & WF_AUTOCANCEL;
2775 }
2776
2777 warn "flushing outstanding aio requests"; 3655 warn "flushing outstanding aio requests";
2778 for (;;) {
2779 BDB::flush;
2780 IO::AIO::flush;
2781 Coro::cede;
2782 last unless IO::AIO::nreqs || BDB::nreqs; 3656 while (IO::AIO::nreqs || BDB::nreqs) {
2783 warn "iterate..."; 3657 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2784 }
2785
2786 ++$RELOAD;
2787
2788 warn "cancelling all extension coros";
2789 $_->cancel for values %EXT_CORO;
2790 %EXT_CORO = ();
2791
2792 warn "removing commands";
2793 %COMMAND = ();
2794
2795 warn "removing ext commands";
2796 %EXTCMD = ();
2797
2798 warn "unloading/nuking all extensions";
2799 for my $pkg (@EXTS) {
2800 warn "... unloading $pkg";
2801
2802 if (my $cb = $pkg->can ("unload")) {
2803 eval {
2804 $cb->($pkg);
2805 1
2806 } or warn "$pkg unloaded, but with errors: $@";
2807 } 3658 }
2808 3659
2809 warn "... nuking $pkg"; 3660 warn "cancelling all extension coros";
2810 Symbol::delete_package $pkg; 3661 $_->cancel for values %EXT_CORO;
2811 } 3662 %EXT_CORO = ();
2812 3663
2813 warn "unloading all perl modules loaded from $LIBDIR"; 3664 warn "removing commands";
2814 while (my ($k, $v) = each %INC) { 3665 %COMMAND = ();
2815 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2816 3666
3667 warn "removing ext/exti commands";
3668 %EXTCMD = ();
3669 %EXTICMD = ();
3670
3671 warn "unloading/nuking all extensions";
3672 for my $pkg (@EXTS) {
2817 warn "... unloading $k"; 3673 warn "... unloading $pkg";
2818 delete $INC{$k};
2819 3674
2820 $k =~ s/\.pm$//;
2821 $k =~ s/\//::/g;
2822
2823 if (my $cb = $k->can ("unload_module")) { 3675 if (my $cb = $pkg->can ("unload")) {
3676 eval {
2824 $cb->(); 3677 $cb->($pkg);
3678 1
3679 } or warn "$pkg unloaded, but with errors: $@";
3680 }
3681
3682 warn "... clearing $pkg";
3683 clear_package $pkg;
2825 } 3684 }
2826 3685
2827 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;
2828 } 3701 }
2829 3702
2830 warn "getting rid of safe::, as good as possible"; 3703 warn "getting rid of safe::, as good as possible";
2831 Symbol::delete_package "safe::$_" 3704 clear_package "safe::$_"
2832 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);
2833 3706
2834 warn "unloading cf.pm \"a bit\""; 3707 warn "unloading cf.pm \"a bit\"";
2835 delete $INC{"cf.pm"}; 3708 delete $INC{"cf.pm"};
2836 delete $INC{"cf/pod.pm"}; 3709 delete $INC{"cf/pod.pm"};
2837 3710
2838 # don't, removes xs symbols, too, 3711 # don't, removes xs symbols, too,
2839 # and global variables created in xs 3712 # and global variables created in xs
2840 #Symbol::delete_package __PACKAGE__; 3713 #clear_package __PACKAGE__;
2841 3714
2842 warn "unload completed, starting to reload now"; 3715 warn "unload completed, starting to reload now";
2843 3716
2844 warn "reloading cf.pm"; 3717 warn "reloading cf.pm";
2845 require cf; 3718 require cf;
2846 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3719 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2847 3720
2848 warn "loading config and database again"; 3721 warn "loading config and database again";
2849 cf::cfg_load; 3722 cf::reload_config;
2850 3723
2851 warn "loading extensions"; 3724 warn "loading extensions";
2852 cf::load_extensions; 3725 cf::load_extensions;
2853 3726
2854 warn "reattaching attachments to objects/players"; 3727 warn "reattaching attachments to objects/players";
2855 _global_reattach; # objects, sockets 3728 _global_reattach; # objects, sockets
2856 warn "reattaching attachments to maps"; 3729 warn "reattaching attachments to maps";
2857 reattach $_ for values %MAP; 3730 reattach $_ for values %MAP;
2858 warn "reattaching attachments to players"; 3731 warn "reattaching attachments to players";
2859 reattach $_ for values %PLAYER; 3732 reattach $_ for values %PLAYER;
2860 3733
3734 warn "running post_load";
3735 (pop @POST_INIT)->(1) while @POST_INIT;
3736
2861 warn "leaving sync_job"; 3737 warn "leaving sync_job";
2862 3738
2863 1 3739 1
2864 } or do { 3740 } or do {
2865 warn $@; 3741 warn $@;
2866 warn "error while reloading, exiting."; 3742 cf::cleanup "error while reloading, exiting.";
2867 exit 1;
2868 }; 3743 };
2869 3744
2870 warn "reloaded"; 3745 warn "reloaded";
3746 --$RELOAD;
3747 }
2871}; 3748};
2872 3749
2873our $RELOAD_WATCHER; # used only during reload 3750our $RELOAD_WATCHER; # used only during reload
2874 3751
2875sub reload_perl() { 3752sub reload_perl() {
2876 # doing reload synchronously and two reloads happen back-to-back, 3753 # doing reload synchronously and two reloads happen back-to-back,
2877 # coro crashes during coro_state_free->destroy here. 3754 # coro crashes during coro_state_free->destroy here.
2878 3755
2879 $RELOAD_WATCHER ||= Event->timer ( 3756 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
2880 reentrant => 0,
2881 after => 0,
2882 data => WF_AUTOCANCEL,
2883 cb => sub {
2884 do_reload_perl; 3757 do_reload_perl;
2885 undef $RELOAD_WATCHER; 3758 undef $RELOAD_WATCHER;
2886 },
2887 ); 3759 };
2888} 3760}
2889 3761
2890register_command "reload" => sub { 3762register_command "reload" => sub {
2891 my ($who, $arg) = @_; 3763 my ($who, $arg) = @_;
2892 3764
2893 if ($who->flag (FLAG_WIZ)) { 3765 if ($who->flag (FLAG_WIZ)) {
2894 $who->message ("reloading server."); 3766 $who->message ("reloading server.");
3767 async {
3768 $Coro::current->{desc} = "perl_reload";
2895 async { reload_perl }; 3769 reload_perl;
3770 };
2896 } 3771 }
2897}; 3772};
2898 3773
2899unshift @INC, $LIBDIR; 3774unshift @INC, $LIBDIR;
2900 3775
… …
2902 3777
2903our @WAIT_FOR_TICK; 3778our @WAIT_FOR_TICK;
2904our @WAIT_FOR_TICK_BEGIN; 3779our @WAIT_FOR_TICK_BEGIN;
2905 3780
2906sub wait_for_tick { 3781sub wait_for_tick {
2907 return unless $TICK_WATCHER->is_active;
2908 return if $Coro::current == $Coro::main; 3782 return if tick_inhibit || $Coro::current == $Coro::main;
2909 3783
2910 my $signal = new Coro::Signal; 3784 my $signal = new Coro::Signal;
2911 push @WAIT_FOR_TICK, $signal; 3785 push @WAIT_FOR_TICK, $signal;
2912 $signal->wait; 3786 $signal->wait;
2913} 3787}
2914 3788
2915sub wait_for_tick_begin { 3789sub wait_for_tick_begin {
2916 return unless $TICK_WATCHER->is_active;
2917 return if $Coro::current == $Coro::main; 3790 return if tick_inhibit || $Coro::current == $Coro::main;
2918 3791
2919 my $signal = new Coro::Signal; 3792 my $signal = new Coro::Signal;
2920 push @WAIT_FOR_TICK_BEGIN, $signal; 3793 push @WAIT_FOR_TICK_BEGIN, $signal;
2921 $signal->wait; 3794 $signal->wait;
2922} 3795}
2923 3796
2924 my $min = 1e6;#d# 3797sub tick {
2925 my $avg = 10;
2926$TICK_WATCHER = Event->timer (
2927 reentrant => 0,
2928 parked => 1,
2929 prio => 0,
2930 at => $NEXT_TICK || $TICK,
2931 data => WF_AUTOCANCEL,
2932 cb => sub {
2933 if ($Coro::current != $Coro::main) { 3798 if ($Coro::current != $Coro::main) {
2934 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"
2935 unless ++$bug_warning > 10; 3800 unless ++$bug_warning > 10;
2936 return; 3801 return;
2937 } 3802 }
2938 3803
2939 $NOW = $tick_start = Event::time;
2940
2941 cf::server_tick; # one server iteration 3804 cf::server_tick; # one server iteration
2942 3805
2943 0 && sync_job {#d# 3806 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2944 for(1..10) { 3807 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
2945 my $t = Event::time; 3808 Coro::async_pool {
2946 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3809 $Coro::current->{desc} = "runtime saver";
2947 or die; 3810 write_runtime_sync
2948 3811 or warn "ERROR: unable to write runtime file: $!";
2949 $map->width (50);
2950 $map->height (50);
2951 $map->alloc;
2952 $map->_load_objects ("/tmp/x.map", 1);
2953 my $t = Event::time - $t;
2954
2955 #next unless $t < 0.0013;#d#
2956 if ($t < $min) {
2957 $min = $t;
2958 }
2959 $avg = $avg * 0.99 + $t * 0.01;
2960 }
2961 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
2962 exit 0;
2963 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
2964 }; 3812 };
3813 }
2965 3814
2966 $RUNTIME += $TICK;
2967 $NEXT_TICK += $TICK;
2968
2969 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2970 $NEXT_RUNTIME_WRITE = $NOW + 10;
2971 Coro::async_pool {
2972 write_runtime
2973 or warn "ERROR: unable to write runtime file: $!";
2974 };
2975 }
2976
2977# my $AFTER = Event::time;
2978# warn $AFTER - $NOW;#d#
2979
2980 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3815 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2981 $sig->send; 3816 $sig->send;
2982 } 3817 }
2983 while (my $sig = shift @WAIT_FOR_TICK) { 3818 while (my $sig = shift @WAIT_FOR_TICK) {
2984 $sig->send; 3819 $sig->send;
2985 } 3820 }
2986 3821
2987 $NOW = Event::time; 3822 $LOAD = ($NOW - $TICK_START) / $TICK;
2988
2989 # if we are delayed by four ticks or more, skip them all
2990 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2991
2992 $TICK_WATCHER->at ($NEXT_TICK);
2993 $TICK_WATCHER->start;
2994
2995 $LOAD = ($NOW - $tick_start) / $TICK;
2996 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3823 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
2997 3824
2998 _post_tick; 3825 if (0) {
2999 3826 if ($NEXT_TICK) {
3000 3827 my $jitter = $TICK_START - $NEXT_TICK;
3828 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3829 warn "jitter $JITTER\n";#d#
3830 }
3001 }, 3831 }
3002); 3832}
3003 3833
3004{ 3834{
3005 BDB::max_poll_time $TICK * 0.1; 3835 # configure BDB
3006 $BDB_POLL_WATCHER = Event->io ( 3836
3007 reentrant => 0,
3008 fd => BDB::poll_fileno,
3009 poll => 'r',
3010 prio => 0,
3011 data => WF_AUTOCANCEL,
3012 cb => \&BDB::poll_cb,
3013 );
3014 BDB::min_parallel 8; 3837 BDB::min_parallel 8;
3015 3838 BDB::max_poll_reqs $TICK * 0.1;
3016 BDB::set_sync_prepare { 3839 $AnyEvent::BDB::WATCHER->priority (1);
3017 my $status;
3018 my $current = $Coro::current;
3019 (
3020 sub {
3021 $status = $!;
3022 $current->ready; undef $current;
3023 },
3024 sub {
3025 Coro::schedule while defined $current;
3026 $! = $status;
3027 },
3028 )
3029 };
3030 3840
3031 unless ($DB_ENV) { 3841 unless ($DB_ENV) {
3032 $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);
3033 3848
3034 cf::sync_job { 3849 cf::sync_job {
3035 eval { 3850 eval {
3036 BDB::db_env_open 3851 BDB::db_env_open
3037 $DB_ENV, 3852 $DB_ENV,
… …
3039 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
3040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3855 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3041 0666; 3856 0666;
3042 3857
3043 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3858 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3044
3045 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3046 $DB_ENV->set_lk_detect;
3047 }; 3859 };
3048 3860
3049 cf::cleanup "db_env_open(db): $@" if $@; 3861 cf::cleanup "db_env_open(db): $@" if $@;
3050 }; 3862 };
3051 } 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 };
3052} 3874}
3053 3875
3054{ 3876{
3877 # configure IO::AIO
3878
3055 IO::AIO::min_parallel 8; 3879 IO::AIO::min_parallel 8;
3056
3057 undef $Coro::AIO::WATCHER;
3058 IO::AIO::max_poll_time $TICK * 0.1; 3880 IO::AIO::max_poll_time $TICK * 0.1;
3059 $AIO_POLL_WATCHER = Event->io ( 3881 undef $AnyEvent::AIO::WATCHER;
3060 reentrant => 0,
3061 data => WF_AUTOCANCEL,
3062 fd => IO::AIO::poll_fileno,
3063 poll => 'r',
3064 prio => 6,
3065 cb => \&IO::AIO::poll_cb,
3066 );
3067} 3882}
3068 3883
3069my $_log_backtrace; 3884my $_log_backtrace;
3070 3885
3071sub _log_backtrace { 3886sub _log_backtrace {
… …
3074 $msg =~ s/\n//; 3889 $msg =~ s/\n//;
3075 3890
3076 # limit the # of concurrent backtraces 3891 # limit the # of concurrent backtraces
3077 if ($_log_backtrace < 2) { 3892 if ($_log_backtrace < 2) {
3078 ++$_log_backtrace; 3893 ++$_log_backtrace;
3894 my $perl_bt = Carp::longmess $msg;
3079 async { 3895 async {
3896 $Coro::current->{desc} = "abt $msg";
3897
3080 my @bt = fork_call { 3898 my @bt = fork_call {
3081 @addr = map { sprintf "%x", $_ } @addr; 3899 @addr = map { sprintf "%x", $_ } @addr;
3082 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3900 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3083 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 |"
3084 or die "addr2line: $!"; 3902 or die "addr2line: $!";
… …
3092 } 3910 }
3093 3911
3094 @funcs 3912 @funcs
3095 }; 3913 };
3096 3914
3097 LOG llevInfo, "[ABT] $msg\n"; 3915 LOG llevInfo, "[ABT] $perl_bt\n";
3916 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3098 LOG llevInfo, "[ABT] $_\n" for @bt; 3917 LOG llevInfo, "[ABT] $_\n" for @bt;
3099 --$_log_backtrace; 3918 --$_log_backtrace;
3100 }; 3919 };
3101 } else { 3920 } else {
3102 LOG llevInfo, "[ABT] $msg\n"; 3921 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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