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

Diff Legend

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