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.336 by root, Tue Aug 21 00:31:18 2007 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 2009 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 qw(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
37use Guard ();
15use Coro 3.64 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
41use Coro::EV;
18use Coro::Event; 42use Coro::AnyEvent;
19use Coro::Timer; 43use Coro::Timer;
20use Coro::Signal; 44use Coro::Signal;
21use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
22use Coro::AIO; 48use Coro::AIO;
49use Coro::BDB 1.6;
23use Coro::Storable; 50use Coro::Storable;
24use Coro::Util (); 51use Coro::Util ();
25 52
26use JSON::XS 1.4 (); 53use JSON::XS 2.01 ();
27use BDB (); 54use BDB ();
28use Data::Dumper; 55use Data::Dumper;
29use Digest::MD5; 56use Digest::MD5;
30use Fcntl; 57use Fcntl;
31use YAML::Syck (); 58use YAML ();
32use IO::AIO 2.32 (); 59use IO::AIO ();
33use Time::HiRes; 60use Time::HiRes;
34use Compress::LZF; 61use Compress::LZF;
35use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
36 65
37# configure various modules to our taste 66# configure various modules to our taste
38# 67#
39$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 76
43$Event::Eval = 1; # no idea why this is required, but it is 77# strictly for debugging
44 78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
46$YAML::Syck::ImplicitUnicode = 1;
47
48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 79
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 81
52our %COMMAND = (); 82our %COMMAND = ();
53our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
56our %EXTCMD = (); 86our %EXTCMD = ();
57our %EXTICMD = (); 87our %EXTICMD = ();
58our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
59our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
60 90
61our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
62our @EVENT; 92our @EVENT;
63 93
64our $CONFDIR = confdir; 94our $CONFDIR = confdir;
65our $DATADIR = datadir; 95our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
108our %RESOURCE;
75 109
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
77our $TICK_WATCHER;
78our $AIO_POLL_WATCHER;
79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 112our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
83 114
115our $BDB_DEADLOCK_WATCHER;
116our $BDB_CHECKPOINT_WATCHER;
84our $BDB_POLL_WATCHER; 117our $BDB_TRICKLE_WATCHER;
85our $DB_ENV; 118our $DB_ENV;
119
120our @EXTRA_MODULES = qw(pod mapscript);
86 121
87our %CFG; 122our %CFG;
88 123
89our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
90our $RUNTIME; 125our $RUNTIME;
126our $NOW;
91 127
92our %PLAYER; # all users 128our (%PLAYER, %PLAYER_LOADING); # all users
93our %MAP; # all maps 129our (%MAP, %MAP_LOADING ); # all maps
94our $LINK_MAP; # the special {link} map, which is always available 130our $LINK_MAP; # the special {link} map, which is always available
95 131
96# used to convert map paths into valid unix filenames by replacing / by ∕ 132# used to convert map paths into valid unix filenames by replacing / by ∕
97our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 133our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
98 134
99our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
100our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
137our $JITTER; # average jitter
101our $tick_start; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
102 144
103binmode STDOUT; 145binmode STDOUT;
104binmode STDERR; 146binmode STDERR;
105 147
106# read virtual server time, if available 148# read virtual server time, if available
107unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
108 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
109 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
110 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
111} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
112 156
113mkdir $_ 157mkdir $_
114 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
115 159
116our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
159 203
160The raw value load value from the last tick. 204The raw value load value from the last tick.
161 205
162=item %cf::CFG 206=item %cf::CFG
163 207
164Configuration for the server, loaded from C</etc/crossfire/config>, or 208Configuration for the server, loaded from C</etc/deliantra-server/config>, or
165from wherever your confdir points to. 209from wherever your confdir points to.
166 210
167=item cf::wait_for_tick, cf::wait_for_tick_begin 211=item cf::wait_for_tick, cf::wait_for_tick_begin
168 212
169These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 213These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
187 $msg .= "\n" 231 $msg .= "\n"
188 unless $msg =~ /\n$/; 232 unless $msg =~ /\n$/;
189 233
190 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 234 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
191 235
192 utf8::encode $msg;
193 LOG llevError, $msg; 236 LOG llevError, $msg;
194 }; 237 };
195} 238}
239
240$Coro::State::DIEHOOK = sub {
241 return unless $^S eq 0; # "eq", not "=="
242
243 if ($Coro::current == $Coro::main) {#d#
244 warn "DIEHOOK called in main context, Coro bug?\n";#d#
245 return;#d#
246 }#d#
247
248 # kill coroutine otherwise
249 warn Carp::longmess $_[0];
250 Coro::terminate
251};
252
253$SIG{__DIE__} = sub { }; #d#?
196 254
197@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 255@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
198@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 256@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
199@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 257@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
200@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 258@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
207for my $pkg (qw( 265for my $pkg (qw(
208 cf::global cf::attachable 266 cf::global cf::attachable
209 cf::object cf::object::player 267 cf::object cf::object::player
210 cf::client cf::player 268 cf::client cf::player
211 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
212 cf::map cf::party cf::region 271 cf::party cf::region
213)) { 272)) {
214 no strict 'refs';
215 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
216} 274}
217 275
218$Event::DIED = sub { 276$EV::DIED = sub {
219 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
220}; 278};
221 279
222############################################################################# 280#############################################################################
223 281
246 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 304 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
247 $d 305 $d
248 } || "[unable to dump $_[0]: '$@']"; 306 } || "[unable to dump $_[0]: '$@']";
249} 307}
250 308
251=item $ref = cf::from_json $json 309=item $ref = cf::decode_json $json
252 310
253Converts a JSON string into the corresponding perl data structure. 311Converts a JSON string into the corresponding perl data structure.
254 312
255=item $json = cf::to_json $ref 313=item $json = cf::encode_json $ref
256 314
257Converts a perl data structure into its JSON representation. 315Converts a perl data structure into its JSON representation.
258 316
259=cut 317=cut
260 318
261our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
262 320
263sub to_json ($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
264sub from_json ($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
265 337
266=item cf::lock_wait $string 338=item cf::lock_wait $string
267 339
268Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
269 341
270=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
271 343
272Wait until the given lock is available and then acquires it and returns 344Wait until the given lock is available and then acquires it and returns
273a Coro::guard object. If the guard object gets destroyed (goes out of scope, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
274for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
275returned. 347returned.
276 348
349Locks are *not* recursive, locking from the same coro twice results in a
350deadlocked coro.
351
277Lock names should begin with a unique identifier (for example, cf::map::find 352Lock names should begin with a unique identifier (for example, cf::map::find
278uses map_find and cf::map::load uses map_load). 353uses map_find and cf::map::load uses map_load).
279 354
280=item $locked = cf::lock_active $string 355=item $locked = cf::lock_active $string
281 356
282Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
283 358
284=cut 359=cut
285 360
286our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
287 362
288sub lock_wait($) { 363sub lock_wait($) {
289 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
290
291 # wait for lock, if any
292 while ($LOCK{$key}) {
293 push @{ $LOCK{$key} }, $Coro::current;
294 Coro::schedule;
295 }
296} 365}
297 366
298sub lock_acquire($) { 367sub lock_acquire($) {
299 my ($key) = @_; 368 $LOCKS->guard ($_[0])
300
301 # wait, to be sure we are not locked
302 lock_wait $key;
303
304 $LOCK{$key} = [];
305
306 Coro::guard {
307 # wake up all waiters, to be on the safe side
308 $_->ready for @{ delete $LOCK{$key} };
309 }
310} 369}
311 370
312sub lock_active($) { 371sub lock_active($) {
313 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
314
315 ! ! $LOCK{$key}
316} 373}
317 374
318sub freeze_mainloop { 375sub freeze_mainloop {
319 return unless $TICK_WATCHER->is_active; 376 tick_inhibit_inc;
320 377
321 my $guard = Coro::guard { 378 &Guard::guard (\&tick_inhibit_dec);
322 $TICK_WATCHER->start; 379}
323 }; 380
324 $TICK_WATCHER->stop; 381=item cf::periodic $interval, $cb
325 $guard 382
383Like EV::periodic, but randomly selects a starting point so that the actions
384get spread over timer.
385
386=cut
387
388sub periodic($$) {
389 my ($interval, $cb) = @_;
390
391 my $start = rand List::Util::min 180, $interval;
392
393 EV::periodic $start, $interval, 0, $cb
326} 394}
327 395
328=item cf::get_slot $time[, $priority[, $name]] 396=item cf::get_slot $time[, $priority[, $name]]
329 397
330Allocate $time seconds of blocking CPU time at priority C<$priority>: 398Allocate $time seconds of blocking CPU time at priority C<$priority>:
341our @SLOT_QUEUE; 409our @SLOT_QUEUE;
342our $SLOT_QUEUE; 410our $SLOT_QUEUE;
343 411
344$SLOT_QUEUE->cancel if $SLOT_QUEUE; 412$SLOT_QUEUE->cancel if $SLOT_QUEUE;
345$SLOT_QUEUE = Coro::async { 413$SLOT_QUEUE = Coro::async {
414 $Coro::current->desc ("timeslot manager");
415
346 my $signal = new Coro::Signal; 416 my $signal = new Coro::Signal;
347 417
348 while () { 418 while () {
349 next_job: 419 next_job:
350 my $avail = cf::till_tick; 420 my $avail = cf::till_tick;
358 } 428 }
359 } 429 }
360 } 430 }
361 431
362 if (@SLOT_QUEUE) { 432 if (@SLOT_QUEUE) {
363 # we do not use wait_For_tick() as it returns immediately when tick is inactive 433 # we do not use wait_for_tick() as it returns immediately when tick is inactive
364 push @cf::WAIT_FOR_TICK, $signal; 434 push @cf::WAIT_FOR_TICK, $signal;
365 $signal->wait; 435 $signal->wait;
366 } else { 436 } else {
367 Coro::schedule; 437 Coro::schedule;
368 } 438 }
369 } 439 }
370}; 440};
371 441
372sub get_slot($;$$) { 442sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main;
444
373 my ($time, $pri, $name) = @_; 445 my ($time, $pri, $name) = @_;
374 446
375 $time = $TICK * .6 if $time > $TICK * .6; 447 $time = $TICK * .6 if $time > $TICK * .6;
376 my $sig = new Coro::Signal; 448 my $sig = new Coro::Signal;
377 449
391 463
392BEGIN { *async = \&Coro::async_pool } 464BEGIN { *async = \&Coro::async_pool }
393 465
394=item cf::sync_job { BLOCK } 466=item cf::sync_job { BLOCK }
395 467
396The design of Crossfire TRT requires that the main coroutine ($Coro::main) 468The design of Deliantra requires that the main coroutine ($Coro::main)
397is always able to handle events or runnable, as Crossfire TRT is only 469is always able to handle events or runnable, as Deliantra is only
398partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 470partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
399acceptable. 471acceptable.
400 472
401If it must be done, put the blocking parts into C<sync_job>. This will run 473If it must be done, put the blocking parts into C<sync_job>. This will run
402the given BLOCK in another coroutine while waiting for the result. The 474the given BLOCK in another coroutine while waiting for the result. The
407 479
408sub sync_job(&) { 480sub sync_job(&) {
409 my ($job) = @_; 481 my ($job) = @_;
410 482
411 if ($Coro::current == $Coro::main) { 483 if ($Coro::current == $Coro::main) {
412 my $time = Event::time; 484 my $time = EV::time;
413 485
414 # this is the main coro, too bad, we have to block 486 # this is the main coro, too bad, we have to block
415 # till the operation succeeds, freezing the server :/ 487 # till the operation succeeds, freezing the server :/
416 488
417 # TODO: use suspend/resume instead 489 LOG llevError, Carp::longmess "sync job";#d#
418 # (but this is cancel-safe) 490
419 my $freeze_guard = freeze_mainloop; 491 my $freeze_guard = freeze_mainloop;
420 492
421 my $busy = 1; 493 my $busy = 1;
422 my @res; 494 my @res;
423 495
424 (async { 496 (async {
497 $Coro::current->desc ("sync job coro");
425 @res = eval { $job->() }; 498 @res = eval { $job->() };
426 warn $@ if $@; 499 warn $@ if $@;
427 undef $busy; 500 undef $busy;
428 })->prio (Coro::PRIO_MAX); 501 })->prio (Coro::PRIO_MAX);
429 502
430 while ($busy) { 503 while ($busy) {
431 Coro::cede or Event::one_event; 504 if (Coro::nready) {
505 Coro::cede_notself;
506 } else {
507 EV::loop EV::LOOP_ONESHOT;
432 } 508 }
509 }
433 510
434 $time = Event::time - $time; 511 my $time = EV::time - $time;
435 512
436 LOG llevError | logBacktrace, Carp::longmess "long sync job"
437 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
438
439 $tick_start += $time; # do not account sync jobs to server load 513 $TICK_START += $time; # do not account sync jobs to server load
440 514
441 wantarray ? @res : $res[0] 515 wantarray ? @res : $res[0]
442 } else { 516 } else {
443 # we are in another coroutine, how wonderful, everything just works 517 # we are in another coroutine, how wonderful, everything just works
444 518
469=item fork_call { }, $args 543=item fork_call { }, $args
470 544
471Executes the given code block with the given arguments in a seperate 545Executes the given code block with the given arguments in a seperate
472process, returning the results. Everything must be serialisable with 546process, returning the results. Everything must be serialisable with
473Coro::Storable. May, of course, block. Note that the executed sub may 547Coro::Storable. May, of course, block. Note that the executed sub may
474never block itself or use any form of Event handling. 548never block itself or use any form of event handling.
475 549
476=cut 550=cut
477 551
478sub fork_call(&@) { 552sub fork_call(&@) {
479 my ($cb, @args) = @_; 553 my ($cb, @args) = @_;
480 554
481 # we seemingly have to make a local copy of the whole thing, 555 # we seemingly have to make a local copy of the whole thing,
482 # otherwise perl prematurely frees the stuff :/ 556 # otherwise perl prematurely frees the stuff :/
483 # TODO: investigate and fix (liekly this will be rather laborious) 557 # TODO: investigate and fix (likely this will be rather laborious)
484 558
485 my @res = Coro::Util::fork_eval { 559 my @res = Coro::Util::fork_eval {
486 reset_signals; 560 reset_signals;
487 &$cb 561 &$cb
488 }, @args; 562 }, @args;
489 563
490 wantarray ? @res : $res[-1] 564 wantarray ? @res : $res[-1]
491} 565}
492 566
567=item $coin = coin_from_name $name
568
569=cut
570
571our %coin_alias = (
572 "silver" => "silvercoin",
573 "silvercoin" => "silvercoin",
574 "silvercoins" => "silvercoin",
575 "gold" => "goldcoin",
576 "goldcoin" => "goldcoin",
577 "goldcoins" => "goldcoin",
578 "platinum" => "platinacoin",
579 "platinumcoin" => "platinacoin",
580 "platinumcoins" => "platinacoin",
581 "platina" => "platinacoin",
582 "platinacoin" => "platinacoin",
583 "platinacoins" => "platinacoin",
584 "royalty" => "royalty",
585 "royalties" => "royalty",
586);
587
588sub coin_from_name($) {
589 $coin_alias{$_[0]}
590 ? cf::arch::find $coin_alias{$_[0]}
591 : undef
592}
593
493=item $value = cf::db_get $family => $key 594=item $value = cf::db_get $family => $key
494 595
495Returns a single value from the environment database. 596Returns a single value from the environment database.
496 597
497=item cf::db_put $family => $key => $value 598=item cf::db_put $family => $key => $value
498 599
499Stores the given C<$value> in the family. It can currently store binary 600Stores the given C<$value> in the family. It can currently store binary
500data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 601data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
501 602
603=item $db = cf::db_table "name"
604
605Create and/or open a new database table. The string must not be "db" and must be unique
606within each server.
607
502=cut 608=cut
609
610sub db_table($) {
611 my ($name) = @_;
612 my $db = BDB::db_create $DB_ENV;
613
614 eval {
615 $db->set_flags (BDB::CHKSUM);
616
617 utf8::encode $name;
618 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
619 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
620 cf::cleanup "db_open(db): $!" if $!;
621 };
622 cf::cleanup "db_open(db): $@" if $@;
623
624 $db
625}
503 626
504our $DB; 627our $DB;
505 628
506sub db_init { 629sub db_init {
507 unless ($DB) {
508 $DB = BDB::db_create $DB_ENV;
509
510 cf::sync_job { 630 cf::sync_job {
511 eval { 631 $DB ||= db_table "db";
512 $DB->set_flags (BDB::CHKSUM);
513
514 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
515 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
516 cf::cleanup "db_open(db): $!" if $!;
517 };
518 cf::cleanup "db_open(db): $@" if $@;
519 };
520 } 632 };
521} 633}
522 634
523sub db_get($$) { 635sub db_get($$) {
524 my $key = "$_[0]/$_[1]"; 636 my $key = "$_[0]/$_[1]";
525 637
575 if (1) { 687 if (1) {
576 $md5 = 688 $md5 =
577 join "\x00", 689 join "\x00",
578 $processversion, 690 $processversion,
579 map { 691 map {
580 Coro::cede; 692 cf::cede_to_tick;
581 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 693 ($src->[$_], Digest::MD5::md5_hex $data[$_])
582 } 0.. $#$src; 694 } 0.. $#$src;
583 695
584 696
585 my $dbmd5 = db_get cache => "$id/md5"; 697 my $dbmd5 = db_get cache => "$id/md5";
623 735
624############################################################################# 736#############################################################################
625 737
626=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
627 739
628Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
629attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
630to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
631 743
632In the following description, CLASS can be any of C<global>, C<object> 744In the following description, CLASS can be any of C<global>, C<object>
633C<player>, C<client> or C<map> (i.e. the attachable objects in 745C<player>, C<client> or C<map> (i.e. the attachable objects in
634Crossfire TRT). 746Deliantra).
635 747
636=over 4 748=over 4
637 749
638=item $attachable->attach ($attachment, key => $value...) 750=item $attachable->attach ($attachment, key => $value...)
639 751
683=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
684 796
685Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
686given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
687 799
688Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
689that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
690 802
691These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
692 804
693=over 4 805=over 4
921 } 1033 }
922 1034
923 0 1035 0
924} 1036}
925 1037
926=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1038=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
927 1039
928=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1040=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
929 1041
930Generate an object-specific event with the given arguments. 1042Generate an object-specific event with the given arguments.
931 1043
937 1049
938=cut 1050=cut
939 1051
940############################################################################# 1052#############################################################################
941# object support 1053# object support
942#
943 1054
1055sub _object_equal($$);
1056sub _object_equal($$) {
1057 my ($a, $b) = @_;
1058
1059 return 0 unless (ref $a) eq (ref $b);
1060
1061 if ("HASH" eq ref $a) {
1062 my @ka = keys %$a;
1063 my @kb = keys %$b;
1064
1065 return 0 if @ka != @kb;
1066
1067 for (0 .. $#ka) {
1068 return 0 unless $ka[$_] eq $kb[$_];
1069 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1070 }
1071
1072 } elsif ("ARRAY" eq ref $a) {
1073
1074 return 0 if @$a != @$b;
1075
1076 for (0 .. $#$a) {
1077 return 0 unless _object_equal $a->[$_], $b->[$_];
1078 }
1079
1080 } elsif ($a ne $b) {
1081 return 0;
1082 }
1083
1084 1
1085}
1086
1087our $SLOW_MERGES;#d#
944sub _can_merge { 1088sub _can_merge {
945 my ($ob1, $ob2) = @_; 1089 my ($ob1, $ob2) = @_;
946 1090
947 local $Storable::canonical = 1; 1091 ++$SLOW_MERGES;#d#
948 my $fob1 = Storable::freeze $ob1;
949 my $fob2 = Storable::freeze $ob2;
950 1092
951 $fob1 eq $fob2 1093 # we do the slow way here
1094 return _object_equal $ob1, $ob2
952} 1095}
953 1096
954sub reattach { 1097sub reattach {
955 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
956 my ($obj) = @_; 1099 my ($obj) = @_;
957 1100
1101 # no longer needed after getting rid of delete_package?
958 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
959 1103
960 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
961 1105
962 @$registry = (); 1106 @$registry = ();
963 1107
978cf::attachable->attach ( 1122cf::attachable->attach (
979 prio => -1000000, 1123 prio => -1000000,
980 on_instantiate => sub { 1124 on_instantiate => sub {
981 my ($obj, $data) = @_; 1125 my ($obj, $data) = @_;
982 1126
983 $data = from_json $data; 1127 $data = decode_json $data;
984 1128
985 for (@$data) { 1129 for (@$data) {
986 my ($name, $args) = @$_; 1130 my ($name, $args) = @$_;
987 1131
988 $obj->attach ($name, %{$args || {} }); 1132 $obj->attach ($name, %{$args || {} });
1004sub object_freezer_save { 1148sub object_freezer_save {
1005 my ($filename, $rdata, $objs) = @_; 1149 my ($filename, $rdata, $objs) = @_;
1006 1150
1007 sync_job { 1151 sync_job {
1008 if (length $$rdata) { 1152 if (length $$rdata) {
1153 utf8::decode (my $decname = $filename);
1009 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
1010 $filename, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1011 1156
1012 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1013 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
1014 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1015 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1016 close $fh; 1164 aio_close $fh;
1017 1165
1018 if (@$objs) { 1166 if (@$objs) {
1019 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1020 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
1021 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1022 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1023 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1024 close $fh; 1175 aio_close $fh;
1025 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1026 } 1177 }
1027 } else { 1178 } else {
1028 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1029 } 1180 }
1030 1181
1031 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1032 } else { 1186 } else {
1033 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1034 } 1188 }
1035 } else { 1189 } else {
1036 aio_unlink $filename; 1190 aio_unlink $filename;
1037 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1038 } 1192 }
1039 } 1193 };
1040} 1194}
1041 1195
1042sub object_freezer_as_string { 1196sub object_freezer_as_string {
1043 my ($rdata, $objs) = @_; 1197 my ($rdata, $objs) = @_;
1044 1198
1056 or return; 1210 or return;
1057 1211
1058 unless (aio_stat "$filename.pst") { 1212 unless (aio_stat "$filename.pst") {
1059 (aio_load "$filename.pst", $av) >= 0 1213 (aio_load "$filename.pst", $av) >= 0
1060 or return; 1214 or return;
1215
1061 $av = eval { (Storable::thaw $av)->{objs} }; 1216 my $st = eval { Coro::Storable::thaw $av };
1217 $av = $st->{objs};
1062 } 1218 }
1063 1219
1220 utf8::decode (my $decname = $filename);
1064 warn sprintf "loading %s (%d)\n", 1221 warn sprintf "loading %s (%d,%d)\n",
1065 $filename, length $data, scalar @{$av || []}; 1222 $decname, length $data, scalar @{$av || []};
1223
1066 return ($data, $av); 1224 ($data, $av)
1067} 1225}
1068 1226
1069=head2 COMMAND CALLBACKS 1227=head2 COMMAND CALLBACKS
1070 1228
1071=over 4 1229=over 4
1125 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1126 1284
1127 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1128} 1286}
1129 1287
1288use File::Glob ();
1289
1130cf::player->attach ( 1290cf::player->attach (
1131 on_command => sub { 1291 on_command => sub {
1132 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1133 1293
1134 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1149 my ($type, $reply, @payload) = 1309 my ($type, $reply, @payload) =
1150 "ARRAY" eq ref $msg 1310 "ARRAY" eq ref $msg
1151 ? @$msg 1311 ? @$msg
1152 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1312 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1153 1313
1314 my @reply;
1315
1154 if (my $cb = $EXTCMD{$type}) { 1316 if (my $cb = $EXTCMD{$type}) {
1155 my @reply = $cb->($pl, @payload); 1317 @reply = $cb->($pl, @payload);
1156
1157 $pl->ext_reply ($reply, @reply)
1158 if $reply;
1159 } 1318 }
1319
1320 $pl->ext_reply ($reply, @reply)
1321 if $reply;
1322
1160 } else { 1323 } else {
1161 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1324 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1162 } 1325 }
1163 1326
1164 cf::override; 1327 cf::override;
1165 }, 1328 },
1166); 1329);
1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1167 1343
1168sub load_extensions { 1344sub load_extensions {
1169 cf::sync_job { 1345 cf::sync_job {
1170 my %todo; 1346 my %todo;
1171 1347
1191 1367
1192 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1193 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1194 1370
1195 $ext{source} = 1371 $ext{source} =
1196 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1197 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1198 . $source 1374 . $source
1199 . "\n};\n1"; 1375 . "\n};\n1";
1200 1376
1201 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
1217 my $msg = $@ ? "$v->{path}: $@\n" 1393 my $msg = $@ ? "$v->{path}: $@\n"
1218 : "$v->{base}: extension inactive.\n"; 1394 : "$v->{base}: extension inactive.\n";
1219 1395
1220 if (exists $v->{meta}{mandatory}) { 1396 if (exists $v->{meta}{mandatory}) {
1221 warn $msg; 1397 warn $msg;
1222 warn "mandatory extension failed to load, exiting.\n"; 1398 cf::cleanup "mandatory extension failed to load, exiting.";
1223 exit 1;
1224 } 1399 }
1225 1400
1226 warn $msg; 1401 warn $msg;
1227 } 1402 }
1228 1403
1242 1417
1243=back 1418=back
1244 1419
1245=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1246 1421
1247Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1248 1423
1249=cut 1424=cut
1250 1425
1251package cf::player; 1426package cf::player;
1252 1427
1253use Coro::AIO; 1428use Coro::AIO;
1254 1429
1255=head3 cf::player 1430=head3 cf::player
1256 1431
1257=over 4 1432=over 4
1433
1434=item cf::player::num_playing
1435
1436Returns the official number of playing players, as per the Crossfire metaserver rules.
1437
1438=cut
1439
1440sub num_playing {
1441 scalar grep
1442 $_->ob->map
1443 && !$_->hidden
1444 && !$_->ob->flag (cf::FLAG_WIZ),
1445 cf::player::list
1446}
1258 1447
1259=item cf::player::find $login 1448=item cf::player::find $login
1260 1449
1261Returns the given player object, loading it if necessary (might block). 1450Returns the given player object, loading it if necessary (might block).
1262 1451
1281 1470
1282sub exists($) { 1471sub exists($) {
1283 my ($login) = @_; 1472 my ($login) = @_;
1284 1473
1285 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1286 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1287} 1476}
1288 1477
1289sub find($) { 1478sub find($) {
1290 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1291 my $login = $_[0]; 1480 my $login = $_[0];
1298 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1487 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1299 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1488 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1300 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1489 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1301 aio_unlink +(playerdir $login) . "/$login.pl"; 1490 aio_unlink +(playerdir $login) . "/$login.pl";
1302 1491
1303 my $pl = load_pl path $login 1492 my $f = new_from_file cf::object::thawer path $login
1304 or return; 1493 or return;
1494
1495 my $pl = cf::player::load_pl $f
1496 or return;
1497
1498 local $cf::PLAYER_LOADING{$login} = $pl;
1499 $f->resolve_delayed_derefs;
1305 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1306 } 1501 }
1307 } 1502 }
1308} 1503}
1309 1504
1318 return if $pl->{deny_save}; 1513 return if $pl->{deny_save};
1319 1514
1320 aio_mkdir playerdir $pl, 0770; 1515 aio_mkdir playerdir $pl, 0770;
1321 $pl->{last_save} = $cf::RUNTIME; 1516 $pl->{last_save} = $cf::RUNTIME;
1322 1517
1518 cf::get_slot 0.01;
1519
1323 $pl->save_pl ($path); 1520 $pl->save_pl ($path);
1324 Coro::cede; 1521 cf::cede_to_tick;
1325} 1522}
1326 1523
1327sub new($) { 1524sub new($) {
1328 my ($login) = @_; 1525 my ($login) = @_;
1329 1526
1358 my ($pl) = @_; 1555 my ($pl) = @_;
1359 1556
1360 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1361 1558
1362 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1363 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1364 1561
1365 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1366 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1367 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1368 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1369 1568
1370 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1371 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
1407 or return []; 1606 or return [];
1408 1607
1409 my @logins; 1608 my @logins;
1410 1609
1411 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1611 my $path = path $login;
1612
1613 # a .pst is a dead give-away for a valid player
1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1412 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1413 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1414 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1619 }
1415 1620
1416 utf8::decode $login; 1621 utf8::decode $login;
1417 push @logins, $login; 1622 push @logins, $login;
1418 } 1623 }
1419 1624
1446 } 1651 }
1447 1652
1448 \@paths 1653 \@paths
1449} 1654}
1450 1655
1451=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1452 1657
1453Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1454
1455=cut
1456
1457sub expand_cfpod {
1458 ((my $self), (local $_)) = @_;
1459
1460 # escape & and <
1461 s/&/&amp;/g;
1462 s/(?<![BIUGH])</&lt;/g;
1463
1464 # this is buggy, it needs to properly take care of nested <'s
1465
1466 1 while
1467 # replace B<>, I<>, U<> etc.
1468 s/B<([^\>]*)>/<b>$1<\/b>/
1469 || s/I<([^\>]*)>/<i>$1<\/i>/
1470 || s/U<([^\>]*)>/<u>$1<\/u>/
1471 # replace G<male|female> tags
1472 || s{G<([^>|]*)\|([^>]*)>}{
1473 $self->gender ? $2 : $1
1474 }ge
1475 # replace H<hint text>
1476 || s{H<([^\>]*)>}
1477 {
1478 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1479 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1480 "")
1481 [$self->{hintmode}]
1482 }ge;
1483
1484 # create single paragraphs (very hackish)
1485 s/(?<=\S)\n(?=\w)/ /g;
1486
1487 # compress some whitespace
1488 s/\s+\n/\n/g; # ws line-ends
1489 s/\n\n+/\n/g; # double lines
1490 s/^\n+//; # beginning lines
1491 s/\n+$//; # ending lines
1492
1493 $_
1494}
1495
1496sub hintmode {
1497 $_[0]{hintmode} = $_[1] if @_ > 1;
1498 $_[0]{hintmode}
1499}
1500 1659
1501=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1502 1661
1503Sends an ext reply to the player. 1662Sends an ext reply to the player.
1504 1663
1571our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1572our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1573 1732
1574sub generate_random_map { 1733sub generate_random_map {
1575 my ($self, $rmp) = @_; 1734 my ($self, $rmp) = @_;
1735
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737
1576 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1577 $self->_create_random_map ( 1739 $self->_create_random_map (
1578 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1579 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1580 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1702 1864
1703# the temporary/swap location 1865# the temporary/swap location
1704sub save_path { 1866sub save_path {
1705 my ($self) = @_; 1867 my ($self) = @_;
1706 1868
1707 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1708 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1709} 1871}
1710 1872
1711# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1712sub uniq_path { 1874sub uniq_path {
1713 my ($self) = @_; 1875 my ($self) = @_;
1714 1876
1715 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1716 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1717}
1718
1719# and all this just because we cannot iterate over
1720# all maps in C++...
1721sub change_all_map_light {
1722 my ($change) = @_;
1723
1724 $_->change_map_light ($change)
1725 for grep $_->outdoor, values %cf::MAP;
1726} 1879}
1727 1880
1728sub decay_objects { 1881sub decay_objects {
1729 my ($self) = @_; 1882 my ($self) = @_;
1730 1883
1743 1896
1744sub load_header_from($) { 1897sub load_header_from($) {
1745 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1746 1899
1747 utf8::encode $path; 1900 utf8::encode $path;
1748 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1749 # or return;
1750
1751 $self->_load_header ($path)
1752 or return; 1902 or return;
1903
1904 $self->_load_header ($f)
1905 or return;
1906
1907 local $MAP_LOADING{$self->{path}} = $self;
1908 $f->resolve_delayed_derefs;
1753 1909
1754 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1755 1911
1756 1 1912 1
1757} 1913}
1811sub find { 1967sub find {
1812 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1813 1969
1814 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1815 1971
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1816 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1817 1974
1818 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1819 my $guard = cf::lock_acquire "map_find:$path";
1820 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1821 or return; 1977 or return;
1822 1978
1823 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1824 1980
1826 or return; 1982 or return;
1827 1983
1828 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1829 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
1830 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
1988 undef $guard1;
1831 $map->reset; 1989 $map->reset;
1832 undef $guard;
1833 return find $path; 1990 return find $path;
1834 } 1991 }
1835 1992
1836 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
1837 } 1994 }
1846 local $self->{deny_reset} = 1; # loading can take a long time 2003 local $self->{deny_reset} = 1; # loading can take a long time
1847 2004
1848 my $path = $self->{path}; 2005 my $path = $self->{path};
1849 2006
1850 { 2007 {
1851 my $guard = cf::lock_acquire "map_load:$path"; 2008 my $guard = cf::lock_acquire "map_data:$path";
1852 2009
2010 return unless $self->valid;
1853 return if $self->in_memory != cf::MAP_SWAPPED; 2011 return unless $self->in_memory == cf::MAP_SWAPPED;
1854 2012
1855 $self->in_memory (cf::MAP_LOADING); 2013 $self->in_memory (cf::MAP_LOADING);
1856 2014
1857 $self->alloc; 2015 $self->alloc;
1858 2016
1859 $self->pre_load; 2017 $self->pre_load;
1860 Coro::cede; 2018 cf::cede_to_tick;
1861 2019
2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block;
1862 $self->_load_objects ($self->{load_path}, 1) 2022 $self->_load_objects ($f)
1863 or return; 2023 or return;
1864 2024
1865 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
1866 if delete $self->{load_original}; 2026 if delete $self->{load_original};
1867 2027
1868 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
1869 utf8::encode $uniq; 2029 utf8::encode $uniq;
1870 if (aio_open $uniq, O_RDONLY, 0) { 2030 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) {
1871 $self->clear_unique_items; 2032 $self->clear_unique_items;
1872 $self->_load_objects ($uniq, 0); 2033 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs;
2035 }
1873 } 2036 }
1874 } 2037 }
1875 2038
1876 Coro::cede; 2039 $f->resolve_delayed_derefs;
2040
2041 cf::cede_to_tick;
1877 # now do the right thing for maps 2042 # now do the right thing for maps
1878 $self->link_multipart_objects; 2043 $self->link_multipart_objects;
1879 $self->difficulty ($self->estimate_difficulty) 2044 $self->difficulty ($self->estimate_difficulty)
1880 unless $self->difficulty; 2045 unless $self->difficulty;
1881 Coro::cede; 2046 cf::cede_to_tick;
1882 2047
1883 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
1884 $self->decay_objects; 2049 $self->decay_objects;
1885 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
1886 $self->update_buttons; 2051 $self->update_buttons;
1887 Coro::cede; 2052 cf::cede_to_tick;
1888 $self->set_darkness_map;
1889 Coro::cede;
1890 $self->activate; 2053 $self->activate;
1891 } 2054 }
1892 2055
1893 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1894 $self->last_access ($cf::RUNTIME); 2057 $self->last_access ($cf::RUNTIME);
1895 2058
1896 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
1897 } 2060 }
1898 2061
1899 $self->post_load; 2062 $self->post_load;
1900} 2063}
1901 2064
1944} 2107}
1945 2108
1946sub do_load_sync { 2109sub do_load_sync {
1947 my ($map) = @_; 2110 my ($map) = @_;
1948 2111
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main;
2114
1949 cf::sync_job { $map->load }; 2115 cf::sync_job { $map->load };
1950} 2116}
1951 2117
1952our %MAP_PREFETCH; 2118our %MAP_PREFETCH;
1953our $MAP_PREFETCHER = undef; 2119our $MAP_PREFETCHER = undef;
1954 2120
1955sub find_async { 2121sub find_async {
1956 my ($path, $origin) = @_; 2122 my ($path, $origin, $load) = @_;
1957 2123
1958 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
1959 2125
1960 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
1961 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1962 } 2128 }
1963 2129
1964 undef $MAP_PREFETCH{$path}; 2130 $MAP_PREFETCH{$path} |= $load;
2131
1965 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2133 $Coro::current->{desc} = "map prefetcher";
2134
1966 while (%MAP_PREFETCH) { 2135 while (%MAP_PREFETCH) {
1967 for my $path (keys %MAP_PREFETCH) { 2136 while (my ($k, $v) = each %MAP_PREFETCH) {
1968 if (my $map = find $path) { 2137 if (my $map = find $k) {
1969 $map->load; 2138 $map->load if $v;
1970 } 2139 }
1971 2140
1972 delete $MAP_PREFETCH{$path}; 2141 delete $MAP_PREFETCH{$k};
1973 } 2142 }
1974 } 2143 }
1975 undef $MAP_PREFETCHER; 2144 undef $MAP_PREFETCHER;
1976 }; 2145 };
1977 $MAP_PREFETCHER->prio (6); 2146 $MAP_PREFETCHER->prio (6);
1980} 2149}
1981 2150
1982sub save { 2151sub save {
1983 my ($self) = @_; 2152 my ($self) = @_;
1984 2153
1985 my $lock = cf::lock_acquire "map_data:" . $self->path; 2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
1986 2155
1987 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
1988 2157
1989 return unless $self->dirty; 2158 return unless $self->dirty;
1990 2159
1996 return if $self->{deny_save}; 2165 return if $self->{deny_save};
1997 2166
1998 local $self->{last_access} = $self->last_access;#d# 2167 local $self->{last_access} = $self->last_access;#d#
1999 2168
2000 cf::async { 2169 cf::async {
2170 $Coro::current->{desc} = "map player save";
2001 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
2002 }; 2172 };
2173
2174 cf::get_slot 0.02;
2003 2175
2004 if ($uniq) { 2176 if ($uniq) {
2005 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2006 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2007 } else { 2179 } else {
2013 my ($self) = @_; 2185 my ($self) = @_;
2014 2186
2015 # save first because save cedes 2187 # save first because save cedes
2016 $self->save; 2188 $self->save;
2017 2189
2018 my $lock = cf::lock_acquire "map_data:" . $self->path; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2019 2191
2020 return if $self->players; 2192 return if $self->players;
2021 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
2022 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2023 2195
2196 $self->in_memory (cf::MAP_SWAPPED);
2197
2198 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP;
2024 $self->clear; 2200 $self->clear;
2025 $self->in_memory (cf::MAP_SWAPPED);
2026} 2201}
2027 2202
2028sub reset_at { 2203sub reset_at {
2029 my ($self) = @_; 2204 my ($self) = @_;
2030 2205
2062 if $uniq; 2237 if $uniq;
2063 } 2238 }
2064 2239
2065 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
2066 2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2067 $self->clear; 2244 $self->clear;
2068
2069 $_->clear_links_to ($self) for values %cf::MAP;
2070 2245
2071 $self->unlink_save; 2246 $self->unlink_save;
2072 $self->destroy; 2247 $self->destroy;
2073} 2248}
2074 2249
2075my $nuke_counter = "aaaa"; 2250my $nuke_counter = "aaaa";
2076 2251
2077sub nuke { 2252sub nuke {
2078 my ($self) = @_; 2253 my ($self) = @_;
2079 2254
2255 {
2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257
2080 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
2081 2259
2082 $self->unlink_save; 2260 $self->unlink_save;
2083 2261
2084 bless $self, "cf::map"; 2262 bless $self, "cf::map";
2085 delete $self->{deny_reset}; 2263 delete $self->{deny_reset};
2086 $self->{deny_save} = 1; 2264 $self->{deny_save} = 1;
2087 $self->reset_timeout (1); 2265 $self->reset_timeout (1);
2088 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2089 2267
2090 $cf::MAP{$self->path} = $self; 2268 $cf::MAP{$self->path} = $self;
2269 }
2091 2270
2092 $self->reset; # polite request, might not happen 2271 $self->reset; # polite request, might not happen
2093} 2272}
2094 2273
2095=item $maps = cf::map::tmp_maps 2274=item $maps = cf::map::tmp_maps
2137 2316
2138sub unique_maps() { 2317sub unique_maps() {
2139 [ 2318 [
2140 map { 2319 map {
2141 utf8::decode $_; 2320 utf8::decode $_;
2142 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2143 ? normalise $_ 2324 : normalise $_
2144 : ()
2145 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2146 ] 2326 ]
2147} 2327}
2148 2328
2149package cf;
2150
2151=back 2329=back
2152 2330
2153=head3 cf::object 2331=head3 cf::object
2154 2332
2155=cut 2333=cut
2158 2336
2159=over 4 2337=over 4
2160 2338
2161=item $ob->inv_recursive 2339=item $ob->inv_recursive
2162 2340
2163Returns the inventory of the object _and_ their inventories, recursively. 2341Returns the inventory of the object I<and> their inventories, recursively,
2342but I<not> the object itself.
2164 2343
2165=cut 2344=cut
2166 2345
2167sub inv_recursive_; 2346sub inv_recursive_;
2168sub inv_recursive_ { 2347sub inv_recursive_ {
2171 2350
2172sub inv_recursive { 2351sub inv_recursive {
2173 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2174} 2353}
2175 2354
2355=item $ref = $ob->ref
2356
2357Creates and returns a persistent reference to an object that can be stored as a string.
2358
2359=item $ob = cf::object::deref ($refstring)
2360
2361returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2362even if the object actually exists. May block.
2363
2364=cut
2365
2366sub deref {
2367 my ($ref) = @_;
2368
2369 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2370 my ($uuid, $name) = ($1, $2);
2371 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2372 or return;
2373 $pl->ob->uuid eq $uuid
2374 or return;
2375
2376 $pl->ob
2377 } else {
2378 warn "$ref: cannot resolve object reference\n";
2379 undef
2380 }
2381}
2382
2176package cf; 2383package cf;
2177 2384
2178=back 2385=back
2179 2386
2180=head3 cf::object::player 2387=head3 cf::object::player
2186Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2393Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2187can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2188dialogue with the given NPC character. 2395dialogue with the given NPC character.
2189 2396
2190=cut 2397=cut
2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2191 2412
2192# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2193# with dialog boxes. 2414# with dialog boxes.
2194#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2195sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2207 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2208 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2209 2430
2210 } else { 2431 } else {
2211 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2212 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2213 } 2434 }
2214 } 2435 }
2215} 2436}
2216 2437
2217=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2242 2463
2243=item $player_object->enter_link 2464=item $player_object->enter_link
2244 2465
2245Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2246 2467
2247The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2248I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2249 2472
2250Will never block. 2473Will never block.
2251 2474
2252=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2253 2476
2311 2534
2312 $map->load; 2535 $map->load;
2313 $map->load_neighbours; 2536 $map->load_neighbours;
2314 2537
2315 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2316 $self->activate_recursive; 2540 $self->activate_recursive;
2317 2541
2318 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2319 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2320} 2544}
2325her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2326that has to return the map if sucecssful, and then unfreezes the player on 2550that has to return the map if sucecssful, and then unfreezes the player on
2327the new (success) or old (failed) map position. In either case, $done will 2551the new (success) or old (failed) map position. In either case, $done will
2328be called at the end of this process. 2552be called at the end of this process.
2329 2553
2554Note that $check will be called with a potentially non-loaded map, so if
2555it needs a loaded map it has to call C<< ->load >>.
2556
2330=cut 2557=cut
2331 2558
2332our $GOTOGEN; 2559our $GOTOGEN;
2333 2560
2334sub cf::object::player::goto { 2561sub cf::object::player::goto {
2338 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2339 2566
2340 $self->enter_link; 2567 $self->enter_link;
2341 2568
2342 (async { 2569 (async {
2570 $Coro::current->{desc} = "player::goto $path $x $y";
2571
2572 # *tag paths override both path and x|y
2573 if ($path =~ /^\*(.*)$/) {
2574 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2575 my $ob = $obs[rand @obs];
2576
2577 # see if we actually can go there
2578 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2579 $ob = $obs[rand @obs];
2580 } else {
2581 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2582 }
2583 # else put us there anyways for now #d#
2584
2585 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2586 } else {
2587 ($path, $x, $y) = (undef, undef, undef);
2588 }
2589 }
2590
2343 my $map = eval { 2591 my $map = eval {
2344 my $map = cf::map::find $path; 2592 my $map = defined $path ? cf::map::find $path : undef;
2345 2593
2346 if ($map) { 2594 if ($map) {
2347 $map = $map->customise_for ($self); 2595 $map = $map->customise_for ($self);
2348 $map = $check->($map) if $check && $map; 2596 $map = $check->($map) if $check && $map;
2349 } else { 2597 } else {
2350 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2598 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2351 } 2599 }
2352 2600
2353 $map 2601 $map
2354 }; 2602 };
2355 2603
2391} 2639}
2392 2640
2393sub prepare_random_map { 2641sub prepare_random_map {
2394 my ($exit) = @_; 2642 my ($exit) = @_;
2395 2643
2396 my $guard = cf::lock_acquire "exit_prepare:$exit";
2397
2398 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2399 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2400 # that depends on the exit object 2646 # that depends on the exit object
2401 2647
2402 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
2404 if ($exit->map) { 2650 if ($exit->map) {
2405 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2406 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2407 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2408 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2409 } 2657 }
2410 2658
2411 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2412 2660
2413 my $data = cf::to_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2414 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2415 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2416 2664
2417 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2418 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2419 undef $fh; 2667 undef $fh;
2420 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2421 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2422 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2423 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2424 } 2676 }
2425} 2677}
2426 2678
2427sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2428 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2429 2681
2430 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2431 2683
2432 if ($exit->slaying eq "/!") {
2433 #TODO: this should de-fi-ni-te-ly not be a sync-job
2434 # the problem is that $exit might not survive long enough
2435 # so it needs to be done right now, right here
2436 cf::sync_job { prepare_random_map $exit };
2437 }
2438
2439 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2440 my $hp = $exit->stats->hp;
2441 my $sp = $exit->stats->sp;
2442
2443 $self->enter_link; 2684 $self->enter_link;
2444 2685
2445 # if exit is damned, update players death & WoR home-position
2446 $self->contr->savebed ($slaying, $hp, $sp)
2447 if $exit->flag (FLAG_DAMNED);
2448
2449 (async { 2686 (async {
2450 $self->deactivate_recursive; # just to be sure 2687 $Coro::current->{desc} = "enter_exit";
2688
2451 unless (eval { 2689 unless (eval {
2690 $self->deactivate_recursive; # just to be sure
2691
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2701 my $x = $exit->stats->hp;
2702 my $y = $exit->stats->sp;
2703
2452 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2453 2705
2706 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y)
2708 if $exit->flag (cf::FLAG_DAMNED);
2709
2454 1; 2710 1
2455 }) { 2711 }) {
2456 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2457 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2458 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2459 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2460 2716
2461 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
2489the message, with C<log> being the default. If C<$color> is negative, suppress 2745the message, with C<log> being the default. If C<$color> is negative, suppress
2490the message unless the client supports the msg packet. 2746the message unless the client supports the msg packet.
2491 2747
2492=cut 2748=cut
2493 2749
2750# non-persistent channels (usually the info channel)
2751our %CHANNEL = (
2752 "c/identify" => {
2753 id => "infobox",
2754 title => "Identify",
2755 reply => undef,
2756 tooltip => "Items recently identified",
2757 },
2758 "c/examine" => {
2759 id => "infobox",
2760 title => "Examine",
2761 reply => undef,
2762 tooltip => "Signs and other items you examined",
2763 },
2764 "c/book" => {
2765 id => "infobox",
2766 title => "Book",
2767 reply => undef,
2768 tooltip => "The contents of a note or book",
2769 },
2770 "c/lookat" => {
2771 id => "infobox",
2772 title => "Look",
2773 reply => undef,
2774 tooltip => "What you saw there",
2775 },
2776 "c/who" => {
2777 id => "infobox",
2778 title => "Players",
2779 reply => undef,
2780 tooltip => "Shows players who are currently online",
2781 },
2782 "c/body" => {
2783 id => "infobox",
2784 title => "Body Parts",
2785 reply => undef,
2786 tooltip => "Shows which body parts you posess and are available",
2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2824 "c/uptime" => {
2825 id => "infobox",
2826 title => "Uptime",
2827 reply => undef,
2828 tooltip => "How long the server has been running since last restart",
2829 },
2830 "c/mapinfo" => {
2831 id => "infobox",
2832 title => "Map Info",
2833 reply => undef,
2834 tooltip => "Information related to the maps",
2835 },
2836 "c/party" => {
2837 id => "party",
2838 title => "Party",
2839 reply => "gsay ",
2840 tooltip => "Messages and chat related to your party",
2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2850);
2851
2494sub cf::client::send_msg { 2852sub cf::client::send_msg {
2495 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2496 2854
2497 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2498 2857
2499 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2500 2859
2860 # check predefined channels, for the benefit of C
2861 if ($CHANNEL{$channel}) {
2862 $channel = $CHANNEL{$channel};
2863
2864 $self->ext_msg (channel_info => $channel);
2865 $channel = $channel->{id};
2866
2501 if (ref $channel) { 2867 } elsif (ref $channel) {
2502 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2503 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2504 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2505 $self->ext_msg (channel_info => $channel); 2871 $self->ext_msg (channel_info => $channel);
2506 } 2872 }
2508 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2509 } 2875 }
2510 2876
2511 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2512 2878
2513 if ($self->can_msg) {
2514 # default colour, mask it out 2879 # default colour, mask it out
2515 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2516 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2517 2882
2518 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2519 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2520 } else { 2886 );
2521 if ($color >= 0) {
2522 # replace some tags by gcfclient-compatible ones
2523 for ($msg) {
2524 1 while
2525 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2526 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2527 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2528 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2529 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2530 }
2531 2887
2532 $color &= cf::NDI_COLOR_MASK; 2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2533 2891
2534 utf8::encode $msg; 2892 # split very large packets
2535 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2536 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2537 # COMMAND/INFO 2895 $pkt = "frag";
2538 $self->send_packet ("drawextinfo $color 10 8 $msg")
2539 } else {
2540 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2541 $self->send_packet ("drawinfo $color $msg")
2542 }
2543 }
2544 } 2896 }
2897
2898 $self->send_packet ($pkt);
2545} 2899}
2546 2900
2547=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2548 2902
2549Sends an ext event to the client. 2903Sends an ext event to the client.
2551=cut 2905=cut
2552 2906
2553sub cf::client::ext_msg($$@) { 2907sub cf::client::ext_msg($$@) {
2554 my ($self, $type, @msg) = @_; 2908 my ($self, $type, @msg) = @_;
2555 2909
2556 my $extcmd = $self->extcmd;
2557
2558 if ($extcmd == 2) { 2910 if ($self->extcmd == 2) {
2559 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2560 } elsif ($extcmd == 1) { # TODO: remove 2912 } elsif ($self->extcmd == 1) { # TODO: remove
2561 push @msg, msgtype => "event_$type"; 2913 push @msg, msgtype => "event_$type";
2562 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2563 } 2915 }
2564} 2916}
2565 2917
2572sub cf::client::ext_reply($$@) { 2924sub cf::client::ext_reply($$@) {
2573 my ($self, $id, @msg) = @_; 2925 my ($self, $id, @msg) = @_;
2574 2926
2575 if ($self->extcmd == 2) { 2927 if ($self->extcmd == 2) {
2576 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2577 } elsif ($self->ns->extcmd == 1) { 2929 } elsif ($self->extcmd == 1) {
2578 #TODO: version 1, remove 2930 #TODO: version 1, remove
2579 unshift @msg, msgtype => "reply", msgid => $id; 2931 unshift @msg, msgtype => "reply", msgid => $id;
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 2933 }
2582} 2934}
2646 my ($type, $reply, @payload) = 2998 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 2999 "ARRAY" eq ref $msg
2648 ? @$msg 3000 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3001 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3002
3003 my @reply;
3004
2651 if (my $cb = $EXTICMD{$type}) { 3005 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3006 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3007 }
3008
3009 $ns->ext_reply ($reply, @reply)
3010 if $reply;
3011
2657 } else { 3012 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3013 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3014 }
2660 3015
2661 cf::override; 3016 cf::override;
2721=pod 3076=pod
2722 3077
2723The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
2724 3079
2725 cf::object 3080 cf::object
2726 contr pay_amount pay_player map x y force_find force_add 3081 contr pay_amount pay_player map x y force_find force_add destroy
2727 insert remove name archname title slaying race 3082 insert remove name archname title slaying race decrease split
3083 value
2728 3084
2729 cf::object::player 3085 cf::object::player
2730 player 3086 player
2731 3087
2732 cf::player 3088 cf::player
2737 3093
2738=cut 3094=cut
2739 3095
2740for ( 3096for (
2741 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2742 insert remove inv name archname title slaying race)], 3098 insert remove inv nrof name archname title slaying race
3099 decrease split destroy change_exp value msg lore send_msg)],
2743 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2744 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
2745 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2746) { 3103) {
2747 no strict 'refs'; 3104 no strict 'refs';
2748 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
2749 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2766 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
2767 3124
2768 my $qcode = $code; 3125 my $qcode = $code;
2769 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2770 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
2771 3130
2772 local $_; 3131 local $_;
2773 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
2774 3133
2775 my $eval = 3134 my $eval =
2823# the server's init and main functions 3182# the server's init and main functions
2824 3183
2825sub load_facedata($) { 3184sub load_facedata($) {
2826 my ($path) = @_; 3185 my ($path) = @_;
2827 3186
3187 # HACK to clear player env face cache, we need some signal framework
3188 # for this (global event?)
3189 %ext::player_env::MUSIC_FACE_CACHE = ();
3190
2828 my $enc = JSON::XS->new->utf8->canonical; 3191 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2829 3192
2830 warn "loading facedata from $path\n"; 3193 warn "loading facedata from $path\n";
2831 3194
2832 my $facedata; 3195 my $facedata;
2833 0 < aio_load $path, $facedata 3196 0 < aio_load $path, $facedata
2839 or cf::cleanup "$path: version mismatch, cannot proceed."; 3202 or cf::cleanup "$path: version mismatch, cannot proceed.";
2840 3203
2841 # patch in the exptable 3204 # patch in the exptable
2842 $facedata->{resource}{"res/exp_table"} = { 3205 $facedata->{resource}{"res/exp_table"} = {
2843 type => FT_RSRC, 3206 type => FT_RSRC,
2844 data => $enc->encode ([map cf::level_to_min_exp $_, 0 .. cf::settings->max_level]), 3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
2845 }; 3208 };
2846 cf::cede_to_tick; 3209 cf::cede_to_tick;
2847 3210
2848 { 3211 {
2849 my $faces = $facedata->{faceinfo}; 3212 my $faces = $facedata->{faceinfo};
2850 3213
2851 while (my ($face, $info) = each %$faces) { 3214 while (my ($face, $info) = each %$faces) {
2852 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3215 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216
2853 cf::face::set_visibility $idx, $info->{visibility}; 3217 cf::face::set_visibility $idx, $info->{visibility};
2854 cf::face::set_magicmap $idx, $info->{magicmap}; 3218 cf::face::set_magicmap $idx, $info->{magicmap};
2855 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2856 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2857 3221
2858 cf::cede_to_tick; 3222 cf::cede_to_tick;
2859 } 3223 }
2860 3224
2861 while (my ($face, $info) = each %$faces) { 3225 while (my ($face, $info) = each %$faces) {
2862 next unless $info->{smooth}; 3226 next unless $info->{smooth};
3227
2863 my $idx = cf::face::find $face 3228 my $idx = cf::face::find $face
2864 or next; 3229 or next;
3230
2865 if (my $smooth = cf::face::find $info->{smooth}) { 3231 if (my $smooth = cf::face::find $info->{smooth}) {
2866 cf::face::set_smooth $idx, $smooth; 3232 cf::face::set_smooth $idx, $smooth;
2867 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2868 } else { 3234 } else {
2869 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3235 warn "smooth face '$info->{smooth}' not found for face '$face'";
2887 { 3253 {
2888 # TODO: for gcfclient pleasure, we should give resources 3254 # TODO: for gcfclient pleasure, we should give resources
2889 # that gcfclient doesn't grok a >10000 face index. 3255 # that gcfclient doesn't grok a >10000 face index.
2890 my $res = $facedata->{resource}; 3256 my $res = $facedata->{resource};
2891 3257
2892 my $soundconf = delete $res->{"res/sound.conf"};
2893
2894 while (my ($name, $info) = each %$res) { 3258 while (my ($name, $info) = each %$res) {
3259 if (defined $info->{type}) {
2895 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3260 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2896 my $data; 3261 my $data;
2897 3262
2898 if ($info->{type} & 1) { 3263 if ($info->{type} & 1) {
2899 # prepend meta info 3264 # prepend meta info
2900 3265
2901 my $meta = $enc->encode ({ 3266 my $meta = $enc->encode ({
2902 name => $name, 3267 name => $name,
2903 %{ $info->{meta} || {} }, 3268 %{ $info->{meta} || {} },
2904 }); 3269 });
2905 3270
2906 $data = pack "(w/a*)*", $meta, $info->{data}; 3271 $data = pack "(w/a*)*", $meta, $info->{data};
3272 } else {
3273 $data = $info->{data};
3274 }
3275
3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type};
3278 } else {
3279 $RESOURCE{$name} = $info;
2907 } 3280 }
2908 3281
2909 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
2910 cf::face::set_type $idx, $info->{type};
2911
2912 cf::cede_to_tick; 3282 cf::cede_to_tick;
2913 } 3283 }
2914
2915 if ($soundconf) {
2916 $soundconf = $enc->decode (delete $soundconf->{data});
2917
2918 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2919 my $sound = $soundconf->{compat}[$_]
2920 or next;
2921
2922 my $face = cf::face::find "sound/$sound->[1]";
2923 cf::sound::set $sound->[0] => $face;
2924 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2925 }
2926
2927 while (my ($k, $v) = each %{$soundconf->{event}}) {
2928 my $face = cf::face::find "sound/$v";
2929 cf::sound::set $k => $face;
2930 }
2931 }
2932 } 3284 }
3285
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2933 3287
2934 1 3288 1
2935} 3289}
3290
3291cf::global->attach (on_resource_update => sub {
3292 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3293 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3294
3295 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3296 my $sound = $soundconf->{compat}[$_]
3297 or next;
3298
3299 my $face = cf::face::find "sound/$sound->[1]";
3300 cf::sound::set $sound->[0] => $face;
3301 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3302 }
3303
3304 while (my ($k, $v) = each %{$soundconf->{event}}) {
3305 my $face = cf::face::find "sound/$v";
3306 cf::sound::set $k => $face;
3307 }
3308 }
3309});
2936 3310
2937register_exticmd fx_want => sub { 3311register_exticmd fx_want => sub {
2938 my ($ns, $want) = @_; 3312 my ($ns, $want) = @_;
2939 3313
2940 while (my ($k, $v) = each %$want) { 3314 while (my ($k, $v) = each %$want) {
2941 $ns->fx_want ($k, $v); 3315 $ns->fx_want ($k, $v);
2942 } 3316 }
2943}; 3317};
2944 3318
3319sub load_resource_file($) {
3320 my $guard = lock_acquire "load_resource_file";
3321
3322 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100;
3324 cf::arch::commit_load;
3325
3326 $status
3327}
3328
2945sub reload_regions { 3329sub reload_regions {
3330 # HACK to clear player env face cache, we need some signal framework
3331 # for this (global event?)
3332 %ext::player_env::MUSIC_FACE_CACHE = ();
3333
2946 load_resource_file "$MAPDIR/regions" 3334 load_resource_file "$MAPDIR/regions"
2947 or die "unable to load regions file\n"; 3335 or die "unable to load regions file\n";
2948 3336
2949 for (cf::region::list) { 3337 for (cf::region::list) {
2950 $_->{match} = qr/$_->{match}/ 3338 $_->{match} = qr/$_->{match}/
2958} 3346}
2959 3347
2960sub reload_archetypes { 3348sub reload_archetypes {
2961 load_resource_file "$DATADIR/archetypes" 3349 load_resource_file "$DATADIR/archetypes"
2962 or die "unable to load archetypes\n"; 3350 or die "unable to load archetypes\n";
2963 #d# NEED to laod twice to resolve forward references
2964 # this really needs to be done in an extra post-pass
2965 # (which needs to be synchronous, so solve it differently)
2966 load_resource_file "$DATADIR/archetypes"
2967 or die "unable to load archetypes\n";
2968} 3351}
2969 3352
2970sub reload_treasures { 3353sub reload_treasures {
2971 load_resource_file "$DATADIR/treasures" 3354 load_resource_file "$DATADIR/treasures"
2972 or die "unable to load treasurelists\n"; 3355 or die "unable to load treasurelists\n";
2973} 3356}
2974 3357
2975sub reload_resources { 3358sub reload_resources {
2976 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
2977 3360
3361 reload_facedata;
3362 reload_archetypes;
2978 reload_regions; 3363 reload_regions;
2979 reload_facedata;
2980 #reload_archetypes;#d#
2981 reload_archetypes;
2982 reload_treasures; 3364 reload_treasures;
2983 3365
2984 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
2985} 3367}
2986 3368
2987sub init { 3369sub reload_config {
2988 reload_resources;
2989}
2990
2991sub cfg_load {
2992 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
2993 or return; 3371 or return;
2994 3372
2995 local $/; 3373 local $/;
2996 *CFG = YAML::Syck::Load <$fh>; 3374 *CFG = YAML::Load <$fh>;
2997 3375
2998 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2999 3377
3000 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3378 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3001 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3379 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3007 }; 3385 };
3008 warn $@ if $@; 3386 warn $@ if $@;
3009 } 3387 }
3010} 3388}
3011 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3012sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
3013 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3014 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3015 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3016 (async { 3436 (async {
3017 Event::one_event; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT;
3018 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3019 }; 3440 };
3020 3441
3021 cfg_load; 3442 evthread_start IO::AIO::poll_fileno;
3443
3444 cf::sync_job {
3445 reload_resources;
3446 reload_config;
3022 db_init; 3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3023 load_extensions; 3460 load_extensions;
3024 3461
3025 $TICK_WATCHER->start; 3462 utime time, time, $RUNTIMEFILE;
3026 Event::loop; 3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3468 };
3469
3470 main_loop;
3027} 3471}
3028 3472
3029############################################################################# 3473#############################################################################
3030# initialisation and cleanup 3474# initialisation and cleanup
3031 3475
3032# install some emergency cleanup handlers 3476# install some emergency cleanup handlers
3033BEGIN { 3477BEGIN {
3478 our %SIGWATCHER = ();
3034 for my $signal (qw(INT HUP TERM)) { 3479 for my $signal (qw(INT HUP TERM)) {
3035 Event->signal ( 3480 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3036 reentrant => 0,
3037 data => WF_AUTOCANCEL,
3038 signal => $signal,
3039 prio => 0,
3040 cb => sub {
3041 cf::cleanup "SIG$signal"; 3481 cf::cleanup "SIG$signal";
3042 },
3043 ); 3482 };
3044 } 3483 }
3045} 3484}
3046 3485
3047sub write_runtime { 3486sub write_runtime_sync {
3048 my $runtime = "$LOCALDIR/runtime";
3049
3050 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3051 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3052 3489
3053 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3054 3491
3055 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
3056 3493
3057 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3058 or return; 3495 or return;
3059 3496
3060 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
3061 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
3062 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
3072 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
3073 3510
3074 close $fh 3511 close $fh
3075 or return; 3512 or return;
3076 3513
3077 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3078 and return; 3515 and return;
3079 3516
3080 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3081 3518
3082 1 3519 1
3520}
3521
3522our $uuid_lock;
3523our $uuid_skip;
3524
3525sub write_uuid_sync($) {
3526 $uuid_skip ||= $_[0];
3527
3528 return if $uuid_lock;
3529 local $uuid_lock = 1;
3530
3531 my $uuid = "$LOCALDIR/uuid";
3532
3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3534 or return;
3535
3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3544 $uuid_skip = 0;
3545
3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3547 and return;
3548
3549 # always fsync - this file is important
3550 aio_fsync $fh
3551 and return;
3552
3553 close $fh
3554 or return;
3555
3556 aio_rename "$uuid~", $uuid
3557 and return;
3558
3559 warn "uuid file written ($value).\n";
3560
3561 1
3562
3563}
3564
3565sub write_uuid($$) {
3566 my ($skip, $sync) = @_;
3567
3568 $sync ? write_uuid_sync $skip
3569 : async { write_uuid_sync $skip };
3083} 3570}
3084 3571
3085sub emergency_save() { 3572sub emergency_save() {
3086 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3087 3574
3088 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3089 3576
3090 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3091 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3092 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3093 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3094 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3095 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3096 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3097 $pl->valid or next; 3589 $pl->valid or next;
3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3098 $pl->save; 3591 $pl->save;
3099 } 3592 }
3100 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3101 3594
3102 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3103 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3104 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3105 $map->valid or next; 3598 $map->valid or next;
3106 $map->save; 3599 $map->save;
3107 } 3600 }
3108 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3109 3602
3110 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3111 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3112 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3606
3607 warn "emergency_perl_save: begin write uuid\n";
3608 write_uuid_sync 1;
3609 warn "emergency_perl_save: end write uuid\n";
3113 }; 3610 };
3114 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3115 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3116} 3618}
3117 3619
3118sub post_cleanup { 3620sub post_cleanup {
3119 my ($make_core) = @_; 3621 my ($make_core) = @_;
3120 3622
3121 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
3122 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3628}
3629
3630# a safer delete_package, copied from Symbol
3631sub clear_package($) {
3632 my $pkg = shift;
3633
3634 # expand to full symbol table name if needed
3635 unless ($pkg =~ /^main::.*::$/) {
3636 $pkg = "main$pkg" if $pkg =~ /^::/;
3637 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3638 $pkg .= '::' unless $pkg =~ /::$/;
3639 }
3640
3641 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3642 my $stem_symtab = *{$stem}{HASH};
3643
3644 defined $stem_symtab and exists $stem_symtab->{$leaf}
3645 or return;
3646
3647 # clear all symbols
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 }
3653 warn "cleared package $pkg\n";#d#
3123} 3654}
3124 3655
3125sub do_reload_perl() { 3656sub do_reload_perl() {
3126 # can/must only be called in main 3657 # can/must only be called in main
3127 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3128 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3129 return; 3660 return;
3130 } 3661 }
3131 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
3132 warn "reloading..."; 3668 warn "reloading...";
3133 3669
3134 warn "entering sync_job"; 3670 warn "entering sync_job";
3135 3671
3136 cf::sync_job { 3672 cf::sync_job {
3137 cf::write_runtime; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
3138 cf::emergency_save; 3674 cf::emergency_save;
3139 cf::write_runtime; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3140 3676
3141 warn "syncing database to disk"; 3677 warn "syncing database to disk";
3142 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
3143 3679
3144 # if anything goes wrong in here, we should simply crash as we already saved 3680 # if anything goes wrong in here, we should simply crash as we already saved
3145 3681
3146 warn "cancelling all WF_AUTOCANCEL watchers";
3147 for (Event::all_watchers) {
3148 $_->cancel if $_->data & WF_AUTOCANCEL;
3149 }
3150
3151 warn "flushing outstanding aio requests"; 3682 warn "flushing outstanding aio requests";
3152 for (;;) {
3153 BDB::flush;
3154 IO::AIO::flush;
3155 Coro::cede;
3156 last unless IO::AIO::nreqs || BDB::nreqs; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
3157 warn "iterate..."; 3684 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3158 }
3159
3160 ++$RELOAD;
3161
3162 warn "cancelling all extension coros";
3163 $_->cancel for values %EXT_CORO;
3164 %EXT_CORO = ();
3165
3166 warn "removing commands";
3167 %COMMAND = ();
3168
3169 warn "removing ext/exti commands";
3170 %EXTCMD = ();
3171 %EXTICMD = ();
3172
3173 warn "unloading/nuking all extensions";
3174 for my $pkg (@EXTS) {
3175 warn "... unloading $pkg";
3176
3177 if (my $cb = $pkg->can ("unload")) {
3178 eval {
3179 $cb->($pkg);
3180 1
3181 } or warn "$pkg unloaded, but with errors: $@";
3182 } 3685 }
3183 3686
3184 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
3185 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
3186 } 3689 %EXT_CORO = ();
3187 3690
3188 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
3189 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
3190 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3191 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
3192 warn "... unloading $k"; 3700 warn "... unloading $pkg";
3193 delete $INC{$k};
3194 3701
3195 $k =~ s/\.pm$//;
3196 $k =~ s/\//::/g;
3197
3198 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
3199 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
3200 } 3711 }
3201 3712
3202 Symbol::delete_package $k; 3713 warn "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716
3717 warn "... unloading $k";
3718 delete $INC{$k};
3719
3720 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g;
3722
3723 if (my $cb = $k->can ("unload_module")) {
3724 $cb->();
3725 }
3726
3727 clear_package $k;
3203 } 3728 }
3204 3729
3205 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
3206 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
3207 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3208 3733
3209 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3210 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3211 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3212 3737
3213 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3214 # and global variables created in xs 3739 # and global variables created in xs
3215 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3216 3741
3217 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
3218 3743
3219 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
3220 require cf; 3745 require cf;
3221 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3222 3747
3223 warn "loading config and database again"; 3748 warn "loading config and database again";
3224 cf::cfg_load; 3749 cf::reload_config;
3225 3750
3226 warn "loading extensions"; 3751 warn "loading extensions";
3227 cf::load_extensions; 3752 cf::load_extensions;
3228 3753
3754 if ($REATTACH_ON_RELOAD) {
3229 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3230 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3231 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3232 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3233 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3234 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3235 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
3236 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3237 3767
3238 1 3768 1
3239 } or do { 3769 } or do {
3240 warn $@; 3770 warn $@;
3241 warn "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
3242 exit 1;
3243 }; 3772 };
3244 3773
3245 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3246}; 3780};
3247 3781
3248our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3249 3783
3250sub reload_perl() { 3784sub reload_perl() {
3251 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3252 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3253 3787
3254 $RELOAD_WATCHER ||= Event->timer ( 3788 $RELOAD_WATCHER ||= cf::async {
3255 reentrant => 0, 3789 Coro::AIO::aio_wait cache_extensions;
3256 after => 0, 3790
3257 data => WF_AUTOCANCEL, 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3258 cb => sub {
3259 do_reload_perl; 3792 do_reload_perl;
3260 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3261 }, 3794 };
3262 ); 3795 };
3263} 3796}
3264 3797
3265register_command "reload" => sub { 3798register_command "reload" => sub {
3266 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3267 3800
3268 if ($who->flag (FLAG_WIZ)) { 3801 if ($who->flag (FLAG_WIZ)) {
3269 $who->message ("reloading server."); 3802 $who->message ("reloading server.");
3803 async {
3804 $Coro::current->{desc} = "perl_reload";
3270 async { reload_perl }; 3805 reload_perl;
3806 };
3271 } 3807 }
3272}; 3808};
3273 3809
3274unshift @INC, $LIBDIR; 3810unshift @INC, $LIBDIR;
3275 3811
3277 3813
3278our @WAIT_FOR_TICK; 3814our @WAIT_FOR_TICK;
3279our @WAIT_FOR_TICK_BEGIN; 3815our @WAIT_FOR_TICK_BEGIN;
3280 3816
3281sub wait_for_tick { 3817sub wait_for_tick {
3282 return unless $TICK_WATCHER->is_active;
3283 return if $Coro::current == $Coro::main; 3818 return if tick_inhibit || $Coro::current == $Coro::main;
3284 3819
3285 my $signal = new Coro::Signal; 3820 my $signal = new Coro::Signal;
3286 push @WAIT_FOR_TICK, $signal; 3821 push @WAIT_FOR_TICK, $signal;
3287 $signal->wait; 3822 $signal->wait;
3288} 3823}
3289 3824
3290sub wait_for_tick_begin { 3825sub wait_for_tick_begin {
3291 return unless $TICK_WATCHER->is_active;
3292 return if $Coro::current == $Coro::main; 3826 return if tick_inhibit || $Coro::current == $Coro::main;
3293 3827
3294 my $signal = new Coro::Signal; 3828 my $signal = new Coro::Signal;
3295 push @WAIT_FOR_TICK_BEGIN, $signal; 3829 push @WAIT_FOR_TICK_BEGIN, $signal;
3296 $signal->wait; 3830 $signal->wait;
3297} 3831}
3298 3832
3299 my $min = 1e6;#d# 3833sub tick {
3300 my $avg = 10;
3301$TICK_WATCHER = Event->timer (
3302 reentrant => 0,
3303 parked => 1,
3304 prio => 0,
3305 at => $NEXT_TICK || $TICK,
3306 data => WF_AUTOCANCEL,
3307 cb => sub {
3308 if ($Coro::current != $Coro::main) { 3834 if ($Coro::current != $Coro::main) {
3309 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3835 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3310 unless ++$bug_warning > 10; 3836 unless ++$bug_warning > 10;
3311 return; 3837 return;
3312 } 3838 }
3313 3839
3314 $NOW = $tick_start = Event::time;
3315
3316 cf::server_tick; # one server iteration 3840 cf::server_tick; # one server iteration
3317 3841
3318 0 && sync_job {#d# 3842 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3319 for(1..10) { 3843 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3320 my $t = Event::time; 3844 Coro::async_pool {
3321 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3845 $Coro::current->{desc} = "runtime saver";
3322 or die; 3846 write_runtime_sync
3323 3847 or warn "ERROR: unable to write runtime file: $!";
3324 $map->width (50);
3325 $map->height (50);
3326 $map->alloc;
3327 $map->_load_objects ("/tmp/x.map", 1);
3328 my $t = Event::time - $t;
3329
3330 #next unless $t < 0.0013;#d#
3331 if ($t < $min) {
3332 $min = $t;
3333 }
3334 $avg = $avg * 0.99 + $t * 0.01;
3335 }
3336 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3337 exit 0;
3338 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3339 }; 3848 };
3849 }
3340 3850
3341 $RUNTIME += $TICK;
3342 $NEXT_TICK += $TICK;
3343
3344 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3345 $NEXT_RUNTIME_WRITE = $NOW + 10;
3346 Coro::async_pool {
3347 write_runtime
3348 or warn "ERROR: unable to write runtime file: $!";
3349 };
3350 }
3351
3352# my $AFTER = Event::time;
3353# warn $AFTER - $NOW;#d#
3354
3355 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3851 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3356 $sig->send; 3852 $sig->send;
3357 } 3853 }
3358 while (my $sig = shift @WAIT_FOR_TICK) { 3854 while (my $sig = shift @WAIT_FOR_TICK) {
3359 $sig->send; 3855 $sig->send;
3360 } 3856 }
3361 3857
3362 $NOW = Event::time; 3858 $LOAD = ($NOW - $TICK_START) / $TICK;
3363
3364 # if we are delayed by four ticks or more, skip them all
3365 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3366
3367 $TICK_WATCHER->at ($NEXT_TICK);
3368 $TICK_WATCHER->start;
3369
3370 $LOAD = ($NOW - $tick_start) / $TICK;
3371 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3859 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3372 3860
3373 _post_tick; 3861 if (0) {
3374 3862 if ($NEXT_TICK) {
3375 3863 my $jitter = $TICK_START - $NEXT_TICK;
3864 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3865 warn "jitter $JITTER\n";#d#
3866 }
3376 }, 3867 }
3377); 3868}
3378 3869
3379{ 3870{
3380 BDB::max_poll_time $TICK * 0.1; 3871 # configure BDB
3381 $BDB_POLL_WATCHER = Event->io ( 3872
3382 reentrant => 0,
3383 fd => BDB::poll_fileno,
3384 poll => 'r',
3385 prio => 0,
3386 data => WF_AUTOCANCEL,
3387 cb => \&BDB::poll_cb,
3388 );
3389 BDB::min_parallel 8; 3873 BDB::min_parallel 8;
3390 3874 BDB::max_poll_reqs $TICK * 0.1;
3391 BDB::set_sync_prepare { 3875 $AnyEvent::BDB::WATCHER->priority (1);
3392 my $status;
3393 my $current = $Coro::current;
3394 (
3395 sub {
3396 $status = $!;
3397 $current->ready; undef $current;
3398 },
3399 sub {
3400 Coro::schedule while defined $current;
3401 $! = $status;
3402 },
3403 )
3404 };
3405 3876
3406 unless ($DB_ENV) { 3877 unless ($DB_ENV) {
3407 $DB_ENV = BDB::db_env_create; 3878 $DB_ENV = BDB::db_env_create;
3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3881 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3882 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3883 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3408 3884
3409 cf::sync_job { 3885 cf::sync_job {
3410 eval { 3886 eval {
3411 BDB::db_env_open 3887 BDB::db_env_open
3412 $DB_ENV, 3888 $DB_ENV,
3414 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3890 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3415 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3891 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3416 0666; 3892 0666;
3417 3893
3418 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3894 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3419
3420 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3421 $DB_ENV->set_lk_detect;
3422 }; 3895 };
3423 3896
3424 cf::cleanup "db_env_open(db): $@" if $@; 3897 cf::cleanup "db_env_open(db): $@" if $@;
3425 }; 3898 };
3426 } 3899 }
3900
3901 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3902 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3903 };
3904 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3905 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3906 };
3907 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3908 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3909 };
3427} 3910}
3428 3911
3429{ 3912{
3913 # configure IO::AIO
3914
3430 IO::AIO::min_parallel 8; 3915 IO::AIO::min_parallel 8;
3431
3432 undef $Coro::AIO::WATCHER;
3433 IO::AIO::max_poll_time $TICK * 0.1; 3916 IO::AIO::max_poll_time $TICK * 0.1;
3434 $AIO_POLL_WATCHER = Event->io ( 3917 undef $AnyEvent::AIO::WATCHER;
3435 reentrant => 0,
3436 data => WF_AUTOCANCEL,
3437 fd => IO::AIO::poll_fileno,
3438 poll => 'r',
3439 prio => 6,
3440 cb => \&IO::AIO::poll_cb,
3441 );
3442} 3918}
3443 3919
3444my $_log_backtrace; 3920my $_log_backtrace;
3445 3921
3446sub _log_backtrace { 3922sub _log_backtrace {
3449 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3450 3926
3451 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3452 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3453 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3454 async { 3931 async {
3932 $Coro::current->{desc} = "abt $msg";
3933
3455 my @bt = fork_call { 3934 my @bt = fork_call {
3456 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3457 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3936 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3458 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3937 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3459 or die "addr2line: $!"; 3938 or die "addr2line: $!";
3467 } 3946 }
3468 3947
3469 @funcs 3948 @funcs
3470 }; 3949 };
3471 3950
3472 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3473 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3474 --$_log_backtrace; 3954 --$_log_backtrace;
3475 }; 3955 };
3476 } else { 3956 } else {
3477 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3478 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3479 } 3959 }
3480} 3960}
3481 3961
3482# load additional modules 3962# load additional modules
3483use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3484 3964
3485END { cf::emergency_save } 3965END { cf::emergency_save }
3486 3966
34871 39671
3488 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines