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.295 by root, Wed Jul 4 05:08:15 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
25use JSON::XS 1.4 (); 51use JSON::XS 2.01 ();
26use BDB (); 52use BDB ();
27use Data::Dumper; 53use Data::Dumper;
28use Digest::MD5; 54use Digest::MD5;
29use Fcntl; 55use Fcntl;
30use YAML::Syck (); 56use YAML ();
31use IO::AIO 2.32 (); 57use IO::AIO ();
32use Time::HiRes; 58use Time::HiRes;
33use Compress::LZF; 59use Compress::LZF;
60use Digest::MD5 ();
61
62AnyEvent::detect;
34 63
35# configure various modules to our taste 64# configure various modules to our taste
36# 65#
37$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
38Coro::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";
39Compress::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
40
41$Event::Eval = 1; # no idea why this is required, but it is
42
43# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
44$YAML::Syck::ImplicitUnicode = 1;
45
46$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
47 74
48sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 75sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
49 76
50our %COMMAND = (); 77our %COMMAND = ();
51our %COMMAND_TIME = (); 78our %COMMAND_TIME = ();
54our %EXTCMD = (); 81our %EXTCMD = ();
55our %EXTICMD = (); 82our %EXTICMD = ();
56our %EXT_CORO = (); # coroutines bound to extensions 83our %EXT_CORO = (); # coroutines bound to extensions
57our %EXT_MAP = (); # pluggable maps 84our %EXT_MAP = (); # pluggable maps
58 85
59our $RELOAD; # number of reloads so far 86our $RELOAD; # number of reloads so far, non-zero while in reload
60our @EVENT; 87our @EVENT;
61 88
62our $CONFDIR = confdir; 89our $CONFDIR = confdir;
63our $DATADIR = datadir; 90our $DATADIR = datadir;
64our $LIBDIR = "$DATADIR/ext"; 91our $LIBDIR = "$DATADIR/ext";
65our $PODDIR = "$DATADIR/pod"; 92our $PODDIR = "$DATADIR/pod";
66our $MAPDIR = "$DATADIR/" . mapdir; 93our $MAPDIR = "$DATADIR/" . mapdir;
67our $LOCALDIR = localdir; 94our $LOCALDIR = localdir;
68our $TMPDIR = "$LOCALDIR/" . tmpdir; 95our $TMPDIR = "$LOCALDIR/" . tmpdir;
69our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 96our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
70our $PLAYERDIR = "$LOCALDIR/" . playerdir; 97our $PLAYERDIR = "$LOCALDIR/" . playerdir;
71our $RANDOMDIR = "$LOCALDIR/random"; 98our $RANDOMDIR = "$LOCALDIR/random";
72our $BDBDIR = "$LOCALDIR/db"; 99our $BDBDIR = "$LOCALDIR/db";
100our $PIDFILE = "$LOCALDIR/pid";
101our $RUNTIMEFILE = "$LOCALDIR/runtime";
102
103our %RESOURCE;
73 104
74our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 105our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
75our $TICK_WATCHER;
76our $AIO_POLL_WATCHER;
77our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 106our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
78our $NEXT_TICK; 107our $NEXT_TICK;
79our $NOW;
80our $USE_FSYNC = 1; # use fsync to write maps - default off 108our $USE_FSYNC = 1; # use fsync to write maps - default off
81 109
110our $BDB_DEADLOCK_WATCHER;
111our $BDB_CHECKPOINT_WATCHER;
82our $BDB_POLL_WATCHER; 112our $BDB_TRICKLE_WATCHER;
83our $DB_ENV; 113our $DB_ENV;
84 114
85our %CFG; 115our %CFG;
86 116
87our $UPTIME; $UPTIME ||= time; 117our $UPTIME; $UPTIME ||= time;
88our $RUNTIME; 118our $RUNTIME;
119our $NOW;
89 120
90our %PLAYER; # all users 121our (%PLAYER, %PLAYER_LOADING); # all users
91our %MAP; # all maps 122our (%MAP, %MAP_LOADING ); # all maps
92our $LINK_MAP; # the special {link} map, which is always available 123our $LINK_MAP; # the special {link} map, which is always available
93 124
94# 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 ∕
95our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 126our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
96 127
97our $LOAD; # a number between 0 (idle) and 1 (too many objects) 128our $LOAD; # a number between 0 (idle) and 1 (too many objects)
98our $LOADAVG; # same thing, but with alpha-smoothing 129our $LOADAVG; # same thing, but with alpha-smoothing
130our $JITTER; # average jitter
99our $tick_start; # for load detecting purposes 131our $TICK_START; # for load detecting purposes
132
133our @POST_INIT;
100 134
101binmode STDOUT; 135binmode STDOUT;
102binmode STDERR; 136binmode STDERR;
103 137
104# read virtual server time, if available 138# read virtual server time, if available
105unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 139unless ($RUNTIME || !-e $RUNTIMEFILE) {
106 open my $fh, "<", "$LOCALDIR/runtime" 140 open my $fh, "<", $RUNTIMEFILE
107 or die "unable to read runtime file: $!"; 141 or die "unable to read $RUNTIMEFILE file: $!";
108 $RUNTIME = <$fh> + 0.; 142 $RUNTIME = <$fh> + 0.;
109} 143}
110 144
111mkdir $_ 145mkdir $_
112 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 146 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
157 191
158The raw value load value from the last tick. 192The raw value load value from the last tick.
159 193
160=item %cf::CFG 194=item %cf::CFG
161 195
162Configuration for the server, loaded from C</etc/crossfire/config>, or 196Configuration for the server, loaded from C</etc/deliantra-server/config>, or
163from wherever your confdir points to. 197from wherever your confdir points to.
164 198
165=item cf::wait_for_tick, cf::wait_for_tick_begin 199=item cf::wait_for_tick, cf::wait_for_tick_begin
166 200
167These 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
168returns 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
169per 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.
170 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
171=back 211=back
172 212
173=cut 213=cut
174 214
175BEGIN { 215BEGIN {
179 $msg .= "\n" 219 $msg .= "\n"
180 unless $msg =~ /\n$/; 220 unless $msg =~ /\n$/;
181 221
182 $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;
183 223
184 utf8::encode $msg;
185 LOG llevError, $msg; 224 LOG llevError, $msg;
186 }; 225 };
187} 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#?
188 242
189@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 243@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
190@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 244@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
191@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 245@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
192@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 246@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
199for my $pkg (qw( 253for my $pkg (qw(
200 cf::global cf::attachable 254 cf::global cf::attachable
201 cf::object cf::object::player 255 cf::object cf::object::player
202 cf::client cf::player 256 cf::client cf::player
203 cf::arch cf::living 257 cf::arch cf::living
258 cf::map cf::mapspace
204 cf::map cf::party cf::region 259 cf::party cf::region
205)) { 260)) {
206 no strict 'refs';
207 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 261 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
208} 262}
209 263
210$Event::DIED = sub { 264$EV::DIED = sub {
211 warn "error in event callback: @_"; 265 warn "error in event callback: @_";
212}; 266};
213 267
214############################################################################# 268#############################################################################
215 269
238 $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;
239 $d 293 $d
240 } || "[unable to dump $_[0]: '$@']"; 294 } || "[unable to dump $_[0]: '$@']";
241} 295}
242 296
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.
250 304
251=cut 305=cut
252 306
253our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 307our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
254 308
255sub to_json ($) { $json_coder->encode ($_[0]) } 309sub encode_json($) { $json_coder->encode ($_[0]) }
256sub from_json ($) { $json_coder->decode ($_[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}
257 325
258=item cf::lock_wait $string 326=item cf::lock_wait $string
259 327
260Wait until the given lock is available. See cf::lock_acquire. 328Wait until the given lock is available. See cf::lock_acquire.
261 329
264Wait 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
265a 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,
266for example when the coroutine gets canceled), the lock is automatically 334for example when the coroutine gets canceled), the lock is automatically
267returned. 335returned.
268 336
337Locks are *not* recursive, locking from the same coro twice results in a
338deadlocked coro.
339
269Lock 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
270uses map_find and cf::map::load uses map_load). 341uses map_find and cf::map::load uses map_load).
271 342
272=item $locked = cf::lock_active $string 343=item $locked = cf::lock_active $string
273 344
274Return 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.
275 346
276=cut 347=cut
277 348
278our %LOCK; 349our %LOCK;
350our %LOCKER;#d#
279 351
280sub lock_wait($) { 352sub lock_wait($) {
281 my ($key) = @_; 353 my ($key) = @_;
282 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
283 # wait for lock, if any 360 # wait for lock, if any
284 while ($LOCK{$key}) { 361 while ($LOCK{$key}) {
362 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
285 push @{ $LOCK{$key} }, $Coro::current; 363 push @{ $LOCK{$key} }, $Coro::current;
286 Coro::schedule; 364 Coro::schedule;
287 } 365 }
288} 366}
289 367
292 370
293 # wait, to be sure we are not locked 371 # wait, to be sure we are not locked
294 lock_wait $key; 372 lock_wait $key;
295 373
296 $LOCK{$key} = []; 374 $LOCK{$key} = [];
375 $LOCKER{$key} = $Coro::current;#d#
297 376
298 Coro::guard { 377 Coro::guard {
378 delete $LOCKER{$key};#d#
299 # wake up all waiters, to be on the safe side 379 # wake up all waiters, to be on the safe side
300 $_->ready for @{ delete $LOCK{$key} }; 380 $_->ready for @{ delete $LOCK{$key} };
301 } 381 }
302} 382}
303 383
306 386
307 ! ! $LOCK{$key} 387 ! ! $LOCK{$key}
308} 388}
309 389
310sub freeze_mainloop { 390sub freeze_mainloop {
311 return unless $TICK_WATCHER->is_active; 391 tick_inhibit_inc;
312 392
313 my $guard = Coro::guard { 393 Coro::guard \&tick_inhibit_dec;
314 $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 }
315 }; 454 }
316 $TICK_WATCHER->stop; 455};
317 $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;
318} 469}
319 470
320=item cf::async { BLOCK } 471=item cf::async { BLOCK }
321 472
322Currently the same as Coro::async_pool, meaning you cannot use 473Currently the same as Coro::async_pool, meaning you cannot use
327 478
328BEGIN { *async = \&Coro::async_pool } 479BEGIN { *async = \&Coro::async_pool }
329 480
330=item cf::sync_job { BLOCK } 481=item cf::sync_job { BLOCK }
331 482
332The design of Crossfire TRT requires that the main coroutine ($Coro::main) 483The design of Deliantra requires that the main coroutine ($Coro::main)
333is always able to handle events or runnable, as Crossfire TRT is only 484is always able to handle events or runnable, as Deliantra is only
334partly 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
335acceptable. 486acceptable.
336 487
337If 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
338the given BLOCK in another coroutine while waiting for the result. The 489the given BLOCK in another coroutine while waiting for the result. The
343 494
344sub sync_job(&) { 495sub sync_job(&) {
345 my ($job) = @_; 496 my ($job) = @_;
346 497
347 if ($Coro::current == $Coro::main) { 498 if ($Coro::current == $Coro::main) {
348 my $time = Event::time; 499 my $time = EV::time;
349 500
350 # this is the main coro, too bad, we have to block 501 # this is the main coro, too bad, we have to block
351 # till the operation succeeds, freezing the server :/ 502 # till the operation succeeds, freezing the server :/
352 503
353 # TODO: use suspend/resume instead 504 LOG llevError, Carp::longmess "sync job";#d#
354 # (but this is cancel-safe) 505
355 my $freeze_guard = freeze_mainloop; 506 my $freeze_guard = freeze_mainloop;
356 507
357 my $busy = 1; 508 my $busy = 1;
358 my @res; 509 my @res;
359 510
360 (async { 511 (async {
512 $Coro::current->desc ("sync job coro");
361 @res = eval { $job->() }; 513 @res = eval { $job->() };
362 warn $@ if $@; 514 warn $@ if $@;
363 undef $busy; 515 undef $busy;
364 })->prio (Coro::PRIO_MAX); 516 })->prio (Coro::PRIO_MAX);
365 517
366 while ($busy) { 518 while ($busy) {
367 Coro::cede or Event::one_event; 519 if (Coro::nready) {
520 Coro::cede_notself;
521 } else {
522 EV::loop EV::LOOP_ONESHOT;
368 } 523 }
524 }
369 525
370 $time = Event::time - $time; 526 my $time = EV::time - $time;
371 527
372 LOG llevError | logBacktrace, Carp::longmess "long sync job"
373 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
374
375 $tick_start += $time; # do not account sync jobs to server load 528 $TICK_START += $time; # do not account sync jobs to server load
376 529
377 wantarray ? @res : $res[0] 530 wantarray ? @res : $res[0]
378 } else { 531 } else {
379 # we are in another coroutine, how wonderful, everything just works 532 # we are in another coroutine, how wonderful, everything just works
380 533
405=item fork_call { }, $args 558=item fork_call { }, $args
406 559
407Executes the given code block with the given arguments in a seperate 560Executes the given code block with the given arguments in a seperate
408process, returning the results. Everything must be serialisable with 561process, returning the results. Everything must be serialisable with
409Coro::Storable. May, of course, block. Note that the executed sub may 562Coro::Storable. May, of course, block. Note that the executed sub may
410never block itself or use any form of Event handling. 563never block itself or use any form of event handling.
411 564
412=cut 565=cut
413 566
414sub fork_call(&@) { 567sub fork_call(&@) {
415 my ($cb, @args) = @_; 568 my ($cb, @args) = @_;
416 569
417# 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,
418# or die "socketpair: $!"; 571 # otherwise perl prematurely frees the stuff :/
419 pipe my $fh1, my $fh2 572 # TODO: investigate and fix (likely this will be rather laborious)
420 or die "pipe: $!";
421 573
422 if (my $pid = fork) { 574 my @res = Coro::Util::fork_eval {
423 close $fh2;
424
425 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
426 $res = Coro::Storable::thaw $res;
427
428 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
429
430 die $$res unless "ARRAY" eq ref $res;
431
432 return wantarray ? @$res : $res->[-1];
433 } else {
434 reset_signals; 575 reset_signals;
435 local $SIG{__WARN__}; 576 &$cb
436 local $SIG{__DIE__}; 577 }, @args;
437 eval {
438 close $fh1;
439 578
440 my @res = eval { $cb->(@args) }; 579 wantarray ? @res : $res[-1]
441 syswrite $fh2, Coro::Storable::freeze +($@ ? \"$@" : \@res); 580}
442 };
443 581
444 warn $@ if $@; 582=item $coin = coin_from_name $name
445 _exit 0; 583
446 } 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
447} 607}
448 608
449=item $value = cf::db_get $family => $key 609=item $value = cf::db_get $family => $key
450 610
451Returns a single value from the environment database. 611Returns a single value from the environment database.
453=item cf::db_put $family => $key => $value 613=item cf::db_put $family => $key => $value
454 614
455Stores 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
456data 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).
457 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
458=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}
459 641
460our $DB; 642our $DB;
461 643
462sub db_init { 644sub db_init {
463 unless ($DB) {
464 $DB = BDB::db_create $DB_ENV;
465
466 cf::sync_job { 645 cf::sync_job {
467 eval { 646 $DB ||= db_table "db";
468 $DB->set_flags (BDB::CHKSUM);
469
470 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
471 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
472 cf::cleanup "db_open(db): $!" if $!;
473 };
474 cf::cleanup "db_open(db): $@" if $@;
475 };
476 } 647 };
477} 648}
478 649
479sub db_get($$) { 650sub db_get($$) {
480 my $key = "$_[0]/$_[1]"; 651 my $key = "$_[0]/$_[1]";
481 652
531 if (1) { 702 if (1) {
532 $md5 = 703 $md5 =
533 join "\x00", 704 join "\x00",
534 $processversion, 705 $processversion,
535 map { 706 map {
536 Coro::cede; 707 cf::cede_to_tick;
537 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 708 ($src->[$_], Digest::MD5::md5_hex $data[$_])
538 } 0.. $#$src; 709 } 0.. $#$src;
539 710
540 711
541 my $dbmd5 = db_get cache => "$id/md5"; 712 my $dbmd5 = db_get cache => "$id/md5";
579 750
580############################################################################# 751#############################################################################
581 752
582=head2 ATTACHABLE OBJECTS 753=head2 ATTACHABLE OBJECTS
583 754
584Many 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
585attach callbacks/event handlers (a collection of which is called an "attachment") 756attach callbacks/event handlers (a collection of which is called an "attachment")
586to it. All such attachable objects support the following methods. 757to it. All such attachable objects support the following methods.
587 758
588In 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>
589C<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
590Crossfire TRT). 761Deliantra).
591 762
592=over 4 763=over 4
593 764
594=item $attachable->attach ($attachment, key => $value...) 765=item $attachable->attach ($attachment, key => $value...)
595 766
639=item cf::CLASS::attachment $name, ... 810=item cf::CLASS::attachment $name, ...
640 811
641Register an attachment by C<$name> through which attachable objects of the 812Register an attachment by C<$name> through which attachable objects of the
642given CLASS can refer to this attachment. 813given CLASS can refer to this attachment.
643 814
644Some classes such as crossfire maps and objects can specify attachments 815Some classes such as deliantra maps and objects can specify attachments
645that 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.
646 817
647These calls expect any number of the following handler/hook descriptions: 818These calls expect any number of the following handler/hook descriptions:
648 819
649=over 4 820=over 4
847 "; 1018 ";
848 die if $@; 1019 die if $@;
849} 1020}
850 1021
851our $override; 1022our $override;
852our @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?
853 1024
854sub override { 1025sub override {
855 $override = 1; 1026 $override = 1;
856 @invoke_results = (); 1027 @INVOKE_RESULTS = (@_);
857} 1028}
858 1029
859sub do_invoke { 1030sub do_invoke {
860 my $event = shift; 1031 my $event = shift;
861 my $callbacks = shift; 1032 my $callbacks = shift;
862 1033
863 @invoke_results = (); 1034 @INVOKE_RESULTS = ();
864 1035
865 local $override; 1036 local $override;
866 1037
867 for (@$callbacks) { 1038 for (@$callbacks) {
868 eval { &{$_->[1]} }; 1039 eval { &{$_->[1]} };
877 } 1048 }
878 1049
879 0 1050 0
880} 1051}
881 1052
882=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1053=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
883 1054
884=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1055=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
885 1056
886Generate an object-specific event with the given arguments. 1057Generate an object-specific event with the given arguments.
887 1058
888This 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
889removed 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
890results (if you must, access C<@cf::invoke_results> directly). 1061results (if you must, access C<@cf::INVOKE_RESULTS> directly).
891 1062
892=back 1063=back
893 1064
894=cut 1065=cut
895 1066
896############################################################################# 1067#############################################################################
897# 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}
898 1111
899sub reattach { 1112sub reattach {
900 # basically do the same as instantiate, without calling instantiate 1113 # basically do the same as instantiate, without calling instantiate
901 my ($obj) = @_; 1114 my ($obj) = @_;
902 1115
1116 # no longer needed after getting rid of delete_package?
903 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
904 1118
905 my $registry = $obj->registry; 1119 my $registry = $obj->registry;
906 1120
907 @$registry = (); 1121 @$registry = ();
908 1122
923cf::attachable->attach ( 1137cf::attachable->attach (
924 prio => -1000000, 1138 prio => -1000000,
925 on_instantiate => sub { 1139 on_instantiate => sub {
926 my ($obj, $data) = @_; 1140 my ($obj, $data) = @_;
927 1141
928 $data = from_json $data; 1142 $data = decode_json $data;
929 1143
930 for (@$data) { 1144 for (@$data) {
931 my ($name, $args) = @$_; 1145 my ($name, $args) = @$_;
932 1146
933 $obj->attach ($name, %{$args || {} }); 1147 $obj->attach ($name, %{$args || {} });
949sub object_freezer_save { 1163sub object_freezer_save {
950 my ($filename, $rdata, $objs) = @_; 1164 my ($filename, $rdata, $objs) = @_;
951 1165
952 sync_job { 1166 sync_job {
953 if (length $$rdata) { 1167 if (length $$rdata) {
1168 utf8::decode (my $decname = $filename);
954 warn sprintf "saving %s (%d,%d)\n", 1169 warn sprintf "saving %s (%d,%d)\n",
955 $filename, length $$rdata, scalar @$objs; 1170 $decname, length $$rdata, scalar @$objs;
956 1171
957 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1172 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
958 chmod SAVE_MODE, $fh; 1173 aio_chmod $fh, SAVE_MODE;
959 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1174 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
960 aio_fsync $fh if $cf::USE_FSYNC; 1175 aio_fsync $fh if $cf::USE_FSYNC;
961 close $fh; 1176 aio_close $fh;
962 1177
963 if (@$objs) { 1178 if (@$objs) {
964 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) {
965 chmod SAVE_MODE, $fh; 1180 aio_chmod $fh, SAVE_MODE;
966 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1181 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
967 aio_write $fh, 0, (length $data), $data, 0; 1182 aio_write $fh, 0, (length $data), $data, 0;
968 aio_fsync $fh if $cf::USE_FSYNC; 1183 aio_fsync $fh if $cf::USE_FSYNC;
969 close $fh; 1184 aio_close $fh;
970 aio_rename "$filename.pst~", "$filename.pst"; 1185 aio_rename "$filename.pst~", "$filename.pst";
971 } 1186 }
972 } else { 1187 } else {
973 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
974 } 1189 }
975 1190
976 aio_rename "$filename~", $filename; 1191 aio_rename "$filename~", $filename;
1192
1193 $filename =~ s%/[^/]+$%%;
1194 aio_pathsync $filename;
977 } else { 1195 } else {
978 warn "FATAL: $filename~: $!\n"; 1196 warn "FATAL: $filename~: $!\n";
979 } 1197 }
980 } else { 1198 } else {
981 aio_unlink $filename; 1199 aio_unlink $filename;
982 aio_unlink "$filename.pst"; 1200 aio_unlink "$filename.pst";
983 } 1201 }
984 } 1202 };
985} 1203}
986 1204
987sub object_freezer_as_string { 1205sub object_freezer_as_string {
988 my ($rdata, $objs) = @_; 1206 my ($rdata, $objs) = @_;
989 1207
1001 or return; 1219 or return;
1002 1220
1003 unless (aio_stat "$filename.pst") { 1221 unless (aio_stat "$filename.pst") {
1004 (aio_load "$filename.pst", $av) >= 0 1222 (aio_load "$filename.pst", $av) >= 0
1005 or return; 1223 or return;
1224
1006 $av = eval { (Storable::thaw $av)->{objs} }; 1225 my $st = eval { Coro::Storable::thaw $av };
1226 $av = $st->{objs};
1007 } 1227 }
1008 1228
1229 utf8::decode (my $decname = $filename);
1009 warn sprintf "loading %s (%d)\n", 1230 warn sprintf "loading %s (%d,%d)\n",
1010 $filename, length $data, scalar @{$av || []}; 1231 $decname, length $data, scalar @{$av || []};
1232
1011 return ($data, $av); 1233 ($data, $av)
1012} 1234}
1013 1235
1014=head2 COMMAND CALLBACKS 1236=head2 COMMAND CALLBACKS
1015 1237
1016=over 4 1238=over 4
1089 my ($pl, $buf) = @_; 1311 my ($pl, $buf) = @_;
1090 1312
1091 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1313 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1092 1314
1093 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
1094 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1323 if (my $cb = $EXTCMD{$type}) {
1095 if (my %reply = $cb->($pl, $msg)) { 1324 @reply = $cb->($pl, @payload);
1096 $pl->ext_reply ($msg->{msgid}, %reply);
1097 }
1098 } 1325 }
1326
1327 $pl->ext_reply ($reply, @reply)
1328 if $reply;
1329
1099 } else { 1330 } else {
1100 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1331 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1101 } 1332 }
1102 1333
1103 cf::override; 1334 cf::override;
1130 1361
1131 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1362 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1132 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1363 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1133 1364
1134 $ext{source} = 1365 $ext{source} =
1135 "package $pkg; use strict; use utf8;\n" 1366 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1136 . "#line 1 \"$path\"\n{\n" 1367 . "#line 1 \"$path\"\n{\n"
1137 . $source 1368 . $source
1138 . "\n};\n1"; 1369 . "\n};\n1";
1139 1370
1140 $todo{$base} = \%ext; 1371 $todo{$base} = \%ext;
1156 my $msg = $@ ? "$v->{path}: $@\n" 1387 my $msg = $@ ? "$v->{path}: $@\n"
1157 : "$v->{base}: extension inactive.\n"; 1388 : "$v->{base}: extension inactive.\n";
1158 1389
1159 if (exists $v->{meta}{mandatory}) { 1390 if (exists $v->{meta}{mandatory}) {
1160 warn $msg; 1391 warn $msg;
1161 warn "mandatory extension failed to load, exiting.\n"; 1392 cf::cleanup "mandatory extension failed to load, exiting.";
1162 exit 1;
1163 } 1393 }
1164 1394
1165 warn $msg; 1395 warn $msg;
1166 } 1396 }
1167 1397
1181 1411
1182=back 1412=back
1183 1413
1184=head2 CORE EXTENSIONS 1414=head2 CORE EXTENSIONS
1185 1415
1186Functions and methods that extend core crossfire objects. 1416Functions and methods that extend core deliantra objects.
1187 1417
1188=cut 1418=cut
1189 1419
1190package cf::player; 1420package cf::player;
1191 1421
1192use Coro::AIO; 1422use Coro::AIO;
1193 1423
1194=head3 cf::player 1424=head3 cf::player
1195 1425
1196=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}
1197 1441
1198=item cf::player::find $login 1442=item cf::player::find $login
1199 1443
1200Returns the given player object, loading it if necessary (might block). 1444Returns the given player object, loading it if necessary (might block).
1201 1445
1220 1464
1221sub exists($) { 1465sub exists($) {
1222 my ($login) = @_; 1466 my ($login) = @_;
1223 1467
1224 $cf::PLAYER{$login} 1468 $cf::PLAYER{$login}
1225 or cf::sync_job { !aio_stat path $login } 1469 or !aio_stat path $login
1226} 1470}
1227 1471
1228sub find($) { 1472sub find($) {
1229 return $cf::PLAYER{$_[0]} || do { 1473 return $cf::PLAYER{$_[0]} || do {
1230 my $login = $_[0]; 1474 my $login = $_[0];
1237 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1481 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1238 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1482 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1239 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1483 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1240 aio_unlink +(playerdir $login) . "/$login.pl"; 1484 aio_unlink +(playerdir $login) . "/$login.pl";
1241 1485
1242 my $pl = load_pl path $login 1486 my $f = new_from_file cf::object::thawer path $login
1243 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;
1244 $cf::PLAYER{$login} = $pl 1494 $cf::PLAYER{$login} = $pl
1245 } 1495 }
1246 } 1496 }
1247} 1497}
1248 1498
1257 return if $pl->{deny_save}; 1507 return if $pl->{deny_save};
1258 1508
1259 aio_mkdir playerdir $pl, 0770; 1509 aio_mkdir playerdir $pl, 0770;
1260 $pl->{last_save} = $cf::RUNTIME; 1510 $pl->{last_save} = $cf::RUNTIME;
1261 1511
1512 cf::get_slot 0.01;
1513
1262 $pl->save_pl ($path); 1514 $pl->save_pl ($path);
1263 Coro::cede; 1515 cf::cede_to_tick;
1264} 1516}
1265 1517
1266sub new($) { 1518sub new($) {
1267 my ($login) = @_; 1519 my ($login) = @_;
1268 1520
1274 $cf::PLAYER{$login} = $self; 1526 $cf::PLAYER{$login} = $self;
1275 1527
1276 $self 1528 $self
1277} 1529}
1278 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
1279=item $pl->quit_character 1541=item $pl->quit_character
1280 1542
1281Nukes the player without looking back. If logged in, the connection will 1543Nukes the player without looking back. If logged in, the connection will
1282be destroyed. May block for a long time. 1544be destroyed. May block for a long time.
1283 1545
1287 my ($pl) = @_; 1549 my ($pl) = @_;
1288 1550
1289 my $name = $pl->ob->name; 1551 my $name = $pl->ob->name;
1290 1552
1291 $pl->{deny_save} = 1; 1553 $pl->{deny_save} = 1;
1292 $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
1293 1555
1294 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1556 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1295 $pl->deactivate; 1557 $pl->deactivate;
1558 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1559 $pl->ob->check_score;
1296 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1560 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1297 $pl->ns->destroy if $pl->ns; 1561 $pl->ns->destroy if $pl->ns;
1298 1562
1299 my $path = playerdir $pl; 1563 my $path = playerdir $pl;
1300 my $temp = "$path~$cf::RUNTIME~deleting~"; 1564 my $temp = "$path~$cf::RUNTIME~deleting~";
1336 or return []; 1600 or return [];
1337 1601
1338 my @logins; 1602 my @logins;
1339 1603
1340 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") {
1341 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1610 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1342 aio_read $fh, 0, 512, my $buf, 0 or next; 1611 aio_read $fh, 0, 512, my $buf, 0 or next;
1343 $buf !~ /^password -------------$/m or next; # official not-valid tag 1612 $buf !~ /^password -------------$/m or next; # official not-valid tag
1613 }
1344 1614
1345 utf8::decode $login; 1615 utf8::decode $login;
1346 push @logins, $login; 1616 push @logins, $login;
1347 } 1617 }
1348 1618
1375 } 1645 }
1376 1646
1377 \@paths 1647 \@paths
1378} 1648}
1379 1649
1380=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1650=item $protocol_xml = $player->expand_cfpod ($cfpod)
1381 1651
1382Expand crossfire pod fragments into protocol xml. 1652Expand deliantra pod fragments into protocol xml.
1383 1653
1384=cut
1385
1386sub expand_cfpod {
1387 ((my $self), (local $_)) = @_;
1388
1389 # escape & and <
1390 s/&/&amp;/g;
1391 s/(?<![BIUGH])</&lt;/g;
1392
1393 # this is buggy, it needs to properly take care of nested <'s
1394
1395 1 while
1396 # replace B<>, I<>, U<> etc.
1397 s/B<([^\>]*)>/<b>$1<\/b>/
1398 || s/I<([^\>]*)>/<i>$1<\/i>/
1399 || s/U<([^\>]*)>/<u>$1<\/u>/
1400 # replace G<male|female> tags
1401 || s{G<([^>|]*)\|([^>]*)>}{
1402 $self->gender ? $2 : $1
1403 }ge
1404 # replace H<hint text>
1405 || s{H<([^\>]*)>}
1406 {
1407 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1408 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1409 "")
1410 [$self->{hintmode}]
1411 }ge;
1412
1413 # create single paragraphs (very hackish)
1414 s/(?<=\S)\n(?=\w)/ /g;
1415
1416 # compress some whitespace
1417 s/\s+\n/\n/g; # ws line-ends
1418 s/\n\n+/\n/g; # double lines
1419 s/^\n+//; # beginning lines
1420 s/\n+$//; # ending lines
1421
1422 $_
1423}
1424
1425sub hintmode {
1426 $_[0]{hintmode} = $_[1] if @_ > 1;
1427 $_[0]{hintmode}
1428}
1429
1430=item $player->ext_reply ($msgid, %msg) 1654=item $player->ext_reply ($msgid, @msg)
1431 1655
1432Sends an ext reply to the player. 1656Sends an ext reply to the player.
1433 1657
1434=cut 1658=cut
1435 1659
1436sub ext_reply($$%) { 1660sub ext_reply($$@) {
1437 my ($self, $id, %msg) = @_; 1661 my ($self, $id, @msg) = @_;
1438 1662
1439 $msg{msgid} = $id; 1663 $self->ns->ext_reply ($id, @msg)
1440 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1441} 1664}
1442 1665
1443=item $player->ext_event ($type, %msg) 1666=item $player->ext_msg ($type, @msg)
1444 1667
1445Sends an ext event to the client. 1668Sends an ext event to the client.
1446 1669
1447=cut 1670=cut
1448 1671
1449sub ext_event($$%) { 1672sub ext_msg($$@) {
1450 my ($self, $type, %msg) = @_; 1673 my ($self, $type, @msg) = @_;
1451 1674
1452 $self->ns->ext_event ($type, %msg); 1675 $self->ns->ext_msg ($type, @msg);
1453} 1676}
1454 1677
1455=head3 cf::region 1678=head3 cf::region
1456 1679
1457=over 4 1680=over 4
1470 my ($path) = @_; 1693 my ($path) = @_;
1471 1694
1472 my ($match, $specificity); 1695 my ($match, $specificity);
1473 1696
1474 for my $region (list) { 1697 for my $region (list) {
1475 if ($region->match && $path =~ $region->match) { 1698 if ($region->{match} && $path =~ $region->{match}) {
1476 ($match, $specificity) = ($region, $region->specificity) 1699 ($match, $specificity) = ($region, $region->specificity)
1477 if $region->specificity > $specificity; 1700 if $region->specificity > $specificity;
1478 } 1701 }
1479 } 1702 }
1480 1703
1501our $MAX_RESET = 3600; 1724our $MAX_RESET = 3600;
1502our $DEFAULT_RESET = 3000; 1725our $DEFAULT_RESET = 3000;
1503 1726
1504sub generate_random_map { 1727sub generate_random_map {
1505 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
1506 # mit "rum" bekleckern, nicht 1732 # mit "rum" bekleckern, nicht
1507 $self->_create_random_map ( 1733 $self->_create_random_map (
1508 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1734 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1509 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1735 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1510 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1736 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1600 $self->init; # pass $1 etc. 1826 $self->init; # pass $1 etc.
1601 return $self; 1827 return $self;
1602 } 1828 }
1603 } 1829 }
1604 1830
1605 Carp::carp "unable to resolve path '$path' (base '$base')."; 1831 Carp::cluck "unable to resolve path '$path' (base '$base').";
1606 () 1832 ()
1607} 1833}
1608 1834
1609sub init { 1835sub init {
1610 my ($self) = @_; 1836 my ($self) = @_;
1632 1858
1633# the temporary/swap location 1859# the temporary/swap location
1634sub save_path { 1860sub save_path {
1635 my ($self) = @_; 1861 my ($self) = @_;
1636 1862
1637 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1638 "$TMPDIR/$path.map" 1864 "$TMPDIR/$path.map"
1639} 1865}
1640 1866
1641# the unique path, undef == no special unique path 1867# the unique path, undef == no special unique path
1642sub uniq_path { 1868sub uniq_path {
1643 my ($self) = @_; 1869 my ($self) = @_;
1644 1870
1645 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1871 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1646 "$UNIQUEDIR/$path" 1872 "$UNIQUEDIR/$path"
1647} 1873}
1648 1874
1649# and all this just because we cannot iterate over 1875# and all this just because we cannot iterate over
1650# all maps in C++... 1876# all maps in C++...
1673 1899
1674sub load_header_from($) { 1900sub load_header_from($) {
1675 my ($self, $path) = @_; 1901 my ($self, $path) = @_;
1676 1902
1677 utf8::encode $path; 1903 utf8::encode $path;
1678 #aio_open $path, O_RDONLY, 0 1904 my $f = new_from_file cf::object::thawer $path
1679 # or return;
1680
1681 $self->_load_header ($path)
1682 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;
1683 1912
1684 $self->{load_path} = $path; 1913 $self->{load_path} = $path;
1685 1914
1686 1 1915 1
1687} 1916}
1741sub find { 1970sub find {
1742 my ($path, $origin) = @_; 1971 my ($path, $origin) = @_;
1743 1972
1744 $path = normalise $path, $origin && $origin->path; 1973 $path = normalise $path, $origin && $origin->path;
1745 1974
1975 cf::lock_wait "map_data:$path";#d#remove
1746 cf::lock_wait "map_find:$path"; 1976 cf::lock_wait "map_find:$path";
1747 1977
1748 $cf::MAP{$path} || do { 1978 $cf::MAP{$path} || do {
1979 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1749 my $guard = cf::lock_acquire "map_find:$path"; 1980 my $guard2 = cf::lock_acquire "map_find:$path";
1981
1750 my $map = new_from_path cf::map $path 1982 my $map = new_from_path cf::map $path
1751 or return; 1983 or return;
1752 1984
1753 $map->{last_save} = $cf::RUNTIME; 1985 $map->{last_save} = $cf::RUNTIME;
1754 1986
1756 or return; 1988 or return;
1757 1989
1758 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1990 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1759 # doing this can freeze the server in a sync job, obviously 1991 # doing this can freeze the server in a sync job, obviously
1760 #$cf::WAIT_FOR_TICK->wait; 1992 #$cf::WAIT_FOR_TICK->wait;
1993 undef $guard2;
1994 undef $guard1;
1761 $map->reset; 1995 $map->reset;
1762 undef $guard;
1763 return find $path; 1996 return find $path;
1764 } 1997 }
1765 1998
1766 $cf::MAP{$path} = $map 1999 $cf::MAP{$path} = $map
1767 } 2000 }
1776 local $self->{deny_reset} = 1; # loading can take a long time 2009 local $self->{deny_reset} = 1; # loading can take a long time
1777 2010
1778 my $path = $self->{path}; 2011 my $path = $self->{path};
1779 2012
1780 { 2013 {
1781 my $guard = cf::lock_acquire "map_load:$path"; 2014 my $guard = cf::lock_acquire "map_data:$path";
1782 2015
2016 return unless $self->valid;
1783 return if $self->in_memory != cf::MAP_SWAPPED; 2017 return unless $self->in_memory == cf::MAP_SWAPPED;
1784 2018
1785 $self->in_memory (cf::MAP_LOADING); 2019 $self->in_memory (cf::MAP_LOADING);
1786 2020
1787 $self->alloc; 2021 $self->alloc;
1788 2022
1789 $self->pre_load; 2023 $self->pre_load;
1790 Coro::cede; 2024 cf::cede_to_tick;
1791 2025
2026 my $f = new_from_file cf::object::thawer $self->{load_path};
2027 $f->skip_block;
1792 $self->_load_objects ($self->{load_path}, 1) 2028 $self->_load_objects ($f)
1793 or return; 2029 or return;
1794 2030
1795 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2031 $self->post_load_original
1796 if delete $self->{load_original}; 2032 if delete $self->{load_original};
1797 2033
1798 if (my $uniq = $self->uniq_path) { 2034 if (my $uniq = $self->uniq_path) {
1799 utf8::encode $uniq; 2035 utf8::encode $uniq;
1800 if (aio_open $uniq, O_RDONLY, 0) { 2036 unless (aio_stat $uniq) {
2037 if (my $f = new_from_file cf::object::thawer $uniq) {
1801 $self->clear_unique_items; 2038 $self->clear_unique_items;
1802 $self->_load_objects ($uniq, 0); 2039 $self->_load_objects ($f);
2040 $f->resolve_delayed_derefs;
2041 }
1803 } 2042 }
1804 } 2043 }
1805 2044
1806 Coro::cede; 2045 $f->resolve_delayed_derefs;
2046
2047 cf::cede_to_tick;
1807 # now do the right thing for maps 2048 # now do the right thing for maps
1808 $self->link_multipart_objects; 2049 $self->link_multipart_objects;
1809 $self->difficulty ($self->estimate_difficulty) 2050 $self->difficulty ($self->estimate_difficulty)
1810 unless $self->difficulty; 2051 unless $self->difficulty;
1811 Coro::cede; 2052 cf::cede_to_tick;
1812 2053
1813 unless ($self->{deny_activate}) { 2054 unless ($self->{deny_activate}) {
1814 $self->decay_objects; 2055 $self->decay_objects;
1815 $self->fix_auto_apply; 2056 $self->fix_auto_apply;
1816 $self->update_buttons; 2057 $self->update_buttons;
1817 Coro::cede; 2058 cf::cede_to_tick;
1818 $self->set_darkness_map; 2059 $self->set_darkness_map;
1819 Coro::cede; 2060 cf::cede_to_tick;
1820 $self->activate; 2061 $self->activate;
1821 } 2062 }
1822 2063
2064 $self->{last_save} = $cf::RUNTIME;
2065 $self->last_access ($cf::RUNTIME);
2066
1823 $self->in_memory (cf::MAP_IN_MEMORY); 2067 $self->in_memory (cf::MAP_ACTIVE);
1824 } 2068 }
1825 2069
1826 $self->post_load; 2070 $self->post_load;
1827} 2071}
1828 2072
1837 2081
1838 $self 2082 $self
1839} 2083}
1840 2084
1841# 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
1842sub load_diag { 2086sub load_neighbours {
1843 my ($map) = @_; 2087 my ($map) = @_;
1844 2088
1845 my @diag; # diagonal neighbours 2089 my @neigh; # diagonal neighbours
1846 2090
1847 for (0 .. 3) { 2091 for (0 .. 3) {
1848 my $neigh = $map->tile_path ($_) 2092 my $neigh = $map->tile_path ($_)
1849 or next; 2093 or next;
1850 $neigh = find $neigh, $map 2094 $neigh = find $neigh, $map
1851 or next; 2095 or next;
1852 $neigh->load; 2096 $neigh->load;
1853 2097
2098 push @neigh,
1854 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2099 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1855 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2100 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1856 } 2101 }
1857 2102
1858 for (@diag) { 2103 for (grep defined $_->[0], @neigh) {
2104 my ($path, $origin) = @$_;
1859 my $neigh = find @$_ 2105 my $neigh = find $path, $origin
1860 or next; 2106 or next;
1861 $neigh->load; 2107 $neigh->load;
1862 } 2108 }
1863} 2109}
1864 2110
1869} 2115}
1870 2116
1871sub do_load_sync { 2117sub do_load_sync {
1872 my ($map) = @_; 2118 my ($map) = @_;
1873 2119
2120 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2121 if $Coro::current == $Coro::main;
2122
1874 cf::sync_job { $map->load }; 2123 cf::sync_job { $map->load };
1875} 2124}
1876 2125
1877our %MAP_PREFETCH; 2126our %MAP_PREFETCH;
1878our $MAP_PREFETCHER = undef; 2127our $MAP_PREFETCHER = undef;
1879 2128
1880sub find_async { 2129sub find_async {
1881 my ($path, $origin) = @_; 2130 my ($path, $origin, $load) = @_;
1882 2131
1883 $path = normalise $path, $origin && $origin->{path}; 2132 $path = normalise $path, $origin && $origin->{path};
1884 2133
1885 if (my $map = $cf::MAP{$path}) { 2134 if (my $map = $cf::MAP{$path}) {
1886 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2135 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1887 } 2136 }
1888 2137
1889 undef $MAP_PREFETCH{$path}; 2138 $MAP_PREFETCH{$path} |= $load;
2139
1890 $MAP_PREFETCHER ||= cf::async { 2140 $MAP_PREFETCHER ||= cf::async {
2141 $Coro::current->{desc} = "map prefetcher";
2142
1891 while (%MAP_PREFETCH) { 2143 while (%MAP_PREFETCH) {
1892 for my $path (keys %MAP_PREFETCH) { 2144 while (my ($k, $v) = each %MAP_PREFETCH) {
1893 my $map = find $path 2145 if (my $map = find $k) {
1894 or next;
1895 $map->load; 2146 $map->load if $v;
2147 }
1896 2148
1897 delete $MAP_PREFETCH{$path}; 2149 delete $MAP_PREFETCH{$k};
1898 } 2150 }
1899 } 2151 }
1900 undef $MAP_PREFETCHER; 2152 undef $MAP_PREFETCHER;
1901 }; 2153 };
1902 $MAP_PREFETCHER->prio (6); 2154 $MAP_PREFETCHER->prio (6);
1905} 2157}
1906 2158
1907sub save { 2159sub save {
1908 my ($self) = @_; 2160 my ($self) = @_;
1909 2161
1910 my $lock = cf::lock_acquire "map_data:" . $self->path; 2162 my $lock = cf::lock_acquire "map_data:$self->{path}";
1911 2163
1912 $self->{last_save} = $cf::RUNTIME; 2164 $self->{last_save} = $cf::RUNTIME;
1913 2165
1914 return unless $self->dirty; 2166 return unless $self->dirty;
1915 2167
1921 return if $self->{deny_save}; 2173 return if $self->{deny_save};
1922 2174
1923 local $self->{last_access} = $self->last_access;#d# 2175 local $self->{last_access} = $self->last_access;#d#
1924 2176
1925 cf::async { 2177 cf::async {
2178 $Coro::current->{desc} = "map player save";
1926 $_->contr->save for $self->players; 2179 $_->contr->save for $self->players;
1927 }; 2180 };
2181
2182 cf::get_slot 0.02;
1928 2183
1929 if ($uniq) { 2184 if ($uniq) {
1930 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2185 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1931 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2186 $self->_save_objects ($uniq, cf::IO_UNIQUES);
1932 } else { 2187 } else {
1938 my ($self) = @_; 2193 my ($self) = @_;
1939 2194
1940 # save first because save cedes 2195 # save first because save cedes
1941 $self->save; 2196 $self->save;
1942 2197
1943 my $lock = cf::lock_acquire "map_data:" . $self->path; 2198 my $lock = cf::lock_acquire "map_data:$self->{path}";
1944 2199
1945 return if $self->players; 2200 return if $self->players;
1946 return if $self->in_memory != cf::MAP_IN_MEMORY; 2201 return if $self->in_memory != cf::MAP_ACTIVE;
1947 return if $self->{deny_save}; 2202 return if $self->{deny_save};
1948 2203
2204 $self->in_memory (cf::MAP_SWAPPED);
2205
2206 $self->deactivate;
2207 $_->clear_links_to ($self) for values %cf::MAP;
1949 $self->clear; 2208 $self->clear;
1950 $self->in_memory (cf::MAP_SWAPPED);
1951} 2209}
1952 2210
1953sub reset_at { 2211sub reset_at {
1954 my ($self) = @_; 2212 my ($self) = @_;
1955 2213
1987 if $uniq; 2245 if $uniq;
1988 } 2246 }
1989 2247
1990 delete $cf::MAP{$self->path}; 2248 delete $cf::MAP{$self->path};
1991 2249
2250 $self->deactivate;
2251 $_->clear_links_to ($self) for values %cf::MAP;
1992 $self->clear; 2252 $self->clear;
1993
1994 $_->clear_links_to ($self) for values %cf::MAP;
1995 2253
1996 $self->unlink_save; 2254 $self->unlink_save;
1997 $self->destroy; 2255 $self->destroy;
1998} 2256}
1999 2257
2000my $nuke_counter = "aaaa"; 2258my $nuke_counter = "aaaa";
2001 2259
2002sub nuke { 2260sub nuke {
2003 my ($self) = @_; 2261 my ($self) = @_;
2004 2262
2263 {
2264 my $lock = cf::lock_acquire "map_data:$self->{path}";
2265
2005 delete $cf::MAP{$self->path}; 2266 delete $cf::MAP{$self->path};
2006 2267
2007 $self->unlink_save; 2268 $self->unlink_save;
2008 2269
2009 bless $self, "cf::map"; 2270 bless $self, "cf::map";
2010 delete $self->{deny_reset}; 2271 delete $self->{deny_reset};
2011 $self->{deny_save} = 1; 2272 $self->{deny_save} = 1;
2012 $self->reset_timeout (1); 2273 $self->reset_timeout (1);
2013 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2274 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2014 2275
2015 $cf::MAP{$self->path} = $self; 2276 $cf::MAP{$self->path} = $self;
2277 }
2016 2278
2017 $self->reset; # polite request, might not happen 2279 $self->reset; # polite request, might not happen
2018} 2280}
2019 2281
2020=item $maps = cf::map::tmp_maps 2282=item $maps = cf::map::tmp_maps
2062 2324
2063sub unique_maps() { 2325sub unique_maps() {
2064 [ 2326 [
2065 map { 2327 map {
2066 utf8::decode $_; 2328 utf8::decode $_;
2067 /\.map$/ 2329 s/\.map$//; # TODO future compatibility hack
2330 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2331 ? ()
2068 ? normalise $_ 2332 : normalise $_
2069 : ()
2070 } @{ aio_readdir $UNIQUEDIR or [] } 2333 } @{ aio_readdir $UNIQUEDIR or [] }
2071 ] 2334 ]
2072} 2335}
2073 2336
2074package cf;
2075
2076=back 2337=back
2077 2338
2078=head3 cf::object 2339=head3 cf::object
2079 2340
2080=cut 2341=cut
2083 2344
2084=over 4 2345=over 4
2085 2346
2086=item $ob->inv_recursive 2347=item $ob->inv_recursive
2087 2348
2088Returns 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.
2089 2351
2090=cut 2352=cut
2091 2353
2092sub inv_recursive_; 2354sub inv_recursive_;
2093sub inv_recursive_ { 2355sub inv_recursive_ {
2096 2358
2097sub inv_recursive { 2359sub inv_recursive {
2098 inv_recursive_ inv $_[0] 2360 inv_recursive_ inv $_[0]
2099} 2361}
2100 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
2101package cf; 2391package cf;
2102 2392
2103=back 2393=back
2104 2394
2105=head3 cf::object::player 2395=head3 cf::object::player
2111Sends 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>
2112can 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
2113dialogue with the given NPC character. 2403dialogue with the given NPC character.
2114 2404
2115=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};
2116 2420
2117# rough implementation of a future "reply" method that works 2421# rough implementation of a future "reply" method that works
2118# with dialog boxes. 2422# with dialog boxes.
2119#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
2120sub cf::object::player::reply($$$;$) { 2424sub cf::object::player::reply($$$;$) {
2127 2431
2128 } else { 2432 } else {
2129 my $pl = $self->contr; 2433 my $pl = $self->contr;
2130 2434
2131 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2435 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2132 my $diag = $pl->{npc_dialog}; 2436 my $dialog = $pl->{npc_dialog};
2133 $diag->{pl}->ext_reply ( 2437 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2134 $diag->{id},
2135 msgtype => "reply",
2136 msg => $diag->{pl}->expand_cfpod ($msg),
2137 add_topics => []
2138 );
2139 2438
2140 } else { 2439 } else {
2141 $msg = $npc->name . " says: $msg" if $npc; 2440 $msg = $npc->name . " says: $msg" if $npc;
2142 $self->message ($msg, $flags); 2441 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2143 } 2442 }
2144 } 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 (@_);
2145} 2454}
2146 2455
2147=item $player_object->may ("access") 2456=item $player_object->may ("access")
2148 2457
2149Returns wether the given player is authorized to access resource "access" 2458Returns wether the given player is authorized to access resource "access"
2162 2471
2163=item $player_object->enter_link 2472=item $player_object->enter_link
2164 2473
2165Freezes 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}>).
2166 2475
2167The 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.
2168I<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.
2169 2480
2170Will never block. 2481Will never block.
2171 2482
2172=item $player_object->leave_link ($map, $x, $y) 2483=item $player_object->leave_link ($map, $x, $y)
2173 2484
2228 # use -1 or undef as default coordinates, not 0, 0 2539 # use -1 or undef as default coordinates, not 0, 0
2229 ($x, $y) = ($map->enter_x, $map->enter_y) 2540 ($x, $y) = ($map->enter_x, $map->enter_y)
2230 if $x <=0 && $y <= 0; 2541 if $x <=0 && $y <= 0;
2231 2542
2232 $map->load; 2543 $map->load;
2233 $map->load_diag; 2544 $map->load_neighbours;
2234 2545
2235 return unless $self->contr->active; 2546 return unless $self->contr->active;
2547 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2236 $self->activate_recursive; 2548 $self->activate_recursive;
2237 2549
2238 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2550 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2239 $self->enter_map ($map, $x, $y); 2551 $self->enter_map ($map, $x, $y);
2240} 2552}
2241 2553
2242=item $player_object->goto ($path, $x, $y[, $check->($map)]) 2554=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2243 2555
2244Moves 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
2245her, loading and preparing them map, calling the provided $check callback 2557her, loading and preparing them map, calling the provided $check callback
2246that 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
2247the 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 >>.
2248 2564
2249=cut 2565=cut
2250 2566
2251our $GOTOGEN; 2567our $GOTOGEN;
2252 2568
2253sub cf::object::player::goto { 2569sub cf::object::player::goto {
2254 my ($self, $path, $x, $y, $check) = @_; 2570 my ($self, $path, $x, $y, $check, $done) = @_;
2255 2571
2256 # 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
2257 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2573 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2258 2574
2259 $self->enter_link; 2575 $self->enter_link;
2260 2576
2261 (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
2262 my $map = eval { 2599 my $map = eval {
2263 my $map = cf::map::find $path; 2600 my $map = defined $path ? cf::map::find $path : undef;
2264 2601
2265 if ($map) { 2602 if ($map) {
2266 $map = $map->customise_for ($self); 2603 $map = $map->customise_for ($self);
2267 $map = $check->($map) if $check && $map; 2604 $map = $check->($map) if $check && $map;
2268 } else { 2605 } else {
2269 $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);
2270 } 2607 }
2271 2608
2272 $map 2609 $map
2273 }; 2610 };
2274 2611
2279 2616
2280 if ($gen == $self->{_goto_generation}) { 2617 if ($gen == $self->{_goto_generation}) {
2281 delete $self->{_goto_generation}; 2618 delete $self->{_goto_generation};
2282 $self->leave_link ($map, $x, $y); 2619 $self->leave_link ($map, $x, $y);
2283 } 2620 }
2621
2622 $done->() if $done;
2284 })->prio (1); 2623 })->prio (1);
2285} 2624}
2286 2625
2287=item $player_object->enter_exit ($exit_object) 2626=item $player_object->enter_exit ($exit_object)
2288 2627
2308} 2647}
2309 2648
2310sub prepare_random_map { 2649sub prepare_random_map {
2311 my ($exit) = @_; 2650 my ($exit) = @_;
2312 2651
2313 my $guard = cf::lock_acquire "exit_prepare:$exit";
2314
2315 # all this does is basically replace the /! path by 2652 # all this does is basically replace the /! path by
2316 # a new random map path (?random/...) with a seed 2653 # a new random map path (?random/...) with a seed
2317 # that depends on the exit object 2654 # that depends on the exit object
2318 2655
2319 my $rmp = parse_random_map_params $exit->msg; 2656 my $rmp = parse_random_map_params $exit->msg;
2321 if ($exit->map) { 2658 if ($exit->map) {
2322 $rmp->{region} = $exit->region->name; 2659 $rmp->{region} = $exit->region->name;
2323 $rmp->{origin_map} = $exit->map->path; 2660 $rmp->{origin_map} = $exit->map->path;
2324 $rmp->{origin_x} = $exit->x; 2661 $rmp->{origin_x} = $exit->x;
2325 $rmp->{origin_y} = $exit->y; 2662 $rmp->{origin_y} = $exit->y;
2663
2664 $exit->map->touch;
2326 } 2665 }
2327 2666
2328 $rmp->{random_seed} ||= $exit->random_seed; 2667 $rmp->{random_seed} ||= $exit->random_seed;
2329 2668
2330 my $data = cf::to_json $rmp; 2669 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2331 my $md5 = Digest::MD5::md5_hex $data; 2670 my $md5 = Digest::MD5::md5_hex $data;
2332 my $meta = "$RANDOMDIR/$md5.meta"; 2671 my $meta = "$RANDOMDIR/$md5.meta";
2333 2672
2334 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2673 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2335 aio_write $fh, 0, (length $data), $data, 0; 2674 aio_write $fh, 0, (length $data), $data, 0;
2336 undef $fh; 2675 undef $fh;
2337 aio_rename "$meta~", $meta; 2676 aio_rename "$meta~", $meta;
2338 2677
2678 my $slaying = "?random/$md5";
2679
2680 if ($exit->valid) {
2339 $exit->slaying ("?random/$md5"); 2681 $exit->slaying ("?random/$md5");
2340 $exit->msg (undef); 2682 $exit->msg (undef);
2683 }
2341 } 2684 }
2342} 2685}
2343 2686
2344sub cf::object::player::enter_exit { 2687sub cf::object::player::enter_exit {
2345 my ($self, $exit) = @_; 2688 my ($self, $exit) = @_;
2346 2689
2347 return unless $self->type == cf::PLAYER; 2690 return unless $self->type == cf::PLAYER;
2348 2691
2349 if ($exit->slaying eq "/!") {
2350 #TODO: this should de-fi-ni-te-ly not be a sync-job
2351 # the problem is that $exit might not survive long enough
2352 # so it needs to be done right now, right here
2353 cf::sync_job { prepare_random_map $exit };
2354 }
2355
2356 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2357 my $hp = $exit->stats->hp;
2358 my $sp = $exit->stats->sp;
2359
2360 $self->enter_link; 2692 $self->enter_link;
2361 2693
2362 (async { 2694 (async {
2363 $self->deactivate_recursive; # just to be sure 2695 $Coro::current->{desc} = "enter_exit";
2696
2364 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
2365 $self->goto ($slaying, $hp, $sp); 2712 $self->goto ($map, $x, $y);
2366 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
2367 1; 2718 1
2368 }) { 2719 }) {
2369 $self->message ("Something went wrong deep within the crossfire server. " 2720 $self->message ("Something went wrong deep within the deliantra server. "
2370 . "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. "
2371 . "Please report this to the dungeon master!", 2722 . "Please report this to the dungeon master!",
2372 cf::NDI_UNIQUE | cf::NDI_RED); 2723 cf::NDI_UNIQUE | cf::NDI_RED);
2373 2724
2374 warn "ERROR in enter_exit: $@"; 2725 warn "ERROR in enter_exit: $@";
2393 2744
2394 utf8::encode $text; 2745 utf8::encode $text;
2395 $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);
2396} 2747}
2397 2748
2398=item $client->send_msg ($color, $type, $msg, [extra...]) 2749=item $client->send_msg ($channel, $msg, $color, [extra...])
2399 2750
2400Send a drawinfo or msg packet to the client, formatting the msg for the 2751Send a drawinfo or msg packet to the client, formatting the msg for the
2401client if neccessary. C<$type> should be a string identifying the type of 2752client if neccessary. C<$type> should be a string identifying the type of
2402the message, with C<log> being the default. If C<$color> is negative, suppress 2753the message, with C<log> being the default. If C<$color> is negative, suppress
2403the message unless the client supports the msg packet. 2754the message unless the client supports the msg packet.
2404 2755
2405=cut 2756=cut
2406 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
2407sub cf::client::send_msg { 2822sub cf::client::send_msg {
2408 my ($self, $color, $type, $msg, @extra) = @_; 2823 my ($self, $channel, $msg, $color, @extra) = @_;
2409 2824
2410 $msg = $self->pl->expand_cfpod ($msg); 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 }
2411 2849
2412 return unless @extra || length $msg; 2850 return unless @extra || length $msg;
2413 2851
2414 if ($self->can_msg) { 2852 if ($self->can_msg) {
2415 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $type, $msg, @extra])); 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);
2416 } else { 2873 } else {
2417 # replace some tags by gcfclient-compatible ones
2418 for ($msg) {
2419 1 while
2420 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2421 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2422 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2423 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2424 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2425 }
2426
2427 if ($color >= 0) { 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
2428 if (0 && $msg =~ /\[/) { 2889 if (0 && $msg =~ /\[/) {
2890 # COMMAND/INFO
2429 $self->send_packet ("drawextinfo $color 4 0 $msg") 2891 $self->send_packet ("drawextinfo $color 10 8 $msg")
2430 } else { 2892 } else {
2431 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g; 2893 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2432 $self->send_packet ("drawinfo $color $msg") 2894 $self->send_packet ("drawinfo $color $msg")
2433 } 2895 }
2434 } 2896 }
2435 } 2897 }
2436} 2898}
2437 2899
2438=item $client->ext_event ($type, %msg) 2900=item $client->ext_msg ($type, @msg)
2439 2901
2440Sends an ext event to the client. 2902Sends an ext event to the client.
2441 2903
2442=cut 2904=cut
2443 2905
2444sub cf::client::ext_event($$%) { 2906sub cf::client::ext_msg($$@) {
2445 my ($self, $type, %msg) = @_; 2907 my ($self, $type, @msg) = @_;
2446 2908
2909 if ($self->extcmd == 2) {
2910 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2911 } elsif ($self->extcmd == 1) { # TODO: remove
2447 $msg{msgtype} = "event_$type"; 2912 push @msg, msgtype => "event_$type";
2448 $self->send_packet ("ext " . $self->{json_coder}->encode (\%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 }
2449} 2933}
2450 2934
2451=item $success = $client->query ($flags, "text", \&cb) 2935=item $success = $client->query ($flags, "text", \&cb)
2452 2936
2453Queues a query to the client, calling the given callback with 2937Queues a query to the client, calling the given callback with
2508 my ($ns, $buf) = @_; 2992 my ($ns, $buf) = @_;
2509 2993
2510 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 2994 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2511 2995
2512 if (ref $msg) { 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
2513 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3004 if (my $cb = $EXTICMD{$type}) {
2514 if (my %reply = $cb->($ns, $msg)) { 3005 @reply = $cb->($ns, @payload);
2515 $reply{msgid} = $msg->{msgid};
2516 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2517 }
2518 } 3006 }
3007
3008 $ns->ext_reply ($reply, @reply)
3009 if $reply;
3010
2519 } else { 3011 } else {
2520 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3012 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2521 } 3013 }
2522 3014
2523 cf::override; 3015 cf::override;
2570our $safe = new Safe "safe"; 3062our $safe = new Safe "safe";
2571our $safe_hole = new Safe::Hole; 3063our $safe_hole = new Safe::Hole;
2572 3064
2573$SIG{FPE} = 'IGNORE'; 3065$SIG{FPE} = 'IGNORE';
2574 3066
2575$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));
2576 3072
2577# here we export the classes and methods available to script code 3073# here we export the classes and methods available to script code
2578 3074
2579=pod 3075=pod
2580 3076
2581The following functions and methods are available within a safe environment: 3077The following functions and methods are available within a safe environment:
2582 3078
2583 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
2584 cf::object::player player 3083 cf::object::player
2585 cf::player peaceful 3084 player
2586 cf::map trigger 3085
3086 cf::player
3087 peaceful
3088
3089 cf::map
3090 trigger
2587 3091
2588=cut 3092=cut
2589 3093
2590for ( 3094for (
2591 ["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)],
2592 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
2593 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful)],
2594 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
2595) { 3101) {
2596 no strict 'refs'; 3102 no strict 'refs';
2672# the server's init and main functions 3178# the server's init and main functions
2673 3179
2674sub load_facedata($) { 3180sub load_facedata($) {
2675 my ($path) = @_; 3181 my ($path) = @_;
2676 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
2677 warn "loading facedata from $path\n"; 3189 warn "loading facedata from $path\n";
2678 3190
2679 my $facedata; 3191 my $facedata;
2680 0 < aio_load $path, $facedata 3192 0 < aio_load $path, $facedata
2681 or die "$path: $!"; 3193 or die "$path: $!";
2683 $facedata = Coro::Storable::thaw $facedata; 3195 $facedata = Coro::Storable::thaw $facedata;
2684 3196
2685 $facedata->{version} == 2 3197 $facedata->{version} == 2
2686 or cf::cleanup "$path: version mismatch, cannot proceed."; 3198 or cf::cleanup "$path: version mismatch, cannot proceed.";
2687 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
2688 { 3207 {
2689 my $faces = $facedata->{faceinfo}; 3208 my $faces = $facedata->{faceinfo};
2690 3209
2691 while (my ($face, $info) = each %$faces) { 3210 while (my ($face, $info) = each %$faces) {
2692 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3211 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3212
2693 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3213 cf::face::set_visibility $idx, $info->{visibility};
3214 cf::face::set_magicmap $idx, $info->{magicmap};
2694 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3215 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2695 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3216 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2696 Coro::cede; 3217
3218 cf::cede_to_tick;
2697 } 3219 }
2698 3220
2699 while (my ($face, $info) = each %$faces) { 3221 while (my ($face, $info) = each %$faces) {
2700 next unless $info->{smooth}; 3222 next unless $info->{smooth};
3223
2701 my $idx = cf::face::find $face 3224 my $idx = cf::face::find $face
2702 or next; 3225 or next;
3226
2703 if (my $smooth = cf::face::find $info->{smooth}) { 3227 if (my $smooth = cf::face::find $info->{smooth}) {
3228 cf::face::set_smooth $idx, $smooth;
2704 cf::face::set_smooth $idx, $smooth, $info->{smoothlevel}; 3229 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2705 } else { 3230 } else {
2706 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3231 warn "smooth face '$info->{smooth}' not found for face '$face'";
2707 } 3232 }
2708 Coro::cede; 3233
3234 cf::cede_to_tick;
2709 } 3235 }
2710 } 3236 }
2711 3237
2712 { 3238 {
2713 my $anims = $facedata->{animinfo}; 3239 my $anims = $facedata->{animinfo};
2714 3240
2715 while (my ($anim, $info) = each %$anims) { 3241 while (my ($anim, $info) = each %$anims) {
2716 cf::anim::set $anim, $info->{frames}, $info->{facings}; 3242 cf::anim::set $anim, $info->{frames}, $info->{facings};
2717 Coro::cede; 3243 cf::cede_to_tick;
2718 } 3244 }
2719 3245
2720 cf::anim::invalidate_all; # d'oh 3246 cf::anim::invalidate_all; # d'oh
2721 } 3247 }
2722 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
2723 1 3284 1
2724} 3285}
2725 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
2726sub 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
2727 load_resource_file "$MAPDIR/regions" 3330 load_resource_file "$MAPDIR/regions"
2728 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 }
2729} 3337}
2730 3338
2731sub reload_facedata { 3339sub reload_facedata {
2732 load_facedata "$DATADIR/facedata" 3340 load_facedata "$DATADIR/facedata"
2733 or die "unable to load facedata\n"; 3341 or die "unable to load facedata\n";
2734} 3342}
2735 3343
2736sub reload_archetypes { 3344sub reload_archetypes {
2737 load_resource_file "$DATADIR/archetypes" 3345 load_resource_file "$DATADIR/archetypes"
2738 or die "unable to load archetypes\n"; 3346 or die "unable to load archetypes\n";
2739 #d# NEED to laod twice to resolve forward references
2740 # this really needs to be done in an extra post-pass
2741 # (which needs to be synchronous, so solve it differently)
2742 load_resource_file "$DATADIR/archetypes"
2743 or die "unable to load archetypes\n";
2744} 3347}
2745 3348
2746sub reload_treasures { 3349sub reload_treasures {
2747 load_resource_file "$DATADIR/treasures" 3350 load_resource_file "$DATADIR/treasures"
2748 or die "unable to load treasurelists\n"; 3351 or die "unable to load treasurelists\n";
2749} 3352}
2750 3353
2751sub reload_resources { 3354sub reload_resources {
2752 warn "reloading resource files...\n"; 3355 warn "reloading resource files...\n";
2753 3356
3357 reload_facedata;
3358 reload_archetypes;
2754 reload_regions; 3359 reload_regions;
2755 reload_facedata;
2756 #reload_archetypes;#d#
2757 reload_archetypes;
2758 reload_treasures; 3360 reload_treasures;
2759 3361
2760 warn "finished reloading resource files\n"; 3362 warn "finished reloading resource files\n";
2761} 3363}
2762 3364
2763sub init { 3365sub reload_config {
2764 reload_resources;
2765}
2766
2767sub cfg_load {
2768 open my $fh, "<:utf8", "$CONFDIR/config" 3366 open my $fh, "<:utf8", "$CONFDIR/config"
2769 or return; 3367 or return;
2770 3368
2771 local $/; 3369 local $/;
2772 *CFG = YAML::Syck::Load <$fh>; 3370 *CFG = YAML::Load <$fh>;
2773 3371
2774 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3372 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2775 3373
2776 $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};
2777 $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};
2783 }; 3381 };
2784 warn $@ if $@; 3382 warn $@ if $@;
2785 } 3383 }
2786} 3384}
2787 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
2788sub 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
2789 # we must not ever block the main coroutine 3421 # we must not ever block the main coroutine
2790 local $Coro::idle = sub { 3422 local $Coro::idle = sub {
2791 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#
2792 (async { 3424 (async {
2793 Event::one_event; 3425 $Coro::current->{desc} = "IDLE BUG HANDLER";
3426 EV::loop EV::LOOP_ONESHOT;
2794 })->prio (Coro::PRIO_MAX); 3427 })->prio (Coro::PRIO_MAX);
2795 }; 3428 };
2796 3429
2797 cfg_load; 3430 evthread_start IO::AIO::poll_fileno;
3431
3432 cf::sync_job {
3433 reload_resources;
3434 reload_config;
2798 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
2799 load_extensions; 3448 load_extensions;
2800 3449
2801 $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
2802 Event::loop; 3458 EV::loop;
2803} 3459}
2804 3460
2805############################################################################# 3461#############################################################################
2806# initialisation and cleanup 3462# initialisation and cleanup
2807 3463
2808# install some emergency cleanup handlers 3464# install some emergency cleanup handlers
2809BEGIN { 3465BEGIN {
3466 our %SIGWATCHER = ();
2810 for my $signal (qw(INT HUP TERM)) { 3467 for my $signal (qw(INT HUP TERM)) {
2811 Event->signal ( 3468 $SIGWATCHER{$signal} = EV::signal $signal, sub {
2812 reentrant => 0,
2813 data => WF_AUTOCANCEL,
2814 signal => $signal,
2815 prio => 0,
2816 cb => sub {
2817 cf::cleanup "SIG$signal"; 3469 cf::cleanup "SIG$signal";
2818 },
2819 ); 3470 };
2820 } 3471 }
2821} 3472}
2822 3473
2823sub write_runtime { 3474sub write_runtime_sync {
2824 my $runtime = "$LOCALDIR/runtime";
2825
2826 # first touch the runtime file to show we are still running: 3475 # first touch the runtime file to show we are still running:
2827 # the fsync below can take a very very long time. 3476 # the fsync below can take a very very long time.
2828 3477
2829 IO::AIO::aio_utime $runtime, undef, undef; 3478 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2830 3479
2831 my $guard = cf::lock_acquire "write_runtime"; 3480 my $guard = cf::lock_acquire "write_runtime";
2832 3481
2833 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3482 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
2834 or return; 3483 or return;
2835 3484
2836 my $value = $cf::RUNTIME + 90 + 10; 3485 my $value = $cf::RUNTIME + 90 + 10;
2837 # 10 is the runtime save interval, for a monotonic clock 3486 # 10 is the runtime save interval, for a monotonic clock
2838 # 60 allows for the watchdog to kill the server. 3487 # 60 allows for the watchdog to kill the server.
2848 aio_utime $fh, undef, undef; 3497 aio_utime $fh, undef, undef;
2849 3498
2850 close $fh 3499 close $fh
2851 or return; 3500 or return;
2852 3501
2853 aio_rename "$runtime~", $runtime 3502 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
2854 and return; 3503 and return;
2855 3504
2856 warn "runtime file written.\n"; 3505 warn "runtime file written.\n";
2857 3506
2858 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 };
2859} 3558}
2860 3559
2861sub emergency_save() { 3560sub emergency_save() {
2862 my $freeze_guard = cf::freeze_mainloop; 3561 my $freeze_guard = cf::freeze_mainloop;
2863 3562
2869 # and maps saved/destroyed asynchronously. 3568 # and maps saved/destroyed asynchronously.
2870 warn "begin emergency player save\n"; 3569 warn "begin emergency player save\n";
2871 for my $login (keys %cf::PLAYER) { 3570 for my $login (keys %cf::PLAYER) {
2872 my $pl = $cf::PLAYER{$login} or next; 3571 my $pl = $cf::PLAYER{$login} or next;
2873 $pl->valid or next; 3572 $pl->valid or next;
3573 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2874 $pl->save; 3574 $pl->save;
2875 } 3575 }
2876 warn "end emergency player save\n"; 3576 warn "end emergency player save\n";
2877 3577
2878 warn "begin emergency map save\n"; 3578 warn "begin emergency map save\n";
2884 warn "end emergency map save\n"; 3584 warn "end emergency map save\n";
2885 3585
2886 warn "begin emergency database checkpoint\n"; 3586 warn "begin emergency database checkpoint\n";
2887 BDB::db_env_txn_checkpoint $DB_ENV; 3587 BDB::db_env_txn_checkpoint $DB_ENV;
2888 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";
2889 }; 3593 };
2890 3594
2891 warn "leave emergency perl save\n"; 3595 warn "leave emergency perl save\n";
2892} 3596}
2893 3597
2894sub post_cleanup { 3598sub post_cleanup {
2895 my ($make_core) = @_; 3599 my ($make_core) = @_;
2896 3600
2897 warn Carp::longmess "post_cleanup backtrace" 3601 warn Carp::longmess "post_cleanup backtrace"
2898 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#
2899} 3632}
2900 3633
2901sub do_reload_perl() { 3634sub do_reload_perl() {
2902 # can/must only be called in main 3635 # can/must only be called in main
2903 if ($Coro::current != $Coro::main) { 3636 if ($Coro::current != $Coro::main) {
2904 warn "can only reload from main coroutine"; 3637 warn "can only reload from main coroutine";
2905 return; 3638 return;
2906 } 3639 }
2907 3640
3641 return if $RELOAD++;
3642
3643 while ($RELOAD) {
2908 warn "reloading..."; 3644 warn "reloading...";
2909 3645
2910 warn "entering sync_job"; 3646 warn "entering sync_job";
2911 3647
2912 cf::sync_job { 3648 cf::sync_job {
2913 cf::write_runtime; # external watchdog should not bark 3649 cf::write_runtime_sync; # external watchdog should not bark
2914 cf::emergency_save; 3650 cf::emergency_save;
2915 cf::write_runtime; # external watchdog should not bark 3651 cf::write_runtime_sync; # external watchdog should not bark
2916 3652
2917 warn "syncing database to disk"; 3653 warn "syncing database to disk";
2918 BDB::db_env_txn_checkpoint $DB_ENV; 3654 BDB::db_env_txn_checkpoint $DB_ENV;
2919 3655
2920 # 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
2921 3657
2922 warn "cancelling all WF_AUTOCANCEL watchers";
2923 for (Event::all_watchers) {
2924 $_->cancel if $_->data & WF_AUTOCANCEL;
2925 }
2926
2927 warn "flushing outstanding aio requests"; 3658 warn "flushing outstanding aio requests";
2928 for (;;) {
2929 BDB::flush;
2930 IO::AIO::flush;
2931 Coro::cede;
2932 last unless IO::AIO::nreqs || BDB::nreqs; 3659 while (IO::AIO::nreqs || BDB::nreqs) {
2933 warn "iterate..."; 3660 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
2934 }
2935
2936 ++$RELOAD;
2937
2938 warn "cancelling all extension coros";
2939 $_->cancel for values %EXT_CORO;
2940 %EXT_CORO = ();
2941
2942 warn "removing commands";
2943 %COMMAND = ();
2944
2945 warn "removing ext/exti commands";
2946 %EXTCMD = ();
2947 %EXTICMD = ();
2948
2949 warn "unloading/nuking all extensions";
2950 for my $pkg (@EXTS) {
2951 warn "... unloading $pkg";
2952
2953 if (my $cb = $pkg->can ("unload")) {
2954 eval {
2955 $cb->($pkg);
2956 1
2957 } or warn "$pkg unloaded, but with errors: $@";
2958 } 3661 }
2959 3662
2960 warn "... nuking $pkg"; 3663 warn "cancelling all extension coros";
2961 Symbol::delete_package $pkg; 3664 $_->cancel for values %EXT_CORO;
2962 } 3665 %EXT_CORO = ();
2963 3666
2964 warn "unloading all perl modules loaded from $LIBDIR"; 3667 warn "removing commands";
2965 while (my ($k, $v) = each %INC) { 3668 %COMMAND = ();
2966 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
2967 3669
3670 warn "removing ext/exti commands";
3671 %EXTCMD = ();
3672 %EXTICMD = ();
3673
3674 warn "unloading/nuking all extensions";
3675 for my $pkg (@EXTS) {
2968 warn "... unloading $k"; 3676 warn "... unloading $pkg";
2969 delete $INC{$k};
2970 3677
2971 $k =~ s/\.pm$//;
2972 $k =~ s/\//::/g;
2973
2974 if (my $cb = $k->can ("unload_module")) { 3678 if (my $cb = $pkg->can ("unload")) {
3679 eval {
2975 $cb->(); 3680 $cb->($pkg);
3681 1
3682 } or warn "$pkg unloaded, but with errors: $@";
3683 }
3684
3685 warn "... clearing $pkg";
3686 clear_package $pkg;
2976 } 3687 }
2977 3688
2978 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;
2979 } 3704 }
2980 3705
2981 warn "getting rid of safe::, as good as possible"; 3706 warn "getting rid of safe::, as good as possible";
2982 Symbol::delete_package "safe::$_" 3707 clear_package "safe::$_"
2983 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);
2984 3709
2985 warn "unloading cf.pm \"a bit\""; 3710 warn "unloading cf.pm \"a bit\"";
2986 delete $INC{"cf.pm"}; 3711 delete $INC{"cf.pm"};
2987 delete $INC{"cf/pod.pm"}; 3712 delete $INC{"cf/pod.pm"};
2988 3713
2989 # don't, removes xs symbols, too, 3714 # don't, removes xs symbols, too,
2990 # and global variables created in xs 3715 # and global variables created in xs
2991 #Symbol::delete_package __PACKAGE__; 3716 #clear_package __PACKAGE__;
2992 3717
2993 warn "unload completed, starting to reload now"; 3718 warn "unload completed, starting to reload now";
2994 3719
2995 warn "reloading cf.pm"; 3720 warn "reloading cf.pm";
2996 require cf; 3721 require cf;
2997 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3722 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2998 3723
2999 warn "loading config and database again"; 3724 warn "loading config and database again";
3000 cf::cfg_load; 3725 cf::reload_config;
3001 3726
3002 warn "loading extensions"; 3727 warn "loading extensions";
3003 cf::load_extensions; 3728 cf::load_extensions;
3004 3729
3005 warn "reattaching attachments to objects/players"; 3730 warn "reattaching attachments to objects/players";
3006 _global_reattach; # objects, sockets 3731 _global_reattach; # objects, sockets
3007 warn "reattaching attachments to maps"; 3732 warn "reattaching attachments to maps";
3008 reattach $_ for values %MAP; 3733 reattach $_ for values %MAP;
3009 warn "reattaching attachments to players"; 3734 warn "reattaching attachments to players";
3010 reattach $_ for values %PLAYER; 3735 reattach $_ for values %PLAYER;
3011 3736
3737 warn "running post_load";
3738 (pop @POST_INIT)->(1) while @POST_INIT;
3739
3012 warn "leaving sync_job"; 3740 warn "leaving sync_job";
3013 3741
3014 1 3742 1
3015 } or do { 3743 } or do {
3016 warn $@; 3744 warn $@;
3017 warn "error while reloading, exiting."; 3745 cf::cleanup "error while reloading, exiting.";
3018 exit 1;
3019 }; 3746 };
3020 3747
3021 warn "reloaded"; 3748 warn "reloaded";
3749 --$RELOAD;
3750 }
3022}; 3751};
3023 3752
3024our $RELOAD_WATCHER; # used only during reload 3753our $RELOAD_WATCHER; # used only during reload
3025 3754
3026sub reload_perl() { 3755sub reload_perl() {
3027 # doing reload synchronously and two reloads happen back-to-back, 3756 # doing reload synchronously and two reloads happen back-to-back,
3028 # coro crashes during coro_state_free->destroy here. 3757 # coro crashes during coro_state_free->destroy here.
3029 3758
3030 $RELOAD_WATCHER ||= Event->timer ( 3759 $RELOAD_WATCHER ||= EV::timer $TICK * 1.5, 0, sub {
3031 reentrant => 0,
3032 after => 0,
3033 data => WF_AUTOCANCEL,
3034 cb => sub {
3035 do_reload_perl; 3760 do_reload_perl;
3036 undef $RELOAD_WATCHER; 3761 undef $RELOAD_WATCHER;
3037 },
3038 ); 3762 };
3039} 3763}
3040 3764
3041register_command "reload" => sub { 3765register_command "reload" => sub {
3042 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3043 3767
3044 if ($who->flag (FLAG_WIZ)) { 3768 if ($who->flag (FLAG_WIZ)) {
3045 $who->message ("reloading server."); 3769 $who->message ("reloading server.");
3770 async {
3771 $Coro::current->{desc} = "perl_reload";
3046 async { reload_perl }; 3772 reload_perl;
3773 };
3047 } 3774 }
3048}; 3775};
3049 3776
3050unshift @INC, $LIBDIR; 3777unshift @INC, $LIBDIR;
3051 3778
3053 3780
3054our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3055our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3056 3783
3057sub wait_for_tick { 3784sub wait_for_tick {
3058 return unless $TICK_WATCHER->is_active;
3059 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3060 3786
3061 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3062 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3063 $signal->wait; 3789 $signal->wait;
3064} 3790}
3065 3791
3066sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3067 return unless $TICK_WATCHER->is_active;
3068 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3069 3794
3070 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3071 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3072 $signal->wait; 3797 $signal->wait;
3073} 3798}
3074 3799
3075 my $min = 1e6;#d# 3800sub tick {
3076 my $avg = 10;
3077$TICK_WATCHER = Event->timer (
3078 reentrant => 0,
3079 parked => 1,
3080 prio => 0,
3081 at => $NEXT_TICK || $TICK,
3082 data => WF_AUTOCANCEL,
3083 cb => sub {
3084 if ($Coro::current != $Coro::main) { 3801 if ($Coro::current != $Coro::main) {
3085 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"
3086 unless ++$bug_warning > 10; 3803 unless ++$bug_warning > 10;
3087 return; 3804 return;
3088 } 3805 }
3089 3806
3090 $NOW = $tick_start = Event::time;
3091
3092 cf::server_tick; # one server iteration 3807 cf::server_tick; # one server iteration
3093 3808
3094 0 && sync_job {#d# 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3095 for(1..10) { 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3096 my $t = Event::time; 3811 Coro::async_pool {
3097 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3812 $Coro::current->{desc} = "runtime saver";
3098 or die; 3813 write_runtime_sync
3099 3814 or warn "ERROR: unable to write runtime file: $!";
3100 $map->width (50);
3101 $map->height (50);
3102 $map->alloc;
3103 $map->_load_objects ("/tmp/x.map", 1);
3104 my $t = Event::time - $t;
3105
3106 #next unless $t < 0.0013;#d#
3107 if ($t < $min) {
3108 $min = $t;
3109 }
3110 $avg = $avg * 0.99 + $t * 0.01;
3111 }
3112 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3113 exit 0;
3114 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3115 }; 3815 };
3816 }
3116 3817
3117 $RUNTIME += $TICK;
3118 $NEXT_TICK += $TICK;
3119
3120 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3121 $NEXT_RUNTIME_WRITE = $NOW + 10;
3122 Coro::async_pool {
3123 write_runtime
3124 or warn "ERROR: unable to write runtime file: $!";
3125 };
3126 }
3127
3128# my $AFTER = Event::time;
3129# warn $AFTER - $NOW;#d#
3130
3131 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3132 $sig->send; 3819 $sig->send;
3133 } 3820 }
3134 while (my $sig = shift @WAIT_FOR_TICK) { 3821 while (my $sig = shift @WAIT_FOR_TICK) {
3135 $sig->send; 3822 $sig->send;
3136 } 3823 }
3137 3824
3138 $NOW = Event::time; 3825 $LOAD = ($NOW - $TICK_START) / $TICK;
3139
3140 # if we are delayed by four ticks or more, skip them all
3141 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3142
3143 $TICK_WATCHER->at ($NEXT_TICK);
3144 $TICK_WATCHER->start;
3145
3146 $LOAD = ($NOW - $tick_start) / $TICK;
3147 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3826 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3148 3827
3149 _post_tick; 3828 if (0) {
3150 3829 if ($NEXT_TICK) {
3151 3830 my $jitter = $TICK_START - $NEXT_TICK;
3831 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3832 warn "jitter $JITTER\n";#d#
3833 }
3152 }, 3834 }
3153); 3835}
3154 3836
3155{ 3837{
3156 BDB::max_poll_time $TICK * 0.1; 3838 # configure BDB
3157 $BDB_POLL_WATCHER = Event->io ( 3839
3158 reentrant => 0,
3159 fd => BDB::poll_fileno,
3160 poll => 'r',
3161 prio => 0,
3162 data => WF_AUTOCANCEL,
3163 cb => \&BDB::poll_cb,
3164 );
3165 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3166 3841 BDB::max_poll_reqs $TICK * 0.1;
3167 BDB::set_sync_prepare { 3842 $AnyEvent::BDB::WATCHER->priority (1);
3168 my $status;
3169 my $current = $Coro::current;
3170 (
3171 sub {
3172 $status = $!;
3173 $current->ready; undef $current;
3174 },
3175 sub {
3176 Coro::schedule while defined $current;
3177 $! = $status;
3178 },
3179 )
3180 };
3181 3843
3182 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3183 $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);
3184 3851
3185 cf::sync_job { 3852 cf::sync_job {
3186 eval { 3853 eval {
3187 BDB::db_env_open 3854 BDB::db_env_open
3188 $DB_ENV, 3855 $DB_ENV,
3190 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
3191 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3858 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3192 0666; 3859 0666;
3193 3860
3194 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3861 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3195
3196 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3197 $DB_ENV->set_lk_detect;
3198 }; 3862 };
3199 3863
3200 cf::cleanup "db_env_open(db): $@" if $@; 3864 cf::cleanup "db_env_open(db): $@" if $@;
3201 }; 3865 };
3202 } 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 };
3203} 3877}
3204 3878
3205{ 3879{
3880 # configure IO::AIO
3881
3206 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3207
3208 undef $Coro::AIO::WATCHER;
3209 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3210 $AIO_POLL_WATCHER = Event->io ( 3884 undef $AnyEvent::AIO::WATCHER;
3211 reentrant => 0,
3212 data => WF_AUTOCANCEL,
3213 fd => IO::AIO::poll_fileno,
3214 poll => 'r',
3215 prio => 6,
3216 cb => \&IO::AIO::poll_cb,
3217 );
3218} 3885}
3219 3886
3220my $_log_backtrace; 3887my $_log_backtrace;
3221 3888
3222sub _log_backtrace { 3889sub _log_backtrace {
3225 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3226 3893
3227 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3228 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3229 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3230 async { 3898 async {
3899 $Coro::current->{desc} = "abt $msg";
3900
3231 my @bt = fork_call { 3901 my @bt = fork_call {
3232 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3233 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3903 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3234 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 |"
3235 or die "addr2line: $!"; 3905 or die "addr2line: $!";
3243 } 3913 }
3244 3914
3245 @funcs 3915 @funcs
3246 }; 3916 };
3247 3917
3248 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3249 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3250 --$_log_backtrace; 3921 --$_log_backtrace;
3251 }; 3922 };
3252 } else { 3923 } else {
3253 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines