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.332 by root, Sat Aug 18 17:33:53 2007 UTC vs.
Revision 1.475 by root, Tue Jul 21 06:17:00 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
1505=cut 1664=cut
1506 1665
1507sub ext_reply($$@) { 1666sub ext_reply($$@) {
1508 my ($self, $id, @msg) = @_; 1667 my ($self, $id, @msg) = @_;
1509 1668
1510 if ($self->ns->extcmd == 2) { 1669 $self->ns->ext_reply ($id, @msg)
1511 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1512 } elsif ($self->ns->extcmd == 1) {
1513 #TODO: version 1, remove
1514 unshift @msg, msgtype => "reply", msgid => $id;
1515 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1516 }
1517} 1670}
1518 1671
1519=item $player->ext_msg ($type, @msg) 1672=item $player->ext_msg ($type, @msg)
1520 1673
1521Sends an ext event to the client. 1674Sends an ext event to the client.
1577our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1578our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1579 1732
1580sub generate_random_map { 1733sub generate_random_map {
1581 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
1582 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1583 $self->_create_random_map ( 1739 $self->_create_random_map (
1584 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1585 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1586 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1708 1864
1709# the temporary/swap location 1865# the temporary/swap location
1710sub save_path { 1866sub save_path {
1711 my ($self) = @_; 1867 my ($self) = @_;
1712 1868
1713 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1714 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1715} 1871}
1716 1872
1717# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1718sub uniq_path { 1874sub uniq_path {
1719 my ($self) = @_; 1875 my ($self) = @_;
1720 1876
1721 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1722 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1723}
1724
1725# and all this just because we cannot iterate over
1726# all maps in C++...
1727sub change_all_map_light {
1728 my ($change) = @_;
1729
1730 $_->change_map_light ($change)
1731 for grep $_->outdoor, values %cf::MAP;
1732} 1879}
1733 1880
1734sub decay_objects { 1881sub decay_objects {
1735 my ($self) = @_; 1882 my ($self) = @_;
1736 1883
1749 1896
1750sub load_header_from($) { 1897sub load_header_from($) {
1751 my ($self, $path) = @_; 1898 my ($self, $path) = @_;
1752 1899
1753 utf8::encode $path; 1900 utf8::encode $path;
1754 #aio_open $path, O_RDONLY, 0 1901 my $f = new_from_file cf::object::thawer $path
1755 # or return;
1756
1757 $self->_load_header ($path)
1758 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;
1759 1909
1760 $self->{load_path} = $path; 1910 $self->{load_path} = $path;
1761 1911
1762 1 1912 1
1763} 1913}
1817sub find { 1967sub find {
1818 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1819 1969
1820 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1821 1971
1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1822 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1823 1974
1824 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
1825 my $guard = cf::lock_acquire "map_find:$path";
1826 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
1827 or return; 1977 or return;
1828 1978
1829 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
1830 1980
1832 or return; 1982 or return;
1833 1983
1834 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1835 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
1836 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
1988 undef $guard1;
1837 $map->reset; 1989 $map->reset;
1838 undef $guard;
1839 return find $path; 1990 return find $path;
1840 } 1991 }
1841 1992
1842 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
1843 } 1994 }
1852 local $self->{deny_reset} = 1; # loading can take a long time 2003 local $self->{deny_reset} = 1; # loading can take a long time
1853 2004
1854 my $path = $self->{path}; 2005 my $path = $self->{path};
1855 2006
1856 { 2007 {
1857 my $guard = cf::lock_acquire "map_load:$path"; 2008 my $guard = cf::lock_acquire "map_data:$path";
1858 2009
2010 return unless $self->valid;
1859 return if $self->in_memory != cf::MAP_SWAPPED; 2011 return unless $self->in_memory == cf::MAP_SWAPPED;
1860 2012
1861 $self->in_memory (cf::MAP_LOADING); 2013 $self->in_memory (cf::MAP_LOADING);
1862 2014
1863 $self->alloc; 2015 $self->alloc;
1864 2016
1865 $self->pre_load; 2017 $self->pre_load;
1866 Coro::cede; 2018 cf::cede_to_tick;
1867 2019
2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2021 $f->skip_block;
1868 $self->_load_objects ($self->{load_path}, 1) 2022 $self->_load_objects ($f)
1869 or return; 2023 or return;
1870 2024
1871 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
1872 if delete $self->{load_original}; 2026 if delete $self->{load_original};
1873 2027
1874 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
1875 utf8::encode $uniq; 2029 utf8::encode $uniq;
1876 if (aio_open $uniq, O_RDONLY, 0) { 2030 unless (aio_stat $uniq) {
2031 if (my $f = new_from_file cf::object::thawer $uniq) {
1877 $self->clear_unique_items; 2032 $self->clear_unique_items;
1878 $self->_load_objects ($uniq, 0); 2033 $self->_load_objects ($f);
2034 $f->resolve_delayed_derefs;
2035 }
1879 } 2036 }
1880 } 2037 }
1881 2038
1882 Coro::cede; 2039 $f->resolve_delayed_derefs;
2040
2041 cf::cede_to_tick;
1883 # now do the right thing for maps 2042 # now do the right thing for maps
1884 $self->link_multipart_objects; 2043 $self->link_multipart_objects;
1885 $self->difficulty ($self->estimate_difficulty) 2044 $self->difficulty ($self->estimate_difficulty)
1886 unless $self->difficulty; 2045 unless $self->difficulty;
1887 Coro::cede; 2046 cf::cede_to_tick;
1888 2047
1889 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
1890 $self->decay_objects; 2049 $self->decay_objects;
1891 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
1892 $self->update_buttons; 2051 $self->update_buttons;
1893 Coro::cede; 2052 cf::cede_to_tick;
1894 $self->set_darkness_map;
1895 Coro::cede;
1896 $self->activate; 2053 $self->activate;
1897 } 2054 }
1898 2055
1899 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
1900 $self->last_access ($cf::RUNTIME); 2057 $self->last_access ($cf::RUNTIME);
1901 2058
1902 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
1903 } 2060 }
1904 2061
1905 $self->post_load; 2062 $self->post_load;
1906} 2063}
1907 2064
1916 2073
1917 $self 2074 $self
1918} 2075}
1919 2076
1920# find and load all maps in the 3x3 area around a map 2077# find and load all maps in the 3x3 area around a map
1921sub load_diag { 2078sub load_neighbours {
1922 my ($map) = @_; 2079 my ($map) = @_;
1923 2080
1924 my @diag; # diagonal neighbours 2081 my @neigh; # diagonal neighbours
1925 2082
1926 for (0 .. 3) { 2083 for (0 .. 3) {
1927 my $neigh = $map->tile_path ($_) 2084 my $neigh = $map->tile_path ($_)
1928 or next; 2085 or next;
1929 $neigh = find $neigh, $map 2086 $neigh = find $neigh, $map
1930 or next; 2087 or next;
1931 $neigh->load; 2088 $neigh->load;
1932 2089
2090 push @neigh,
1933 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2091 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1934 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2092 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1935 } 2093 }
1936 2094
1937 for (@diag) { 2095 for (grep defined $_->[0], @neigh) {
2096 my ($path, $origin) = @$_;
1938 my $neigh = find @$_ 2097 my $neigh = find $path, $origin
1939 or next; 2098 or next;
1940 $neigh->load; 2099 $neigh->load;
1941 } 2100 }
1942} 2101}
1943 2102
1948} 2107}
1949 2108
1950sub do_load_sync { 2109sub do_load_sync {
1951 my ($map) = @_; 2110 my ($map) = @_;
1952 2111
2112 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2113 if $Coro::current == $Coro::main;
2114
1953 cf::sync_job { $map->load }; 2115 cf::sync_job { $map->load };
1954} 2116}
1955 2117
1956our %MAP_PREFETCH; 2118our %MAP_PREFETCH;
1957our $MAP_PREFETCHER = undef; 2119our $MAP_PREFETCHER = undef;
1958 2120
1959sub find_async { 2121sub find_async {
1960 my ($path, $origin) = @_; 2122 my ($path, $origin, $load) = @_;
1961 2123
1962 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
1963 2125
1964 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
1965 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1966 } 2128 }
1967 2129
1968 undef $MAP_PREFETCH{$path}; 2130 $MAP_PREFETCH{$path} |= $load;
2131
1969 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2133 $Coro::current->{desc} = "map prefetcher";
2134
1970 while (%MAP_PREFETCH) { 2135 while (%MAP_PREFETCH) {
1971 for my $path (keys %MAP_PREFETCH) { 2136 while (my ($k, $v) = each %MAP_PREFETCH) {
1972 if (my $map = find $path) { 2137 if (my $map = find $k) {
1973 $map->load; 2138 $map->load if $v;
1974 } 2139 }
1975 2140
1976 delete $MAP_PREFETCH{$path}; 2141 delete $MAP_PREFETCH{$k};
1977 } 2142 }
1978 } 2143 }
1979 undef $MAP_PREFETCHER; 2144 undef $MAP_PREFETCHER;
1980 }; 2145 };
1981 $MAP_PREFETCHER->prio (6); 2146 $MAP_PREFETCHER->prio (6);
1984} 2149}
1985 2150
1986sub save { 2151sub save {
1987 my ($self) = @_; 2152 my ($self) = @_;
1988 2153
1989 my $lock = cf::lock_acquire "map_data:" . $self->path; 2154 my $lock = cf::lock_acquire "map_data:$self->{path}";
1990 2155
1991 $self->{last_save} = $cf::RUNTIME; 2156 $self->{last_save} = $cf::RUNTIME;
1992 2157
1993 return unless $self->dirty; 2158 return unless $self->dirty;
1994 2159
2000 return if $self->{deny_save}; 2165 return if $self->{deny_save};
2001 2166
2002 local $self->{last_access} = $self->last_access;#d# 2167 local $self->{last_access} = $self->last_access;#d#
2003 2168
2004 cf::async { 2169 cf::async {
2170 $Coro::current->{desc} = "map player save";
2005 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
2006 }; 2172 };
2173
2174 cf::get_slot 0.02;
2007 2175
2008 if ($uniq) { 2176 if ($uniq) {
2009 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2010 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2011 } else { 2179 } else {
2017 my ($self) = @_; 2185 my ($self) = @_;
2018 2186
2019 # save first because save cedes 2187 # save first because save cedes
2020 $self->save; 2188 $self->save;
2021 2189
2022 my $lock = cf::lock_acquire "map_data:" . $self->path; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2023 2191
2024 return if $self->players; 2192 return if $self->players;
2025 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
2026 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2027 2195
2196 $self->in_memory (cf::MAP_SWAPPED);
2197
2198 $self->deactivate;
2199 $_->clear_links_to ($self) for values %cf::MAP;
2028 $self->clear; 2200 $self->clear;
2029 $self->in_memory (cf::MAP_SWAPPED);
2030} 2201}
2031 2202
2032sub reset_at { 2203sub reset_at {
2033 my ($self) = @_; 2204 my ($self) = @_;
2034 2205
2066 if $uniq; 2237 if $uniq;
2067 } 2238 }
2068 2239
2069 delete $cf::MAP{$self->path}; 2240 delete $cf::MAP{$self->path};
2070 2241
2242 $self->deactivate;
2243 $_->clear_links_to ($self) for values %cf::MAP;
2071 $self->clear; 2244 $self->clear;
2072
2073 $_->clear_links_to ($self) for values %cf::MAP;
2074 2245
2075 $self->unlink_save; 2246 $self->unlink_save;
2076 $self->destroy; 2247 $self->destroy;
2077} 2248}
2078 2249
2079my $nuke_counter = "aaaa"; 2250my $nuke_counter = "aaaa";
2080 2251
2081sub nuke { 2252sub nuke {
2082 my ($self) = @_; 2253 my ($self) = @_;
2083 2254
2255 {
2256 my $lock = cf::lock_acquire "map_data:$self->{path}";
2257
2084 delete $cf::MAP{$self->path}; 2258 delete $cf::MAP{$self->path};
2085 2259
2086 $self->unlink_save; 2260 $self->unlink_save;
2087 2261
2088 bless $self, "cf::map"; 2262 bless $self, "cf::map";
2089 delete $self->{deny_reset}; 2263 delete $self->{deny_reset};
2090 $self->{deny_save} = 1; 2264 $self->{deny_save} = 1;
2091 $self->reset_timeout (1); 2265 $self->reset_timeout (1);
2092 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2266 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2093 2267
2094 $cf::MAP{$self->path} = $self; 2268 $cf::MAP{$self->path} = $self;
2269 }
2095 2270
2096 $self->reset; # polite request, might not happen 2271 $self->reset; # polite request, might not happen
2097} 2272}
2098 2273
2099=item $maps = cf::map::tmp_maps 2274=item $maps = cf::map::tmp_maps
2141 2316
2142sub unique_maps() { 2317sub unique_maps() {
2143 [ 2318 [
2144 map { 2319 map {
2145 utf8::decode $_; 2320 utf8::decode $_;
2146 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2147 ? normalise $_ 2324 : normalise $_
2148 : ()
2149 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2150 ] 2326 ]
2151} 2327}
2152 2328
2153package cf;
2154
2155=back 2329=back
2156 2330
2157=head3 cf::object 2331=head3 cf::object
2158 2332
2159=cut 2333=cut
2162 2336
2163=over 4 2337=over 4
2164 2338
2165=item $ob->inv_recursive 2339=item $ob->inv_recursive
2166 2340
2167Returns 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.
2168 2343
2169=cut 2344=cut
2170 2345
2171sub inv_recursive_; 2346sub inv_recursive_;
2172sub inv_recursive_ { 2347sub inv_recursive_ {
2175 2350
2176sub inv_recursive { 2351sub inv_recursive {
2177 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2178} 2353}
2179 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
2180package cf; 2383package cf;
2181 2384
2182=back 2385=back
2183 2386
2184=head3 cf::object::player 2387=head3 cf::object::player
2190Sends 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>
2191can 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
2192dialogue with the given NPC character. 2395dialogue with the given NPC character.
2193 2396
2194=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};
2195 2412
2196# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2197# with dialog boxes. 2414# with dialog boxes.
2198#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
2199sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2211 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2212 $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));
2213 2430
2214 } else { 2431 } else {
2215 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2216 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2217 } 2434 }
2218 } 2435 }
2219} 2436}
2220 2437
2221=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2246 2463
2247=item $player_object->enter_link 2464=item $player_object->enter_link
2248 2465
2249Freezes 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}>).
2250 2467
2251The 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.
2252I<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.
2253 2472
2254Will never block. 2473Will never block.
2255 2474
2256=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2257 2476
2312 # use -1 or undef as default coordinates, not 0, 0 2531 # use -1 or undef as default coordinates, not 0, 0
2313 ($x, $y) = ($map->enter_x, $map->enter_y) 2532 ($x, $y) = ($map->enter_x, $map->enter_y)
2314 if $x <=0 && $y <= 0; 2533 if $x <=0 && $y <= 0;
2315 2534
2316 $map->load; 2535 $map->load;
2317 $map->load_diag; 2536 $map->load_neighbours;
2318 2537
2319 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2320 $self->activate_recursive; 2540 $self->activate_recursive;
2321 2541
2322 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2323 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2324} 2544}
2329her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2330that 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
2331the 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
2332be called at the end of this process. 2552be called at the end of this process.
2333 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
2334=cut 2557=cut
2335 2558
2336our $GOTOGEN; 2559our $GOTOGEN;
2337 2560
2338sub cf::object::player::goto { 2561sub cf::object::player::goto {
2342 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2565 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2343 2566
2344 $self->enter_link; 2567 $self->enter_link;
2345 2568
2346 (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
2347 my $map = eval { 2591 my $map = eval {
2348 my $map = cf::map::find $path; 2592 my $map = defined $path ? cf::map::find $path : undef;
2349 2593
2350 if ($map) { 2594 if ($map) {
2351 $map = $map->customise_for ($self); 2595 $map = $map->customise_for ($self);
2352 $map = $check->($map) if $check && $map; 2596 $map = $check->($map) if $check && $map;
2353 } else { 2597 } else {
2354 $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);
2355 } 2599 }
2356 2600
2357 $map 2601 $map
2358 }; 2602 };
2359 2603
2395} 2639}
2396 2640
2397sub prepare_random_map { 2641sub prepare_random_map {
2398 my ($exit) = @_; 2642 my ($exit) = @_;
2399 2643
2400 my $guard = cf::lock_acquire "exit_prepare:$exit";
2401
2402 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2403 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2404 # that depends on the exit object 2646 # that depends on the exit object
2405 2647
2406 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
2408 if ($exit->map) { 2650 if ($exit->map) {
2409 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2410 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2411 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2412 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2413 } 2657 }
2414 2658
2415 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2416 2660
2417 my $data = cf::to_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2418 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2419 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2420 2664
2421 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2422 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2423 undef $fh; 2667 undef $fh;
2424 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2425 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2426 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2427 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2428 } 2676 }
2429} 2677}
2430 2678
2431sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2432 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2433 2681
2434 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2435 2683
2436 if ($exit->slaying eq "/!") {
2437 #TODO: this should de-fi-ni-te-ly not be a sync-job
2438 # the problem is that $exit might not survive long enough
2439 # so it needs to be done right now, right here
2440 cf::sync_job { prepare_random_map $exit };
2441 }
2442
2443 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2444 my $hp = $exit->stats->hp;
2445 my $sp = $exit->stats->sp;
2446
2447 $self->enter_link; 2684 $self->enter_link;
2448 2685
2449 # if exit is damned, update players death & WoR home-position
2450 $self->contr->savebed ($slaying, $hp, $sp)
2451 if $exit->flag (FLAG_DAMNED);
2452
2453 (async { 2686 (async {
2454 $self->deactivate_recursive; # just to be sure 2687 $Coro::current->{desc} = "enter_exit";
2688
2455 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
2456 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2457 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
2458 1; 2710 1
2459 }) { 2711 }) {
2460 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2461 . "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. "
2462 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2463 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2464 2716
2465 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
2493the 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
2494the message unless the client supports the msg packet. 2746the message unless the client supports the msg packet.
2495 2747
2496=cut 2748=cut
2497 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
2498sub cf::client::send_msg { 2852sub cf::client::send_msg {
2499 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2500 2854
2501 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2502 2857
2503 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2504 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
2505 if (ref $channel) { 2867 } elsif (ref $channel) {
2506 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2507 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2508 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2509 $self->ext_msg (channel_info => $channel); 2871 $self->ext_msg (channel_info => $channel);
2510 } 2872 }
2512 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2513 } 2875 }
2514 2876
2515 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2516 2878
2517 if ($self->can_msg) {
2518 # default colour, mask it out 2879 # default colour, mask it out
2519 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2520 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2521 2882
2522 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2523 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2524 } else { 2886 );
2525 if ($color >= 0) {
2526 # replace some tags by gcfclient-compatible ones
2527 for ($msg) {
2528 1 while
2529 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2530 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2531 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2532 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2533 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2534 }
2535 2887
2536 $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};
2537 2891
2538 utf8::encode $msg; 2892 # split very large packets
2539 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2540 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2541 # COMMAND/INFO 2895 $pkt = "frag";
2542 $self->send_packet ("drawextinfo $color 10 8 $msg")
2543 } else {
2544 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2545 $self->send_packet ("drawinfo $color $msg")
2546 }
2547 }
2548 } 2896 }
2897
2898 $self->send_packet ($pkt);
2549} 2899}
2550 2900
2551=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2552 2902
2553Sends an ext event to the client. 2903Sends an ext event to the client.
2555=cut 2905=cut
2556 2906
2557sub cf::client::ext_msg($$@) { 2907sub cf::client::ext_msg($$@) {
2558 my ($self, $type, @msg) = @_; 2908 my ($self, $type, @msg) = @_;
2559 2909
2560 my $extcmd = $self->extcmd;
2561
2562 if ($extcmd == 2) { 2910 if ($self->extcmd == 2) {
2563 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2911 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2564 } elsif ($extcmd == 1) { # TODO: remove 2912 } elsif ($self->extcmd == 1) { # TODO: remove
2565 push @msg, msgtype => "event_$type"; 2913 push @msg, msgtype => "event_$type";
2914 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2915 }
2916}
2917
2918=item $client->ext_reply ($msgid, @msg)
2919
2920Sends an ext reply to the client.
2921
2922=cut
2923
2924sub cf::client::ext_reply($$@) {
2925 my ($self, $id, @msg) = @_;
2926
2927 if ($self->extcmd == 2) {
2928 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2929 } elsif ($self->extcmd == 1) {
2930 #TODO: version 1, remove
2931 unshift @msg, msgtype => "reply", msgid => $id;
2566 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2932 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2567 } 2933 }
2568} 2934}
2569 2935
2570=item $success = $client->query ($flags, "text", \&cb) 2936=item $success = $client->query ($flags, "text", \&cb)
2632 my ($type, $reply, @payload) = 2998 my ($type, $reply, @payload) =
2633 "ARRAY" eq ref $msg 2999 "ARRAY" eq ref $msg
2634 ? @$msg 3000 ? @$msg
2635 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3001 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2636 3002
3003 my @reply;
3004
2637 if (my $cb = $EXTICMD{$type}) { 3005 if (my $cb = $EXTICMD{$type}) {
2638 my @reply = $cb->($ns, @payload); 3006 @reply = $cb->($ns, @payload);
2639
2640 $ns->ext_reply ($reply, @reply)
2641 if $reply;
2642 } 3007 }
3008
3009 $ns->ext_reply ($reply, @reply)
3010 if $reply;
3011
2643 } else { 3012 } else {
2644 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";
2645 } 3014 }
2646 3015
2647 cf::override; 3016 cf::override;
2707=pod 3076=pod
2708 3077
2709The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
2710 3079
2711 cf::object 3080 cf::object
2712 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
2713 insert remove name archname title slaying race 3082 insert remove name archname title slaying race decrease split
3083 value
2714 3084
2715 cf::object::player 3085 cf::object::player
2716 player 3086 player
2717 3087
2718 cf::player 3088 cf::player
2723 3093
2724=cut 3094=cut
2725 3095
2726for ( 3096for (
2727 ["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
2728 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)],
2729 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
2730 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
2731 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
2732) { 3103) {
2733 no strict 'refs'; 3104 no strict 'refs';
2734 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
2735 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
2752 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
2753 3124
2754 my $qcode = $code; 3125 my $qcode = $code;
2755 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2756 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
2757 3130
2758 local $_; 3131 local $_;
2759 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
2760 3133
2761 my $eval = 3134 my $eval =
2809# the server's init and main functions 3182# the server's init and main functions
2810 3183
2811sub load_facedata($) { 3184sub load_facedata($) {
2812 my ($path) = @_; 3185 my ($path) = @_;
2813 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
3191 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3192
2814 warn "loading facedata from $path\n"; 3193 warn "loading facedata from $path\n";
2815 3194
2816 my $facedata; 3195 my $facedata;
2817 0 < aio_load $path, $facedata 3196 0 < aio_load $path, $facedata
2818 or die "$path: $!"; 3197 or die "$path: $!";
2820 $facedata = Coro::Storable::thaw $facedata; 3199 $facedata = Coro::Storable::thaw $facedata;
2821 3200
2822 $facedata->{version} == 2 3201 $facedata->{version} == 2
2823 or cf::cleanup "$path: version mismatch, cannot proceed."; 3202 or cf::cleanup "$path: version mismatch, cannot proceed.";
2824 3203
3204 # patch in the exptable
3205 $facedata->{resource}{"res/exp_table"} = {
3206 type => FT_RSRC,
3207 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3208 };
3209 cf::cede_to_tick;
3210
2825 { 3211 {
2826 my $faces = $facedata->{faceinfo}; 3212 my $faces = $facedata->{faceinfo};
2827 3213
2828 while (my ($face, $info) = each %$faces) { 3214 while (my ($face, $info) = each %$faces) {
2829 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3215 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3216
2830 cf::face::set_visibility $idx, $info->{visibility}; 3217 cf::face::set_visibility $idx, $info->{visibility};
2831 cf::face::set_magicmap $idx, $info->{magicmap}; 3218 cf::face::set_magicmap $idx, $info->{magicmap};
2832 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3219 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2833 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3220 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2834 3221
2835 cf::cede_to_tick; 3222 cf::cede_to_tick;
2836 } 3223 }
2837 3224
2838 while (my ($face, $info) = each %$faces) { 3225 while (my ($face, $info) = each %$faces) {
2839 next unless $info->{smooth}; 3226 next unless $info->{smooth};
3227
2840 my $idx = cf::face::find $face 3228 my $idx = cf::face::find $face
2841 or next; 3229 or next;
3230
2842 if (my $smooth = cf::face::find $info->{smooth}) { 3231 if (my $smooth = cf::face::find $info->{smooth}) {
2843 cf::face::set_smooth $idx, $smooth; 3232 cf::face::set_smooth $idx, $smooth;
2844 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3233 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2845 } else { 3234 } else {
2846 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3235 warn "smooth face '$info->{smooth}' not found for face '$face'";
2863 3252
2864 { 3253 {
2865 # TODO: for gcfclient pleasure, we should give resources 3254 # TODO: for gcfclient pleasure, we should give resources
2866 # that gcfclient doesn't grok a >10000 face index. 3255 # that gcfclient doesn't grok a >10000 face index.
2867 my $res = $facedata->{resource}; 3256 my $res = $facedata->{resource};
2868 my $enc = JSON::XS->new->utf8->canonical;
2869
2870 my $soundconf = delete $res->{"res/sound.conf"};
2871 3257
2872 while (my ($name, $info) = each %$res) { 3258 while (my ($name, $info) = each %$res) {
2873 my $meta = $enc->encode ({ 3259 if (defined $info->{type}) {
2874 name => $name,
2875 %{ $info->{meta} || {} },
2876 });
2877
2878 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3260 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3261 my $data;
2879 3262
2880 if ($info->{type} & 1) { 3263 if ($info->{type} & 1) {
2881 # prepend meta info 3264 # prepend meta info
2882 3265
3266 my $meta = $enc->encode ({
3267 name => $name,
3268 %{ $info->{meta} || {} },
3269 });
3270
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 3271 $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 3272 } else {
3273 $data = $info->{data};
3274 }
2885 3275
2886 cf::face::set_data $idx, 0, $data, $chk; 3276 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3277 cf::face::set_type $idx, $info->{type};
2887 } else { 3278 } else {
2888 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3279 $RESOURCE{$name} = $info;
2889 } 3280 }
2890 3281
2891 cf::face::set_type $idx, $info->{type};
2892
2893 cf::cede_to_tick; 3282 cf::cede_to_tick;
2894 } 3283 }
2895
2896 if ($soundconf) {
2897 $soundconf = $enc->decode (delete $soundconf->{data});
2898
2899 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2900 my $sound = $soundconf->{compat}[$_]
2901 or next;
2902
2903 my $face = cf::face::find "sound/$sound->[1]";
2904 cf::sound::set $sound->[0] => $face;
2905 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2906 }
2907
2908 while (my ($k, $v) = each %{$soundconf->{event}}) {
2909 my $face = cf::face::find "sound/$v";
2910 cf::sound::set $k => $face;
2911 }
2912 }
2913 } 3284 }
3285
3286 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2914 3287
2915 1 3288 1
2916} 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});
2917 3310
2918register_exticmd fx_want => sub { 3311register_exticmd fx_want => sub {
2919 my ($ns, $want) = @_; 3312 my ($ns, $want) = @_;
2920 3313
2921 while (my ($k, $v) = each %$want) { 3314 while (my ($k, $v) = each %$want) {
2922 $ns->fx_want ($k, $v); 3315 $ns->fx_want ($k, $v);
2923 } 3316 }
2924}; 3317};
2925 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
2926sub 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
2927 load_resource_file "$MAPDIR/regions" 3334 load_resource_file "$MAPDIR/regions"
2928 or die "unable to load regions file\n"; 3335 or die "unable to load regions file\n";
2929 3336
2930 for (cf::region::list) { 3337 for (cf::region::list) {
2931 $_->{match} = qr/$_->{match}/ 3338 $_->{match} = qr/$_->{match}/
2939} 3346}
2940 3347
2941sub reload_archetypes { 3348sub reload_archetypes {
2942 load_resource_file "$DATADIR/archetypes" 3349 load_resource_file "$DATADIR/archetypes"
2943 or die "unable to load archetypes\n"; 3350 or die "unable to load archetypes\n";
2944 #d# NEED to laod twice to resolve forward references
2945 # this really needs to be done in an extra post-pass
2946 # (which needs to be synchronous, so solve it differently)
2947 load_resource_file "$DATADIR/archetypes"
2948 or die "unable to load archetypes\n";
2949} 3351}
2950 3352
2951sub reload_treasures { 3353sub reload_treasures {
2952 load_resource_file "$DATADIR/treasures" 3354 load_resource_file "$DATADIR/treasures"
2953 or die "unable to load treasurelists\n"; 3355 or die "unable to load treasurelists\n";
2954} 3356}
2955 3357
2956sub reload_resources { 3358sub reload_resources {
2957 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
2958 3360
3361 reload_facedata;
3362 reload_archetypes;
2959 reload_regions; 3363 reload_regions;
2960 reload_facedata;
2961 #reload_archetypes;#d#
2962 reload_archetypes;
2963 reload_treasures; 3364 reload_treasures;
2964 3365
2965 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
2966} 3367}
2967 3368
2968sub init { 3369sub reload_config {
2969 reload_resources;
2970}
2971
2972sub cfg_load {
2973 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
2974 or return; 3371 or return;
2975 3372
2976 local $/; 3373 local $/;
2977 *CFG = YAML::Syck::Load <$fh>; 3374 *CFG = YAML::Load <$fh>;
2978 3375
2979 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3376 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2980 3377
2981 $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};
2982 $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};
2988 }; 3385 };
2989 warn $@ if $@; 3386 warn $@ if $@;
2990 } 3387 }
2991} 3388}
2992 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
2993sub 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
2994 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
2995 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
2996 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#
2997 (async { 3436 (async {
2998 Event::one_event; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3438 EV::loop EV::LOOP_ONESHOT;
2999 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3000 }; 3440 };
3001 3441
3002 cfg_load; 3442 evthread_start IO::AIO::poll_fileno;
3443
3444 cf::sync_job {
3445 reload_resources;
3446 reload_config;
3003 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
3004 load_extensions; 3460 load_extensions;
3005 3461
3006 $TICK_WATCHER->start; 3462 utime time, time, $RUNTIMEFILE;
3007 Event::loop; 3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 use POSIX ();
3466 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3467
3468 (pop @POST_INIT)->(0) while @POST_INIT;
3469 };
3470
3471 main_loop;
3008} 3472}
3009 3473
3010############################################################################# 3474#############################################################################
3011# initialisation and cleanup 3475# initialisation and cleanup
3012 3476
3013# install some emergency cleanup handlers 3477# install some emergency cleanup handlers
3014BEGIN { 3478BEGIN {
3479 our %SIGWATCHER = ();
3015 for my $signal (qw(INT HUP TERM)) { 3480 for my $signal (qw(INT HUP TERM)) {
3016 Event->signal ( 3481 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3017 reentrant => 0,
3018 data => WF_AUTOCANCEL,
3019 signal => $signal,
3020 prio => 0,
3021 cb => sub {
3022 cf::cleanup "SIG$signal"; 3482 cf::cleanup "SIG$signal";
3023 },
3024 ); 3483 };
3025 } 3484 }
3026} 3485}
3027 3486
3028sub write_runtime { 3487sub write_runtime_sync {
3029 my $runtime = "$LOCALDIR/runtime";
3030
3031 # first touch the runtime file to show we are still running: 3488 # first touch the runtime file to show we are still running:
3032 # the fsync below can take a very very long time. 3489 # the fsync below can take a very very long time.
3033 3490
3034 IO::AIO::aio_utime $runtime, undef, undef; 3491 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3035 3492
3036 my $guard = cf::lock_acquire "write_runtime"; 3493 my $guard = cf::lock_acquire "write_runtime";
3037 3494
3038 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3039 or return; 3496 or return;
3040 3497
3041 my $value = $cf::RUNTIME + 90 + 10; 3498 my $value = $cf::RUNTIME + 90 + 10;
3042 # 10 is the runtime save interval, for a monotonic clock 3499 # 10 is the runtime save interval, for a monotonic clock
3043 # 60 allows for the watchdog to kill the server. 3500 # 60 allows for the watchdog to kill the server.
3053 aio_utime $fh, undef, undef; 3510 aio_utime $fh, undef, undef;
3054 3511
3055 close $fh 3512 close $fh
3056 or return; 3513 or return;
3057 3514
3058 aio_rename "$runtime~", $runtime 3515 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3059 and return; 3516 and return;
3060 3517
3061 warn "runtime file written.\n"; 3518 warn "runtime file written.\n";
3062 3519
3063 1 3520 1
3521}
3522
3523our $uuid_lock;
3524our $uuid_skip;
3525
3526sub write_uuid_sync($) {
3527 $uuid_skip ||= $_[0];
3528
3529 return if $uuid_lock;
3530 local $uuid_lock = 1;
3531
3532 my $uuid = "$LOCALDIR/uuid";
3533
3534 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3535 or return;
3536
3537 my $value = uuid_seq uuid_cur;
3538
3539 unless ($value) {
3540 warn "cowardly refusing to write zero uuid value!\n";
3541 return;
3542 }
3543
3544 my $value = uuid_str $value + $uuid_skip;
3545 $uuid_skip = 0;
3546
3547 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3548 and return;
3549
3550 # always fsync - this file is important
3551 aio_fsync $fh
3552 and return;
3553
3554 close $fh
3555 or return;
3556
3557 aio_rename "$uuid~", $uuid
3558 and return;
3559
3560 warn "uuid file written ($value).\n";
3561
3562 1
3563
3564}
3565
3566sub write_uuid($$) {
3567 my ($skip, $sync) = @_;
3568
3569 $sync ? write_uuid_sync $skip
3570 : async { write_uuid_sync $skip };
3064} 3571}
3065 3572
3066sub emergency_save() { 3573sub emergency_save() {
3067 my $freeze_guard = cf::freeze_mainloop; 3574 my $freeze_guard = cf::freeze_mainloop;
3068 3575
3069 warn "enter emergency perl save\n"; 3576 warn "emergency_perl_save: enter\n";
3070 3577
3071 cf::sync_job { 3578 cf::sync_job {
3579 # this is a trade-off: we want to be very quick here, so
3580 # save all maps without fsync, and later call a global sync
3581 # (which in turn might be very very slow)
3582 local $USE_FSYNC = 0;
3583
3072 # use a peculiar iteration method to avoid tripping on perl 3584 # use a peculiar iteration method to avoid tripping on perl
3073 # refcount bugs in for. also avoids problems with players 3585 # refcount bugs in for. also avoids problems with players
3074 # and maps saved/destroyed asynchronously. 3586 # and maps saved/destroyed asynchronously.
3075 warn "begin emergency player save\n"; 3587 warn "emergency_perl_save: begin player save\n";
3076 for my $login (keys %cf::PLAYER) { 3588 for my $login (keys %cf::PLAYER) {
3077 my $pl = $cf::PLAYER{$login} or next; 3589 my $pl = $cf::PLAYER{$login} or next;
3078 $pl->valid or next; 3590 $pl->valid or next;
3591 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3079 $pl->save; 3592 $pl->save;
3080 } 3593 }
3081 warn "end emergency player save\n"; 3594 warn "emergency_perl_save: end player save\n";
3082 3595
3083 warn "begin emergency map save\n"; 3596 warn "emergency_perl_save: begin map save\n";
3084 for my $path (keys %cf::MAP) { 3597 for my $path (keys %cf::MAP) {
3085 my $map = $cf::MAP{$path} or next; 3598 my $map = $cf::MAP{$path} or next;
3086 $map->valid or next; 3599 $map->valid or next;
3087 $map->save; 3600 $map->save;
3088 } 3601 }
3089 warn "end emergency map save\n"; 3602 warn "emergency_perl_save: end map save\n";
3090 3603
3091 warn "begin emergency database checkpoint\n"; 3604 warn "emergency_perl_save: begin database checkpoint\n";
3092 BDB::db_env_txn_checkpoint $DB_ENV; 3605 BDB::db_env_txn_checkpoint $DB_ENV;
3093 warn "end emergency database checkpoint\n"; 3606 warn "emergency_perl_save: end database checkpoint\n";
3607
3608 warn "emergency_perl_save: begin write uuid\n";
3609 write_uuid_sync 1;
3610 warn "emergency_perl_save: end write uuid\n";
3094 }; 3611 };
3095 3612
3613 warn "emergency_perl_save: starting sync()\n";
3614 IO::AIO::aio_sync sub {
3615 warn "emergency_perl_save: finished sync()\n";
3616 };
3617
3096 warn "leave emergency perl save\n"; 3618 warn "emergency_perl_save: leave\n";
3097} 3619}
3098 3620
3099sub post_cleanup { 3621sub post_cleanup {
3100 my ($make_core) = @_; 3622 my ($make_core) = @_;
3101 3623
3102 warn Carp::longmess "post_cleanup backtrace" 3624 warn Carp::longmess "post_cleanup backtrace"
3103 if $make_core; 3625 if $make_core;
3626
3627 my $fh = pidfile;
3628 unlink $PIDFILE if <$fh> == $$;
3629}
3630
3631# a safer delete_package, copied from Symbol
3632sub clear_package($) {
3633 my $pkg = shift;
3634
3635 # expand to full symbol table name if needed
3636 unless ($pkg =~ /^main::.*::$/) {
3637 $pkg = "main$pkg" if $pkg =~ /^::/;
3638 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3639 $pkg .= '::' unless $pkg =~ /::$/;
3640 }
3641
3642 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3643 my $stem_symtab = *{$stem}{HASH};
3644
3645 defined $stem_symtab and exists $stem_symtab->{$leaf}
3646 or return;
3647
3648 # clear all symbols
3649 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3650 for my $name (keys %$leaf_symtab) {
3651 _gv_clear *{"$pkg$name"};
3652# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3653 }
3654 warn "cleared package $pkg\n";#d#
3104} 3655}
3105 3656
3106sub do_reload_perl() { 3657sub do_reload_perl() {
3107 # can/must only be called in main 3658 # can/must only be called in main
3108 if ($Coro::current != $Coro::main) { 3659 if ($Coro::current != $Coro::main) {
3109 warn "can only reload from main coroutine"; 3660 warn "can only reload from main coroutine";
3110 return; 3661 return;
3111 } 3662 }
3112 3663
3664 return if $RELOAD++;
3665
3666 my $t1 = EV::time;
3667
3668 while ($RELOAD) {
3113 warn "reloading..."; 3669 warn "reloading...";
3114 3670
3115 warn "entering sync_job"; 3671 warn "entering sync_job";
3116 3672
3117 cf::sync_job { 3673 cf::sync_job {
3118 cf::write_runtime; # external watchdog should not bark 3674 cf::write_runtime_sync; # external watchdog should not bark
3119 cf::emergency_save; 3675 cf::emergency_save;
3120 cf::write_runtime; # external watchdog should not bark 3676 cf::write_runtime_sync; # external watchdog should not bark
3121 3677
3122 warn "syncing database to disk"; 3678 warn "syncing database to disk";
3123 BDB::db_env_txn_checkpoint $DB_ENV; 3679 BDB::db_env_txn_checkpoint $DB_ENV;
3124 3680
3125 # if anything goes wrong in here, we should simply crash as we already saved 3681 # if anything goes wrong in here, we should simply crash as we already saved
3126 3682
3127 warn "cancelling all WF_AUTOCANCEL watchers";
3128 for (Event::all_watchers) {
3129 $_->cancel if $_->data & WF_AUTOCANCEL;
3130 }
3131
3132 warn "flushing outstanding aio requests"; 3683 warn "flushing outstanding aio requests";
3133 for (;;) {
3134 BDB::flush;
3135 IO::AIO::flush;
3136 Coro::cede;
3137 last unless IO::AIO::nreqs || BDB::nreqs; 3684 while (IO::AIO::nreqs || BDB::nreqs) {
3138 warn "iterate..."; 3685 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3139 }
3140
3141 ++$RELOAD;
3142
3143 warn "cancelling all extension coros";
3144 $_->cancel for values %EXT_CORO;
3145 %EXT_CORO = ();
3146
3147 warn "removing commands";
3148 %COMMAND = ();
3149
3150 warn "removing ext/exti commands";
3151 %EXTCMD = ();
3152 %EXTICMD = ();
3153
3154 warn "unloading/nuking all extensions";
3155 for my $pkg (@EXTS) {
3156 warn "... unloading $pkg";
3157
3158 if (my $cb = $pkg->can ("unload")) {
3159 eval {
3160 $cb->($pkg);
3161 1
3162 } or warn "$pkg unloaded, but with errors: $@";
3163 } 3686 }
3164 3687
3165 warn "... nuking $pkg"; 3688 warn "cancelling all extension coros";
3166 Symbol::delete_package $pkg; 3689 $_->cancel for values %EXT_CORO;
3167 } 3690 %EXT_CORO = ();
3168 3691
3169 warn "unloading all perl modules loaded from $LIBDIR"; 3692 warn "removing commands";
3170 while (my ($k, $v) = each %INC) { 3693 %COMMAND = ();
3171 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3172 3694
3695 warn "removing ext/exti commands";
3696 %EXTCMD = ();
3697 %EXTICMD = ();
3698
3699 warn "unloading/nuking all extensions";
3700 for my $pkg (@EXTS) {
3173 warn "... unloading $k"; 3701 warn "... unloading $pkg";
3174 delete $INC{$k};
3175 3702
3176 $k =~ s/\.pm$//;
3177 $k =~ s/\//::/g;
3178
3179 if (my $cb = $k->can ("unload_module")) { 3703 if (my $cb = $pkg->can ("unload")) {
3704 eval {
3180 $cb->(); 3705 $cb->($pkg);
3706 1
3707 } or warn "$pkg unloaded, but with errors: $@";
3708 }
3709
3710 warn "... clearing $pkg";
3711 clear_package $pkg;
3181 } 3712 }
3182 3713
3183 Symbol::delete_package $k; 3714 warn "unloading all perl modules loaded from $LIBDIR";
3715 while (my ($k, $v) = each %INC) {
3716 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3717
3718 warn "... unloading $k";
3719 delete $INC{$k};
3720
3721 $k =~ s/\.pm$//;
3722 $k =~ s/\//::/g;
3723
3724 if (my $cb = $k->can ("unload_module")) {
3725 $cb->();
3726 }
3727
3728 clear_package $k;
3184 } 3729 }
3185 3730
3186 warn "getting rid of safe::, as good as possible"; 3731 warn "getting rid of safe::, as good as possible";
3187 Symbol::delete_package "safe::$_" 3732 clear_package "safe::$_"
3188 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3733 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3189 3734
3190 warn "unloading cf.pm \"a bit\""; 3735 warn "unloading cf.pm \"a bit\"";
3191 delete $INC{"cf.pm"}; 3736 delete $INC{"cf.pm"};
3192 delete $INC{"cf/pod.pm"}; 3737 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3193 3738
3194 # don't, removes xs symbols, too, 3739 # don't, removes xs symbols, too,
3195 # and global variables created in xs 3740 # and global variables created in xs
3196 #Symbol::delete_package __PACKAGE__; 3741 #clear_package __PACKAGE__;
3197 3742
3198 warn "unload completed, starting to reload now"; 3743 warn "unload completed, starting to reload now";
3199 3744
3200 warn "reloading cf.pm"; 3745 warn "reloading cf.pm";
3201 require cf; 3746 require cf;
3202 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3747 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3203 3748
3204 warn "loading config and database again"; 3749 warn "loading config and database again";
3205 cf::cfg_load; 3750 cf::reload_config;
3206 3751
3207 warn "loading extensions"; 3752 warn "loading extensions";
3208 cf::load_extensions; 3753 cf::load_extensions;
3209 3754
3755 if ($REATTACH_ON_RELOAD) {
3210 warn "reattaching attachments to objects/players"; 3756 warn "reattaching attachments to objects/players";
3211 _global_reattach; # objects, sockets 3757 _global_reattach; # objects, sockets
3212 warn "reattaching attachments to maps"; 3758 warn "reattaching attachments to maps";
3213 reattach $_ for values %MAP; 3759 reattach $_ for values %MAP;
3214 warn "reattaching attachments to players"; 3760 warn "reattaching attachments to players";
3215 reattach $_ for values %PLAYER; 3761 reattach $_ for values %PLAYER;
3762 }
3216 3763
3764 warn "running post_init jobs";
3765 (pop @POST_INIT)->(1) while @POST_INIT;
3766
3217 warn "leaving sync_job"; 3767 warn "leaving sync_job";
3218 3768
3219 1 3769 1
3220 } or do { 3770 } or do {
3221 warn $@; 3771 warn $@;
3222 warn "error while reloading, exiting."; 3772 cf::cleanup "error while reloading, exiting.";
3223 exit 1;
3224 }; 3773 };
3225 3774
3226 warn "reloaded"; 3775 warn "reloaded";
3776 --$RELOAD;
3777 }
3778
3779 $t1 = EV::time - $t1;
3780 warn "reload completed in ${t1}s\n";
3227}; 3781};
3228 3782
3229our $RELOAD_WATCHER; # used only during reload 3783our $RELOAD_WATCHER; # used only during reload
3230 3784
3231sub reload_perl() { 3785sub reload_perl() {
3232 # doing reload synchronously and two reloads happen back-to-back, 3786 # doing reload synchronously and two reloads happen back-to-back,
3233 # coro crashes during coro_state_free->destroy here. 3787 # coro crashes during coro_state_free->destroy here.
3234 3788
3235 $RELOAD_WATCHER ||= Event->timer ( 3789 $RELOAD_WATCHER ||= cf::async {
3236 reentrant => 0, 3790 Coro::AIO::aio_wait cache_extensions;
3237 after => 0, 3791
3238 data => WF_AUTOCANCEL, 3792 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3239 cb => sub {
3240 do_reload_perl; 3793 do_reload_perl;
3241 undef $RELOAD_WATCHER; 3794 undef $RELOAD_WATCHER;
3242 }, 3795 };
3243 ); 3796 };
3244} 3797}
3245 3798
3246register_command "reload" => sub { 3799register_command "reload" => sub {
3247 my ($who, $arg) = @_; 3800 my ($who, $arg) = @_;
3248 3801
3249 if ($who->flag (FLAG_WIZ)) { 3802 if ($who->flag (FLAG_WIZ)) {
3250 $who->message ("reloading server."); 3803 $who->message ("reloading server.");
3804 async {
3805 $Coro::current->{desc} = "perl_reload";
3251 async { reload_perl }; 3806 reload_perl;
3807 };
3252 } 3808 }
3253}; 3809};
3254 3810
3255unshift @INC, $LIBDIR; 3811unshift @INC, $LIBDIR;
3256 3812
3258 3814
3259our @WAIT_FOR_TICK; 3815our @WAIT_FOR_TICK;
3260our @WAIT_FOR_TICK_BEGIN; 3816our @WAIT_FOR_TICK_BEGIN;
3261 3817
3262sub wait_for_tick { 3818sub wait_for_tick {
3263 return unless $TICK_WATCHER->is_active;
3264 return if $Coro::current == $Coro::main; 3819 return if tick_inhibit || $Coro::current == $Coro::main;
3265 3820
3266 my $signal = new Coro::Signal; 3821 my $signal = new Coro::Signal;
3267 push @WAIT_FOR_TICK, $signal; 3822 push @WAIT_FOR_TICK, $signal;
3268 $signal->wait; 3823 $signal->wait;
3269} 3824}
3270 3825
3271sub wait_for_tick_begin { 3826sub wait_for_tick_begin {
3272 return unless $TICK_WATCHER->is_active;
3273 return if $Coro::current == $Coro::main; 3827 return if tick_inhibit || $Coro::current == $Coro::main;
3274 3828
3275 my $signal = new Coro::Signal; 3829 my $signal = new Coro::Signal;
3276 push @WAIT_FOR_TICK_BEGIN, $signal; 3830 push @WAIT_FOR_TICK_BEGIN, $signal;
3277 $signal->wait; 3831 $signal->wait;
3278} 3832}
3279 3833
3280 my $min = 1e6;#d# 3834sub tick {
3281 my $avg = 10;
3282$TICK_WATCHER = Event->timer (
3283 reentrant => 0,
3284 parked => 1,
3285 prio => 0,
3286 at => $NEXT_TICK || $TICK,
3287 data => WF_AUTOCANCEL,
3288 cb => sub {
3289 if ($Coro::current != $Coro::main) { 3835 if ($Coro::current != $Coro::main) {
3290 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3836 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3291 unless ++$bug_warning > 10; 3837 unless ++$bug_warning > 10;
3292 return; 3838 return;
3293 } 3839 }
3294 3840
3295 $NOW = $tick_start = Event::time;
3296
3297 cf::server_tick; # one server iteration 3841 cf::server_tick; # one server iteration
3298 3842
3299 0 && sync_job {#d# 3843 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3300 for(1..10) { 3844 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3301 my $t = Event::time; 3845 Coro::async_pool {
3302 my $map = my $map = new_from_path cf::map "/tmp/x.map" 3846 $Coro::current->{desc} = "runtime saver";
3303 or die; 3847 write_runtime_sync
3304 3848 or warn "ERROR: unable to write runtime file: $!";
3305 $map->width (50);
3306 $map->height (50);
3307 $map->alloc;
3308 $map->_load_objects ("/tmp/x.map", 1);
3309 my $t = Event::time - $t;
3310
3311 #next unless $t < 0.0013;#d#
3312 if ($t < $min) {
3313 $min = $t;
3314 }
3315 $avg = $avg * 0.99 + $t * 0.01;
3316 }
3317 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3318 exit 0;
3319 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3320 }; 3849 };
3850 }
3321 3851
3322 $RUNTIME += $TICK;
3323 $NEXT_TICK += $TICK;
3324
3325 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3326 $NEXT_RUNTIME_WRITE = $NOW + 10;
3327 Coro::async_pool {
3328 write_runtime
3329 or warn "ERROR: unable to write runtime file: $!";
3330 };
3331 }
3332
3333# my $AFTER = Event::time;
3334# warn $AFTER - $NOW;#d#
3335
3336 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3852 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3337 $sig->send; 3853 $sig->send;
3338 } 3854 }
3339 while (my $sig = shift @WAIT_FOR_TICK) { 3855 while (my $sig = shift @WAIT_FOR_TICK) {
3340 $sig->send; 3856 $sig->send;
3341 } 3857 }
3342 3858
3343 $NOW = Event::time; 3859 $LOAD = ($NOW - $TICK_START) / $TICK;
3344
3345 # if we are delayed by four ticks or more, skip them all
3346 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3347
3348 $TICK_WATCHER->at ($NEXT_TICK);
3349 $TICK_WATCHER->start;
3350
3351 $LOAD = ($NOW - $tick_start) / $TICK;
3352 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3860 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3353 3861
3354 _post_tick; 3862 if (0) {
3355 3863 if ($NEXT_TICK) {
3356 3864 my $jitter = $TICK_START - $NEXT_TICK;
3865 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3866 warn "jitter $JITTER\n";#d#
3867 }
3357 }, 3868 }
3358); 3869}
3359 3870
3360{ 3871{
3361 BDB::max_poll_time $TICK * 0.1; 3872 # configure BDB
3362 $BDB_POLL_WATCHER = Event->io ( 3873
3363 reentrant => 0,
3364 fd => BDB::poll_fileno,
3365 poll => 'r',
3366 prio => 0,
3367 data => WF_AUTOCANCEL,
3368 cb => \&BDB::poll_cb,
3369 );
3370 BDB::min_parallel 8; 3874 BDB::min_parallel 8;
3371 3875 BDB::max_poll_reqs $TICK * 0.1;
3372 BDB::set_sync_prepare { 3876 $AnyEvent::BDB::WATCHER->priority (1);
3373 my $status;
3374 my $current = $Coro::current;
3375 (
3376 sub {
3377 $status = $!;
3378 $current->ready; undef $current;
3379 },
3380 sub {
3381 Coro::schedule while defined $current;
3382 $! = $status;
3383 },
3384 )
3385 };
3386 3877
3387 unless ($DB_ENV) { 3878 unless ($DB_ENV) {
3388 $DB_ENV = BDB::db_env_create; 3879 $DB_ENV = BDB::db_env_create;
3880 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3881 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3882 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3883 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3884 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3389 3885
3390 cf::sync_job { 3886 cf::sync_job {
3391 eval { 3887 eval {
3392 BDB::db_env_open 3888 BDB::db_env_open
3393 $DB_ENV, 3889 $DB_ENV,
3395 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3891 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3396 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3892 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3397 0666; 3893 0666;
3398 3894
3399 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 3895 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3400
3401 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3402 $DB_ENV->set_lk_detect;
3403 }; 3896 };
3404 3897
3405 cf::cleanup "db_env_open(db): $@" if $@; 3898 cf::cleanup "db_env_open(db): $@" if $@;
3406 }; 3899 };
3407 } 3900 }
3901
3902 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3903 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3904 };
3905 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3906 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3907 };
3908 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3909 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3910 };
3408} 3911}
3409 3912
3410{ 3913{
3914 # configure IO::AIO
3915
3411 IO::AIO::min_parallel 8; 3916 IO::AIO::min_parallel 8;
3412
3413 undef $Coro::AIO::WATCHER;
3414 IO::AIO::max_poll_time $TICK * 0.1; 3917 IO::AIO::max_poll_time $TICK * 0.1;
3415 $AIO_POLL_WATCHER = Event->io ( 3918 undef $AnyEvent::AIO::WATCHER;
3416 reentrant => 0,
3417 data => WF_AUTOCANCEL,
3418 fd => IO::AIO::poll_fileno,
3419 poll => 'r',
3420 prio => 6,
3421 cb => \&IO::AIO::poll_cb,
3422 );
3423} 3919}
3424 3920
3425my $_log_backtrace; 3921my $_log_backtrace;
3426 3922
3427sub _log_backtrace { 3923sub _log_backtrace {
3430 $msg =~ s/\n//; 3926 $msg =~ s/\n//;
3431 3927
3432 # limit the # of concurrent backtraces 3928 # limit the # of concurrent backtraces
3433 if ($_log_backtrace < 2) { 3929 if ($_log_backtrace < 2) {
3434 ++$_log_backtrace; 3930 ++$_log_backtrace;
3931 my $perl_bt = Carp::longmess $msg;
3435 async { 3932 async {
3933 $Coro::current->{desc} = "abt $msg";
3934
3436 my @bt = fork_call { 3935 my @bt = fork_call {
3437 @addr = map { sprintf "%x", $_ } @addr; 3936 @addr = map { sprintf "%x", $_ } @addr;
3438 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 3937 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3439 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 3938 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3440 or die "addr2line: $!"; 3939 or die "addr2line: $!";
3448 } 3947 }
3449 3948
3450 @funcs 3949 @funcs
3451 }; 3950 };
3452 3951
3453 LOG llevInfo, "[ABT] $msg\n"; 3952 LOG llevInfo, "[ABT] $perl_bt\n";
3953 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3454 LOG llevInfo, "[ABT] $_\n" for @bt; 3954 LOG llevInfo, "[ABT] $_\n" for @bt;
3455 --$_log_backtrace; 3955 --$_log_backtrace;
3456 }; 3956 };
3457 } else { 3957 } else {
3458 LOG llevInfo, "[ABT] $msg\n"; 3958 LOG llevInfo, "[ABT] $msg\n";
3459 LOG llevInfo, "[ABT] [suppressed]\n"; 3959 LOG llevInfo, "[ABT] [suppressed]\n";
3460 } 3960 }
3461} 3961}
3462 3962
3463# load additional modules 3963# load additional modules
3464use cf::pod; 3964require "cf/$_.pm" for @EXTRA_MODULES;
3465 3965
3466END { cf::emergency_save } 3966END { cf::emergency_save }
3467 3967
34681 39681
3469 3969

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines