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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines