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.395 by root, Sat Nov 10 22:41:59 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 Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
37use Guard ();
15use Coro 4.1 (); 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 (); 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.51 (); 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
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 118our $DB_ENV;
89 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
90our %CFG; 122our %CFG;
91 123
92our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 125our $RUNTIME;
126our $NOW;
94 127
95our (%PLAYER, %PLAYER_LOADING); # all users 128our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 129our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 130our $LINK_MAP; # the special {link} map, which is always available
98 131
99# 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 ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 133our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 134
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
137our $JITTER; # average jitter
104our $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 :)
105 144
106binmode STDOUT; 145binmode STDOUT;
107binmode STDERR; 146binmode STDERR;
108 147
109# read virtual server time, if available 148# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
114} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
115 156
116mkdir $_ 157mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
118 159
119our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
181 222
182=back 223=back
183 224
184=cut 225=cut
185 226
186BEGIN { 227$Coro::State::WARNHOOK = sub {
187 *CORE::GLOBAL::warn = sub {
188 my $msg = join "", @_; 228 my $msg = join "", @_;
189 229
190 $msg .= "\n" 230 $msg .= "\n"
191 unless $msg =~ /\n$/; 231 unless $msg =~ /\n$/;
192 232
193 $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;
194 234
195 LOG llevError, $msg; 235 LOG llevError, $msg;
196 }; 236};
197} 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};
198 251
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 252@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 253@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 254@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 255@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 262for my $pkg (qw(
210 cf::global cf::attachable 263 cf::global cf::attachable
211 cf::object cf::object::player 264 cf::object cf::object::player
212 cf::client cf::player 265 cf::client cf::player
213 cf::arch cf::living 266 cf::arch cf::living
267 cf::map cf::mapspace
214 cf::map cf::party cf::region 268 cf::party cf::region
215)) { 269)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 270 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 271}
219 272
220$Event::DIED = sub { 273$EV::DIED = sub {
221 warn "error in event callback: @_"; 274 warn "error in event callback: @_";
222}; 275};
223 276
224############################################################################# 277#############################################################################
225 278
248 $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;
249 $d 302 $d
250 } || "[unable to dump $_[0]: '$@']"; 303 } || "[unable to dump $_[0]: '$@']";
251} 304}
252 305
253=item $ref = cf::from_json $json 306=item $ref = cf::decode_json $json
254 307
255Converts a JSON string into the corresponding perl data structure. 308Converts a JSON string into the corresponding perl data structure.
256 309
257=item $json = cf::to_json $ref 310=item $json = cf::encode_json $ref
258 311
259Converts a perl data structure into its JSON representation. 312Converts a perl data structure into its JSON representation.
260 313
261=cut 314=cut
262 315
263our $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
264 317
265sub to_json ($) { $json_coder->encode ($_[0]) } 318sub encode_json($) { $json_coder->encode ($_[0]) }
266sub 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}
267 334
268=item cf::lock_wait $string 335=item cf::lock_wait $string
269 336
270Wait until the given lock is available. See cf::lock_acquire. 337Wait until the given lock is available. See cf::lock_acquire.
271 338
272=item my $lock = cf::lock_acquire $string 339=item my $lock = cf::lock_acquire $string
273 340
274Wait 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
275a 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,
276for example when the coroutine gets canceled), the lock is automatically 343for example when the coroutine gets canceled), the lock is automatically
277returned. 344returned.
278 345
279Locks are *not* recursive, locking from the same coro twice results in a 346Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro. 347deadlocked coro.
286 353
287Return 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.
288 355
289=cut 356=cut
290 357
291our %LOCK; 358our $LOCKS = new Coro::SemaphoreSet;
292our %LOCKER;#d#
293 359
294sub lock_wait($) { 360sub lock_wait($) {
295 my ($key) = @_; 361 $LOCKS->wait ($_[0]);
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
301
302 # wait for lock, if any
303 while ($LOCK{$key}) {
304 push @{ $LOCK{$key} }, $Coro::current;
305 Coro::schedule;
306 }
307} 362}
308 363
309sub lock_acquire($) { 364sub lock_acquire($) {
310 my ($key) = @_; 365 $LOCKS->guard ($_[0])
311
312 # wait, to be sure we are not locked
313 lock_wait $key;
314
315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
317
318 Coro::guard {
319 delete $LOCKER{$key};#d#
320 # wake up all waiters, to be on the safe side
321 $_->ready for @{ delete $LOCK{$key} };
322 }
323} 366}
324 367
325sub lock_active($) { 368sub lock_active($) {
326 my ($key) = @_; 369 $LOCKS->count ($_[0]) < 1
327
328 ! ! $LOCK{$key}
329} 370}
330 371
331sub freeze_mainloop { 372sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 373 tick_inhibit_inc;
333 374
334 my $guard = Coro::guard { 375 &Guard::guard (\&tick_inhibit_dec);
335 $TICK_WATCHER->start; 376}
336 }; 377
337 $TICK_WATCHER->stop; 378=item cf::periodic $interval, $cb
338 $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
339} 391}
340 392
341=item cf::get_slot $time[, $priority[, $name]] 393=item cf::get_slot $time[, $priority[, $name]]
342 394
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 395Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 435 }
384 } 436 }
385}; 437};
386 438
387sub get_slot($;$$) { 439sub get_slot($;$$) {
440 return if tick_inhibit || $Coro::current == $Coro::main;
441
388 my ($time, $pri, $name) = @_; 442 my ($time, $pri, $name) = @_;
389 443
390 $time = $TICK * .6 if $time > $TICK * .6; 444 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 445 my $sig = new Coro::Signal;
392 446
422 476
423sub sync_job(&) { 477sub sync_job(&) {
424 my ($job) = @_; 478 my ($job) = @_;
425 479
426 if ($Coro::current == $Coro::main) { 480 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 481 my $time = EV::time;
428 482
429 # this is the main coro, too bad, we have to block 483 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 484 # till the operation succeeds, freezing the server :/
431 485
432 LOG llevError, Carp::longmess "sync job";#d# 486 LOG llevError, Carp::longmess "sync job";#d#
433 487
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 488 my $freeze_guard = freeze_mainloop;
437 489
438 my $busy = 1; 490 my $busy = 1;
439 my @res; 491 my @res;
440 492
447 499
448 while ($busy) { 500 while ($busy) {
449 if (Coro::nready) { 501 if (Coro::nready) {
450 Coro::cede_notself; 502 Coro::cede_notself;
451 } else { 503 } else {
452 Event::one_event; 504 EV::loop EV::LOOP_ONESHOT;
453 } 505 }
454 } 506 }
455 507
456 $time = Event::time - $time; 508 my $time = EV::time - $time;
457 509
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load 510 $TICK_START += $time; # do not account sync jobs to server load
462 511
463 wantarray ? @res : $res[0] 512 wantarray ? @res : $res[0]
464 } else { 513 } else {
465 # we are in another coroutine, how wonderful, everything just works 514 # we are in another coroutine, how wonderful, everything just works
466 515
491=item fork_call { }, $args 540=item fork_call { }, $args
492 541
493Executes the given code block with the given arguments in a seperate 542Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 543process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 544Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 545never block itself or use any form of event handling.
497 546
498=cut 547=cut
499 548
500sub fork_call(&@) { 549sub fork_call(&@) {
501 my ($cb, @args) = @_; 550 my ($cb, @args) = @_;
508 reset_signals; 557 reset_signals;
509 &$cb 558 &$cb
510 }, @args; 559 }, @args;
511 560
512 wantarray ? @res : $res[-1] 561 wantarray ? @res : $res[-1]
562}
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
513} 589}
514 590
515=item $value = cf::db_get $family => $key 591=item $value = cf::db_get $family => $key
516 592
517Returns a single value from the environment database. 593Returns a single value from the environment database.
656 732
657############################################################################# 733#############################################################################
658 734
659=head2 ATTACHABLE OBJECTS 735=head2 ATTACHABLE OBJECTS
660 736
661Many 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
662attach callbacks/event handlers (a collection of which is called an "attachment") 738attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 739to it. All such attachable objects support the following methods.
664 740
665In 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>
666C<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
716=item cf::CLASS::attachment $name, ... 792=item cf::CLASS::attachment $name, ...
717 793
718Register an attachment by C<$name> through which attachable objects of the 794Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 795given CLASS can refer to this attachment.
720 796
721Some classes such as crossfire maps and objects can specify attachments 797Some classes such as deliantra maps and objects can specify attachments
722that 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.
723 799
724These calls expect any number of the following handler/hook descriptions: 800These calls expect any number of the following handler/hook descriptions:
725 801
726=over 4 802=over 4
954 } 1030 }
955 1031
956 0 1032 0
957} 1033}
958 1034
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1036
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1037=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1038
963Generate an object-specific event with the given arguments. 1039Generate an object-specific event with the given arguments.
964 1040
1017 1093
1018sub reattach { 1094sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1095 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1096 my ($obj) = @_;
1021 1097
1098 # no longer needed after getting rid of delete_package?
1022 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
1023 1100
1024 my $registry = $obj->registry; 1101 my $registry = $obj->registry;
1025 1102
1026 @$registry = (); 1103 @$registry = ();
1027 1104
1042cf::attachable->attach ( 1119cf::attachable->attach (
1043 prio => -1000000, 1120 prio => -1000000,
1044 on_instantiate => sub { 1121 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1122 my ($obj, $data) = @_;
1046 1123
1047 $data = from_json $data; 1124 $data = decode_json $data;
1048 1125
1049 for (@$data) { 1126 for (@$data) {
1050 my ($name, $args) = @$_; 1127 my ($name, $args) = @$_;
1051 1128
1052 $obj->attach ($name, %{$args || {} }); 1129 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1150 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1151 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1076 1153
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 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 }
1081 close $fh; 1161 aio_close $fh;
1082 1162
1083 if (@$objs) { 1163 if (@$objs) {
1084 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) {
1085 chmod SAVE_MODE, $fh; 1165 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1088 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 }
1089 close $fh; 1172 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1174 }
1092 } else { 1175 } else {
1093 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1094 } 1177 }
1095 1178
1096 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1097 } else { 1183 } else {
1098 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1099 } 1185 }
1100 } else { 1186 } else {
1101 aio_unlink $filename; 1187 aio_unlink $filename;
1102 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1103 } 1189 }
1194 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1195 1281
1196 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1197} 1283}
1198 1284
1285use File::Glob ();
1286
1199cf::player->attach ( 1287cf::player->attach (
1200 on_command => sub { 1288 on_command => sub {
1201 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1202 1290
1203 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
1235 1323
1236 cf::override; 1324 cf::override;
1237 }, 1325 },
1238); 1326);
1239 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}
1340
1240sub load_extensions { 1341sub load_extensions {
1241 cf::sync_job { 1342 cf::sync_job {
1242 my %todo; 1343 my %todo;
1243 1344
1244 for my $path (<$LIBDIR/*.ext>) { 1345 for my $path (<$LIBDIR/*.ext>) {
1263 1364
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1367
1267 $ext{source} = 1368 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1370 . "#line 1 \"$path\"\n{\n"
1270 . $source 1371 . $source
1271 . "\n};\n1"; 1372 . "\n};\n1";
1272 1373
1273 $todo{$base} = \%ext; 1374 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1390 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1391 : "$v->{base}: extension inactive.\n";
1291 1392
1292 if (exists $v->{meta}{mandatory}) { 1393 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1394 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1395 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1396 }
1297 1397
1298 warn $msg; 1398 warn $msg;
1299 } 1399 }
1300 1400
1314 1414
1315=back 1415=back
1316 1416
1317=head2 CORE EXTENSIONS 1417=head2 CORE EXTENSIONS
1318 1418
1319Functions and methods that extend core crossfire objects. 1419Functions and methods that extend core deliantra objects.
1320 1420
1321=cut 1421=cut
1322 1422
1323package cf::player; 1423package cf::player;
1324 1424
1367 1467
1368sub exists($) { 1468sub exists($) {
1369 my ($login) = @_; 1469 my ($login) = @_;
1370 1470
1371 $cf::PLAYER{$login} 1471 $cf::PLAYER{$login}
1372 or cf::sync_job { !aio_stat path $login } 1472 or !aio_stat path $login
1373} 1473}
1374 1474
1375sub find($) { 1475sub find($) {
1376 return $cf::PLAYER{$_[0]} || do { 1476 return $cf::PLAYER{$_[0]} || do {
1377 my $login = $_[0]; 1477 my $login = $_[0];
1389 my $f = new_from_file cf::object::thawer path $login 1489 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1490 or return;
1391 1491
1392 my $pl = cf::player::load_pl $f 1492 my $pl = cf::player::load_pl $f
1393 or return; 1493 or return;
1494
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1495 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1496 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1497 $cf::PLAYER{$login} = $pl
1397 } 1498 }
1398 } 1499 }
1408 1509
1409 return if $pl->{deny_save}; 1510 return if $pl->{deny_save};
1410 1511
1411 aio_mkdir playerdir $pl, 0770; 1512 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1513 $pl->{last_save} = $cf::RUNTIME;
1514
1515 cf::get_slot 0.01;
1413 1516
1414 $pl->save_pl ($path); 1517 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1518 cf::cede_to_tick;
1416} 1519}
1417 1520
1449 my ($pl) = @_; 1552 my ($pl) = @_;
1450 1553
1451 my $name = $pl->ob->name; 1554 my $name = $pl->ob->name;
1452 1555
1453 $pl->{deny_save} = 1; 1556 $pl->{deny_save} = 1;
1454 $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
1455 1558
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1560 $pl->deactivate;
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1563 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1564 $pl->ns->destroy if $pl->ns;
1460 1565
1461 my $path = playerdir $pl; 1566 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1567 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1606
1502 for my $login (@$dirs) { 1607 for my $login (@$dirs) {
1503 my $path = path $login; 1608 my $path = path $login;
1504 1609
1505 # a .pst is a dead give-away for a valid player 1610 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1611 # if no pst file found, open and chekc for blocked users
1612 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1613 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1614 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1615 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1616 }
1511 1617
1542 } 1648 }
1543 1649
1544 \@paths 1650 \@paths
1545} 1651}
1546 1652
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1653=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1654
1549Expand crossfire pod fragments into protocol xml. 1655Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 # match a pod interior sequence sans C<< >>
1558 (?:
1559 \ (.*?)\ (?{ $group = $^N })
1560 | < (??{$interior}) >
1561 )
1562}x;
1563
1564sub expand_cfpod {
1565 my ($self, $pod) = @_;
1566
1567 my $xml;
1568
1569 while () {
1570 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1571 $group = $1;
1572
1573 $group =~ s/&/&amp;/g;
1574 $group =~ s/</&lt;/g;
1575
1576 $xml .= $group;
1577 } elsif ($pod =~ m%\G
1578 ([BCGHITU])
1579 <
1580 (?:
1581 ([^<>]*) (?{ $group = $^N })
1582 | < $interior >
1583 )
1584 >
1585 %gcsx
1586 ) {
1587 my ($code, $data) = ($1, $group);
1588
1589 if ($code eq "B") {
1590 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1591 } elsif ($code eq "I") {
1592 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1593 } elsif ($code eq "U") {
1594 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1595 } elsif ($code eq "C") {
1596 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1597 } elsif ($code eq "T") {
1598 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1599 } elsif ($code eq "G") {
1600 my ($male, $female) = split /\|/, $data;
1601 $data = $self->gender ? $female : $male;
1602 $xml .= expand_cfpod ($self, $data);
1603 } elsif ($code eq "H") {
1604 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1605 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1606 "")
1607 [$self->{hintmode}];
1608 } else {
1609 $xml .= "error processing '$code($data)' directive";
1610 }
1611 } else {
1612 if ($pod =~ /\G(.+)/) {
1613 warn "parse error while expanding $pod (at $1)";
1614 }
1615 last;
1616 }
1617 }
1618
1619 for ($xml) {
1620 # create single paragraphs (very hackish)
1621 s/(?<=\S)\n(?=\w)/ /g;
1622
1623 # compress some whitespace
1624 s/\s+\n/\n/g; # ws line-ends
1625 s/\n\n+/\n/g; # double lines
1626 s/^\n+//; # beginning lines
1627 s/\n+$//; # ending lines
1628 }
1629
1630 $xml
1631}
1632
1633no re 'eval';
1634
1635sub hintmode {
1636 $_[0]{hintmode} = $_[1] if @_ > 1;
1637 $_[0]{hintmode}
1638}
1639 1656
1640=item $player->ext_reply ($msgid, @msg) 1657=item $player->ext_reply ($msgid, @msg)
1641 1658
1642Sends an ext reply to the player. 1659Sends an ext reply to the player.
1643 1660
1710our $MAX_RESET = 3600; 1727our $MAX_RESET = 3600;
1711our $DEFAULT_RESET = 3000; 1728our $DEFAULT_RESET = 3000;
1712 1729
1713sub generate_random_map { 1730sub generate_random_map {
1714 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
1715 # mit "rum" bekleckern, nicht 1735 # mit "rum" bekleckern, nicht
1716 $self->_create_random_map ( 1736 $self->_create_random_map (
1717 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1718 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1719 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1841 1861
1842# the temporary/swap location 1862# the temporary/swap location
1843sub save_path { 1863sub save_path {
1844 my ($self) = @_; 1864 my ($self) = @_;
1845 1865
1846 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1847 "$TMPDIR/$path.map" 1867 "$TMPDIR/$path.map"
1848} 1868}
1849 1869
1850# the unique path, undef == no special unique path 1870# the unique path, undef == no special unique path
1851sub uniq_path { 1871sub uniq_path {
1852 my ($self) = @_; 1872 my ($self) = @_;
1853 1873
1854 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1855 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1856}
1857
1858# and all this just because we cannot iterate over
1859# all maps in C++...
1860sub change_all_map_light {
1861 my ($change) = @_;
1862
1863 $_->change_map_light ($change)
1864 for grep $_->outdoor, values %cf::MAP;
1865} 1876}
1866 1877
1867sub decay_objects { 1878sub decay_objects {
1868 my ($self) = @_; 1879 my ($self) = @_;
1869 1880
1953sub find { 1964sub find {
1954 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
1955 1966
1956 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
1957 1968
1958 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1959 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
1960 1971
1961 $cf::MAP{$path} || do { 1972 $cf::MAP{$path} || do {
1962 my $guard1 = cf::lock_acquire "map_find:$path";
1963 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1964
1965 my $map = new_from_path cf::map $path 1973 my $map = new_from_path cf::map $path
1966 or return; 1974 or return;
1967 1975
1968 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
1969 1977
1971 or return; 1979 or return;
1972 1980
1973 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1981 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1974 # doing this can freeze the server in a sync job, obviously 1982 # doing this can freeze the server in a sync job, obviously
1975 #$cf::WAIT_FOR_TICK->wait; 1983 #$cf::WAIT_FOR_TICK->wait;
1984 undef $guard2;
1976 undef $guard1; 1985 undef $guard1;
1977 undef $guard2;
1978 $map->reset; 1986 $map->reset;
1979 return find $path; 1987 return find $path;
1980 } 1988 }
1981 1989
1982 $cf::MAP{$path} = $map 1990 $cf::MAP{$path} = $map
2009 my $f = new_from_file cf::object::thawer $self->{load_path}; 2017 my $f = new_from_file cf::object::thawer $self->{load_path};
2010 $f->skip_block; 2018 $f->skip_block;
2011 $self->_load_objects ($f) 2019 $self->_load_objects ($f)
2012 or return; 2020 or return;
2013 2021
2014 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2022 $self->post_load_original
2015 if delete $self->{load_original}; 2023 if delete $self->{load_original};
2016 2024
2017 if (my $uniq = $self->uniq_path) { 2025 if (my $uniq = $self->uniq_path) {
2018 utf8::encode $uniq; 2026 utf8::encode $uniq;
2019 unless (aio_stat $uniq) { 2027 unless (aio_stat $uniq) {
2037 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2038 $self->decay_objects; 2046 $self->decay_objects;
2039 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2040 $self->update_buttons; 2048 $self->update_buttons;
2041 cf::cede_to_tick; 2049 cf::cede_to_tick;
2042 $self->set_darkness_map;
2043 cf::cede_to_tick;
2044 $self->activate; 2050 $self->activate;
2045 } 2051 }
2046 2052
2047 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
2048 $self->last_access ($cf::RUNTIME); 2054 $self->last_access ($cf::RUNTIME);
2049 2055
2050 $self->in_memory (cf::MAP_IN_MEMORY); 2056 $self->in_memory (cf::MAP_ACTIVE);
2051 } 2057 }
2052 2058
2053 $self->post_load; 2059 $self->post_load;
2054} 2060}
2055 2061
2113 my ($path, $origin, $load) = @_; 2119 my ($path, $origin, $load) = @_;
2114 2120
2115 $path = normalise $path, $origin && $origin->{path}; 2121 $path = normalise $path, $origin && $origin->{path};
2116 2122
2117 if (my $map = $cf::MAP{$path}) { 2123 if (my $map = $cf::MAP{$path}) {
2118 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2119 } 2125 }
2120 2126
2121 $MAP_PREFETCH{$path} |= $load; 2127 $MAP_PREFETCH{$path} |= $load;
2122 2128
2123 $MAP_PREFETCHER ||= cf::async { 2129 $MAP_PREFETCHER ||= cf::async {
2160 cf::async { 2166 cf::async {
2161 $Coro::current->{desc} = "map player save"; 2167 $Coro::current->{desc} = "map player save";
2162 $_->contr->save for $self->players; 2168 $_->contr->save for $self->players;
2163 }; 2169 };
2164 2170
2171 cf::get_slot 0.02;
2172
2165 if ($uniq) { 2173 if ($uniq) {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2174 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2167 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2175 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2168 } else { 2176 } else {
2169 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2177 $self->save; 2185 $self->save;
2178 2186
2179 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2180 2188
2181 return if $self->players; 2189 return if $self->players;
2182 return if $self->in_memory != cf::MAP_IN_MEMORY; 2190 return if $self->in_memory != cf::MAP_ACTIVE;
2183 return if $self->{deny_save}; 2191 return if $self->{deny_save};
2184 2192
2185 $self->in_memory (cf::MAP_SWAPPED); 2193 $self->in_memory (cf::MAP_SWAPPED);
2186 2194
2187 $self->deactivate; 2195 $self->deactivate;
2212 2220
2213 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2214 2222
2215 return if $self->players; 2223 return if $self->players;
2216 2224
2217 warn "resetting map ", $self->path; 2225 warn "resetting map ", $self->path, "\n";
2218 2226
2219 $self->in_memory (cf::MAP_SWAPPED); 2227 $self->in_memory (cf::MAP_SWAPPED);
2220 2228
2221 # need to save uniques path 2229 # need to save uniques path
2222 unless ($self->{deny_save}) { 2230 unless ($self->{deny_save}) {
2305 2313
2306sub unique_maps() { 2314sub unique_maps() {
2307 [ 2315 [
2308 map { 2316 map {
2309 utf8::decode $_; 2317 utf8::decode $_;
2310 /\.map$/ 2318 s/\.map$//; # TODO future compatibility hack
2319 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2320 ? ()
2311 ? normalise $_ 2321 : normalise $_
2312 : ()
2313 } @{ aio_readdir $UNIQUEDIR or [] } 2322 } @{ aio_readdir $UNIQUEDIR or [] }
2314 ] 2323 ]
2315} 2324}
2316 2325
2317package cf;
2318
2319=back 2326=back
2320 2327
2321=head3 cf::object 2328=head3 cf::object
2322 2329
2323=cut 2330=cut
2326 2333
2327=over 4 2334=over 4
2328 2335
2329=item $ob->inv_recursive 2336=item $ob->inv_recursive
2330 2337
2331Returns 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.
2332 2340
2333=cut 2341=cut
2334 2342
2335sub inv_recursive_; 2343sub inv_recursive_;
2336sub inv_recursive_ { 2344sub inv_recursive_ {
2341 inv_recursive_ inv $_[0] 2349 inv_recursive_ inv $_[0]
2342} 2350}
2343 2351
2344=item $ref = $ob->ref 2352=item $ref = $ob->ref
2345 2353
2346creates and returns a persistent reference to an objetc that can be stored as a string. 2354Creates and returns a persistent reference to an object that can be stored as a string.
2347 2355
2348=item $ob = cf::object::deref ($refstring) 2356=item $ob = cf::object::deref ($refstring)
2349 2357
2350returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2358returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2351even if the object actually exists. May block. 2359even if the object actually exists. May block.
2383can 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
2384dialogue with the given NPC character. 2392dialogue with the given NPC character.
2385 2393
2386=cut 2394=cut
2387 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};
2409
2388# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2389# with dialog boxes. 2411# with dialog boxes.
2390#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
2391sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
2392 my ($self, $npc, $msg, $flags) = @_; 2414 my ($self, $npc, $msg, $flags) = @_;
2403 my $dialog = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2404 $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));
2405 2427
2406 } else { 2428 } else {
2407 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2408 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2409 } 2431 }
2410 } 2432 }
2411} 2433}
2412 2434
2413=item $object->send_msg ($channel, $msg, $color, [extra...]) 2435=item $object->send_msg ($channel, $msg, $color, [extra...])
2438 2460
2439=item $player_object->enter_link 2461=item $player_object->enter_link
2440 2462
2441Freezes 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}>).
2442 2464
2443The 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.
2444I<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.
2445 2469
2446Will never block. 2470Will never block.
2447 2471
2448=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2449 2473
2507 2531
2508 $map->load; 2532 $map->load;
2509 $map->load_neighbours; 2533 $map->load_neighbours;
2510 2534
2511 return unless $self->contr->active; 2535 return unless $self->contr->active;
2512 $self->activate_recursive;
2513 2536
2514 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2515 $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;
2516} 2542}
2517 2543
2518=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2519 2545
2520Moves 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
2521her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2522that 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
2523the 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
2524be called at the end of this process. 2550be called at the end of this process.
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 >>.
2525 2554
2526=cut 2555=cut
2527 2556
2528our $GOTOGEN; 2557our $GOTOGEN;
2529 2558
2608} 2637}
2609 2638
2610sub prepare_random_map { 2639sub prepare_random_map {
2611 my ($exit) = @_; 2640 my ($exit) = @_;
2612 2641
2613 my $guard = cf::lock_acquire "exit_prepare:$exit";
2614
2615 # all this does is basically replace the /! path by 2642 # all this does is basically replace the /! path by
2616 # a new random map path (?random/...) with a seed 2643 # a new random map path (?random/...) with a seed
2617 # that depends on the exit object 2644 # that depends on the exit object
2618 2645
2619 my $rmp = parse_random_map_params $exit->msg; 2646 my $rmp = parse_random_map_params $exit->msg;
2621 if ($exit->map) { 2648 if ($exit->map) {
2622 $rmp->{region} = $exit->region->name; 2649 $rmp->{region} = $exit->region->name;
2623 $rmp->{origin_map} = $exit->map->path; 2650 $rmp->{origin_map} = $exit->map->path;
2624 $rmp->{origin_x} = $exit->x; 2651 $rmp->{origin_x} = $exit->x;
2625 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2653
2654 $exit->map->touch;
2626 } 2655 }
2627 2656
2628 $rmp->{random_seed} ||= $exit->random_seed; 2657 $rmp->{random_seed} ||= $exit->random_seed;
2629 2658
2630 my $data = cf::to_json $rmp; 2659 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2631 my $md5 = Digest::MD5::md5_hex $data; 2660 my $md5 = Digest::MD5::md5_hex $data;
2632 my $meta = "$RANDOMDIR/$md5.meta"; 2661 my $meta = "$RANDOMDIR/$md5.meta";
2633 2662
2634 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2663 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2635 aio_write $fh, 0, (length $data), $data, 0; 2664 aio_write $fh, 0, (length $data), $data, 0;
2636 undef $fh; 2665 undef $fh;
2637 aio_rename "$meta~", $meta; 2666 aio_rename "$meta~", $meta;
2638 2667
2668 my $slaying = "?random/$md5";
2669
2670 if ($exit->valid) {
2639 $exit->slaying ("?random/$md5"); 2671 $exit->slaying ("?random/$md5");
2640 $exit->msg (undef); 2672 $exit->msg (undef);
2673 }
2641 } 2674 }
2642} 2675}
2643 2676
2644sub cf::object::player::enter_exit { 2677sub cf::object::player::enter_exit {
2645 my ($self, $exit) = @_; 2678 my ($self, $exit) = @_;
2646 2679
2647 return unless $self->type == cf::PLAYER; 2680 return unless $self->type == cf::PLAYER;
2648 2681
2649 if ($exit->slaying eq "/!") {
2650 #TODO: this should de-fi-ni-te-ly not be a sync-job
2651 # the problem is that $exit might not survive long enough
2652 # so it needs to be done right now, right here
2653 cf::sync_job { prepare_random_map $exit };
2654 }
2655
2656 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2657 my $hp = $exit->stats->hp;
2658 my $sp = $exit->stats->sp;
2659
2660 $self->enter_link; 2682 $self->enter_link;
2661 2683
2662 # if exit is damned, update players death & WoR home-position
2663 $self->contr->savebed ($slaying, $hp, $sp)
2664 if $exit->flag (FLAG_DAMNED);
2665
2666 (async { 2684 (async {
2667 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2685 $Coro::current->{desc} = "enter_exit";
2668 2686
2669 $self->deactivate_recursive; # just to be sure
2670 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
2671 $self->goto ($slaying, $hp, $sp); 2702 $self->goto ($map, $x, $y);
2672 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
2673 1; 2708 1
2674 }) { 2709 }) {
2675 $self->message ("Something went wrong deep within the crossfire server. " 2710 $self->message ("Something went wrong deep within the deliantra server. "
2676 . "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. "
2677 . "Please report this to the dungeon master!", 2712 . "Please report this to the dungeon master!",
2678 cf::NDI_UNIQUE | cf::NDI_RED); 2713 cf::NDI_UNIQUE | cf::NDI_RED);
2679 2714
2680 warn "ERROR in enter_exit: $@"; 2715 warn "ERROR in enter_exit: $@";
2746 id => "infobox", 2781 id => "infobox",
2747 title => "Body Parts", 2782 title => "Body Parts",
2748 reply => undef, 2783 reply => undef,
2749 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2750 }, 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 },
2751 "c/uptime" => { 2822 "c/uptime" => {
2752 id => "infobox", 2823 id => "infobox",
2753 title => "Uptime", 2824 title => "Uptime",
2754 reply => undef, 2825 reply => undef,
2755 tooltip => "How long the server has been running since last restart", 2826 tooltip => "How long the server has been running since last restart",
2758 id => "infobox", 2829 id => "infobox",
2759 title => "Map Info", 2830 title => "Map Info",
2760 reply => undef, 2831 reply => undef,
2761 tooltip => "Information related to the maps", 2832 tooltip => "Information related to the maps",
2762 }, 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,
2763); 2848);
2764 2849
2765sub cf::client::send_msg { 2850sub cf::client::send_msg {
2766 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2767 2852
2768 $msg = $self->pl->expand_cfpod ($msg); 2853 $msg = $self->pl->expand_cfpod ($msg)
2854 unless $color & cf::NDI_VERBATIM;
2769 2855
2770 $color &= cf::NDI_CLIENT_MASK; # just in case... 2856 $color &= cf::NDI_CLIENT_MASK; # just in case...
2771 2857
2772 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2773 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2774 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2775 2861
2776 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2777 if $self->can_msg;
2778
2779 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2780 2864
2781 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2782 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2783 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2784 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2785 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2786 if $self->can_msg;
2787 } 2870 }
2788 2871
2789 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2790 } 2873 }
2791 2874
2792 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2793 2876
2794 if ($self->can_msg) {
2795 # default colour, mask it out 2877 # default colour, mask it out
2796 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2797 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2798 2880
2799 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2881 my $pkt = "msg "
2882 . $self->{json_coder}->encode (
2800 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2801 } else { 2884 );
2802 if ($color >= 0) {
2803 # replace some tags by gcfclient-compatible ones
2804 for ($msg) {
2805 1 while
2806 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2807 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2808 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2809 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2810 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2811 }
2812 2885
2813 $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};
2814 2889
2815 utf8::encode $msg; 2890 # split very large packets
2816 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2817 if (0 && $msg =~ /\[/) { 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2818 # COMMAND/INFO 2893 $pkt = "frag";
2819 $self->send_packet ("drawextinfo $color 10 8 $msg")
2820 } else {
2821 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2822 $self->send_packet ("drawinfo $color $msg")
2823 }
2824 }
2825 } 2894 }
2895
2896 $self->send_packet ($pkt);
2826} 2897}
2827 2898
2828=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2829 2900
2830Sends an ext event to the client. 2901Sends an ext event to the client.
3004 3075
3005The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3006 3077
3007 cf::object 3078 cf::object
3008 contr pay_amount pay_player map x y force_find force_add destroy 3079 contr pay_amount pay_player map x y force_find force_add destroy
3009 insert remove name archname title slaying race decrease_ob_nr 3080 insert remove name archname title slaying race decrease split
3081 value
3010 3082
3011 cf::object::player 3083 cf::object::player
3012 player 3084 player
3013 3085
3014 cf::player 3086 cf::player
3019 3091
3020=cut 3092=cut
3021 3093
3022for ( 3094for (
3023 ["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
3024 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3025 decrease_ob_nr destroy)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3026 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3027 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3028 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3029) { 3101) {
3030 no strict 'refs'; 3102 no strict 'refs';
3031 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3032 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3049 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3050 3122
3051 my $qcode = $code; 3123 my $qcode = $code;
3052 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3053 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3054 3128
3055 local $_; 3129 local $_;
3056 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3057 3131
3058 my $eval = 3132 my $eval =
3135 { 3209 {
3136 my $faces = $facedata->{faceinfo}; 3210 my $faces = $facedata->{faceinfo};
3137 3211
3138 while (my ($face, $info) = each %$faces) { 3212 while (my ($face, $info) = each %$faces) {
3139 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3213 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3214
3140 cf::face::set_visibility $idx, $info->{visibility}; 3215 cf::face::set_visibility $idx, $info->{visibility};
3141 cf::face::set_magicmap $idx, $info->{magicmap}; 3216 cf::face::set_magicmap $idx, $info->{magicmap};
3142 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3217 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3143 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3218 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3144 3219
3145 cf::cede_to_tick; 3220 cf::cede_to_tick;
3146 } 3221 }
3147 3222
3148 while (my ($face, $info) = each %$faces) { 3223 while (my ($face, $info) = each %$faces) {
3149 next unless $info->{smooth}; 3224 next unless $info->{smooth};
3225
3150 my $idx = cf::face::find $face 3226 my $idx = cf::face::find $face
3151 or next; 3227 or next;
3228
3152 if (my $smooth = cf::face::find $info->{smooth}) { 3229 if (my $smooth = cf::face::find $info->{smooth}) {
3153 cf::face::set_smooth $idx, $smooth; 3230 cf::face::set_smooth $idx, $smooth;
3154 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3231 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3155 } else { 3232 } else {
3156 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3233 warn "smooth face '$info->{smooth}' not found for face '$face'";
3174 { 3251 {
3175 # TODO: for gcfclient pleasure, we should give resources 3252 # TODO: for gcfclient pleasure, we should give resources
3176 # that gcfclient doesn't grok a >10000 face index. 3253 # that gcfclient doesn't grok a >10000 face index.
3177 my $res = $facedata->{resource}; 3254 my $res = $facedata->{resource};
3178 3255
3179 my $soundconf = delete $res->{"res/sound.conf"};
3180
3181 while (my ($name, $info) = each %$res) { 3256 while (my ($name, $info) = each %$res) {
3257 if (defined $info->{type}) {
3182 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3258 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3183 my $data; 3259 my $data;
3184 3260
3185 if ($info->{type} & 1) { 3261 if ($info->{type} & 1) {
3186 # prepend meta info 3262 # prepend meta info
3187 3263
3188 my $meta = $enc->encode ({ 3264 my $meta = $enc->encode ({
3189 name => $name, 3265 name => $name,
3190 %{ $info->{meta} || {} }, 3266 %{ $info->{meta} || {} },
3191 }); 3267 });
3192 3268
3193 $data = pack "(w/a*)*", $meta, $info->{data}; 3269 $data = pack "(w/a*)*", $meta, $info->{data};
3270 } else {
3271 $data = $info->{data};
3272 }
3273
3274 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3275 cf::face::set_type $idx, $info->{type};
3194 } else { 3276 } else {
3195 $data = $info->{data}; 3277 $RESOURCE{$name} = $info;
3196 } 3278 }
3197 3279
3198 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3199 cf::face::set_type $idx, $info->{type};
3200
3201 cf::cede_to_tick; 3280 cf::cede_to_tick;
3202 } 3281 }
3203
3204 if ($soundconf) {
3205 $soundconf = $enc->decode (delete $soundconf->{data});
3206
3207 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3208 my $sound = $soundconf->{compat}[$_]
3209 or next;
3210
3211 my $face = cf::face::find "sound/$sound->[1]";
3212 cf::sound::set $sound->[0] => $face;
3213 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3214 }
3215
3216 while (my ($k, $v) = each %{$soundconf->{event}}) {
3217 my $face = cf::face::find "sound/$v";
3218 cf::sound::set $k => $face;
3219 }
3220 }
3221 } 3282 }
3283
3284 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3222 3285
3223 1 3286 1
3224} 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});
3225 3308
3226register_exticmd fx_want => sub { 3309register_exticmd fx_want => sub {
3227 my ($ns, $want) = @_; 3310 my ($ns, $want) = @_;
3228 3311
3229 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3230 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3231 } 3314 }
3232}; 3315};
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}
3233 3326
3234sub reload_regions { 3327sub reload_regions {
3235 # HACK to clear player env face cache, we need some signal framework 3328 # HACK to clear player env face cache, we need some signal framework
3236 # for this (global event?) 3329 # for this (global event?)
3237 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3251} 3344}
3252 3345
3253sub reload_archetypes { 3346sub reload_archetypes {
3254 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3255 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3256 #d# NEED to laod twice to resolve forward references
3257 # this really needs to be done in an extra post-pass
3258 # (which needs to be synchronous, so solve it differently)
3259 load_resource_file "$DATADIR/archetypes"
3260 or die "unable to load archetypes\n";
3261} 3349}
3262 3350
3263sub reload_treasures { 3351sub reload_treasures {
3264 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3265 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3266} 3354}
3267 3355
3268sub reload_resources { 3356sub reload_resources {
3269 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3270 3358
3359 reload_facedata;
3360 reload_archetypes;
3271 reload_regions; 3361 reload_regions;
3272 reload_facedata;
3273 #reload_archetypes;#d#
3274 reload_archetypes;
3275 reload_treasures; 3362 reload_treasures;
3276 3363
3277 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3278}
3279
3280sub init {
3281 reload_resources;
3282} 3365}
3283 3366
3284sub reload_config { 3367sub reload_config {
3285 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3286 or return; 3369 or return;
3287 3370
3288 local $/; 3371 local $/;
3289 *CFG = YAML::Syck::Load <$fh>; 3372 *CFG = YAML::Load <$fh>;
3290 3373
3291 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3374 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3292 3375
3293 $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};
3294 $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};
3300 }; 3383 };
3301 warn $@ if $@; 3384 warn $@ if $@;
3302 } 3385 }
3303} 3386}
3304 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
3305sub 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
3306 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3307 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3308 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#
3309 (async { 3434 (async {
3310 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3311 Event::one_event; 3436 EV::loop EV::LOOP_ONESHOT;
3312 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3313 }; 3438 };
3314 3439
3440 evthread_start IO::AIO::poll_fileno;
3441
3442 cf::sync_job {
3443 reload_resources;
3315 reload_config; 3444 reload_config;
3316 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
3317 load_extensions; 3458 load_extensions;
3318 3459
3319 $TICK_WATCHER->start; 3460 utime time, time, $RUNTIMEFILE;
3320 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;
3321} 3470}
3322 3471
3323############################################################################# 3472#############################################################################
3324# initialisation and cleanup 3473# initialisation and cleanup
3325 3474
3326# install some emergency cleanup handlers 3475# install some emergency cleanup handlers
3327BEGIN { 3476BEGIN {
3477 our %SIGWATCHER = ();
3328 for my $signal (qw(INT HUP TERM)) { 3478 for my $signal (qw(INT HUP TERM)) {
3329 Event->signal ( 3479 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3330 reentrant => 0,
3331 data => WF_AUTOCANCEL,
3332 signal => $signal,
3333 prio => 0,
3334 cb => sub {
3335 cf::cleanup "SIG$signal"; 3480 cf::cleanup "SIG$signal";
3336 },
3337 ); 3481 };
3338 } 3482 }
3339} 3483}
3340 3484
3341sub write_runtime { 3485sub write_runtime_sync {
3342 my $runtime = "$LOCALDIR/runtime";
3343
3344 # first touch the runtime file to show we are still running: 3486 # first touch the runtime file to show we are still running:
3345 # the fsync below can take a very very long time. 3487 # the fsync below can take a very very long time.
3346 3488
3347 IO::AIO::aio_utime $runtime, undef, undef; 3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3348 3490
3349 my $guard = cf::lock_acquire "write_runtime"; 3491 my $guard = cf::lock_acquire "write_runtime";
3350 3492
3351 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3352 or return; 3494 or return;
3353 3495
3354 my $value = $cf::RUNTIME + 90 + 10; 3496 my $value = $cf::RUNTIME + 90 + 10;
3355 # 10 is the runtime save interval, for a monotonic clock 3497 # 10 is the runtime save interval, for a monotonic clock
3356 # 60 allows for the watchdog to kill the server. 3498 # 60 allows for the watchdog to kill the server.
3366 aio_utime $fh, undef, undef; 3508 aio_utime $fh, undef, undef;
3367 3509
3368 close $fh 3510 close $fh
3369 or return; 3511 or return;
3370 3512
3371 aio_rename "$runtime~", $runtime 3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3372 and return; 3514 and return;
3373 3515
3374 warn "runtime file written.\n"; 3516 warn "runtime file written.\n";
3375 3517
3376 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 };
3377} 3569}
3378 3570
3379sub emergency_save() { 3571sub emergency_save() {
3380 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3381 3573
3382 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3383 3575
3384 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
3385 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3386 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3387 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3388 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3389 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3390 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3391 $pl->valid or next; 3588 $pl->valid or next;
3392 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3393 $pl->save; 3590 $pl->save;
3394 } 3591 }
3395 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3396 3593
3397 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3398 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3399 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3400 $map->valid or next; 3597 $map->valid or next;
3401 $map->save; 3598 $map->save;
3402 } 3599 }
3403 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3404 3601
3405 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3406 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3407 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";
3408 }; 3609 };
3409 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
3410 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3411} 3617}
3412 3618
3413sub post_cleanup { 3619sub post_cleanup {
3414 my ($make_core) = @_; 3620 my ($make_core) = @_;
3415 3621
3416 warn Carp::longmess "post_cleanup backtrace" 3622 warn Carp::longmess "post_cleanup backtrace"
3417 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#
3418} 3653}
3419 3654
3420sub do_reload_perl() { 3655sub do_reload_perl() {
3421 # can/must only be called in main 3656 # can/must only be called in main
3422 if ($Coro::current != $Coro::main) { 3657 if ($Coro::current != $Coro::main) {
3423 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3424 return; 3659 return;
3425 } 3660 }
3426 3661
3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3665
3666 while ($RELOAD) {
3427 warn "reloading..."; 3667 warn "reloading...";
3428 3668
3429 warn "entering sync_job"; 3669 warn "entering sync_job";
3430 3670
3431 cf::sync_job { 3671 cf::sync_job {
3432 cf::write_runtime; # external watchdog should not bark 3672 cf::write_runtime_sync; # external watchdog should not bark
3433 cf::emergency_save; 3673 cf::emergency_save;
3434 cf::write_runtime; # external watchdog should not bark 3674 cf::write_runtime_sync; # external watchdog should not bark
3435 3675
3436 warn "syncing database to disk"; 3676 warn "syncing database to disk";
3437 BDB::db_env_txn_checkpoint $DB_ENV; 3677 BDB::db_env_txn_checkpoint $DB_ENV;
3438 3678
3439 # 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
3440 3680
3441 warn "cancelling all WF_AUTOCANCEL watchers";
3442 for (Event::all_watchers) {
3443 $_->cancel if $_->data & WF_AUTOCANCEL;
3444 }
3445
3446 warn "flushing outstanding aio requests"; 3681 warn "flushing outstanding aio requests";
3447 for (;;) {
3448 BDB::flush;
3449 IO::AIO::flush;
3450 Coro::cede_notself;
3451 last unless IO::AIO::nreqs || BDB::nreqs; 3682 while (IO::AIO::nreqs || BDB::nreqs) {
3452 warn "iterate..."; 3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3453 }
3454
3455 ++$RELOAD;
3456
3457 warn "cancelling all extension coros";
3458 $_->cancel for values %EXT_CORO;
3459 %EXT_CORO = ();
3460
3461 warn "removing commands";
3462 %COMMAND = ();
3463
3464 warn "removing ext/exti commands";
3465 %EXTCMD = ();
3466 %EXTICMD = ();
3467
3468 warn "unloading/nuking all extensions";
3469 for my $pkg (@EXTS) {
3470 warn "... unloading $pkg";
3471
3472 if (my $cb = $pkg->can ("unload")) {
3473 eval {
3474 $cb->($pkg);
3475 1
3476 } or warn "$pkg unloaded, but with errors: $@";
3477 } 3684 }
3478 3685
3479 warn "... nuking $pkg"; 3686 warn "cancelling all extension coros";
3480 Symbol::delete_package $pkg; 3687 $_->cancel for values %EXT_CORO;
3481 } 3688 %EXT_CORO = ();
3482 3689
3483 warn "unloading all perl modules loaded from $LIBDIR"; 3690 warn "removing commands";
3484 while (my ($k, $v) = each %INC) { 3691 %COMMAND = ();
3485 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3486 3692
3693 warn "removing ext/exti commands";
3694 %EXTCMD = ();
3695 %EXTICMD = ();
3696
3697 warn "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) {
3487 warn "... unloading $k"; 3699 warn "... unloading $pkg";
3488 delete $INC{$k};
3489 3700
3490 $k =~ s/\.pm$//;
3491 $k =~ s/\//::/g;
3492
3493 if (my $cb = $k->can ("unload_module")) { 3701 if (my $cb = $pkg->can ("unload")) {
3702 eval {
3494 $cb->(); 3703 $cb->($pkg);
3704 1
3705 } or warn "$pkg unloaded, but with errors: $@";
3706 }
3707
3708 warn "... clearing $pkg";
3709 clear_package $pkg;
3495 } 3710 }
3496 3711
3497 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;
3498 } 3727 }
3499 3728
3500 warn "getting rid of safe::, as good as possible"; 3729 warn "getting rid of safe::, as good as possible";
3501 Symbol::delete_package "safe::$_" 3730 clear_package "safe::$_"
3502 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);
3503 3732
3504 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3505 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3506 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3507 3736
3508 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3509 # and global variables created in xs 3738 # and global variables created in xs
3510 #Symbol::delete_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3511 3740
3512 warn "unload completed, starting to reload now"; 3741 warn "unload completed, starting to reload now";
3513 3742
3514 warn "reloading cf.pm"; 3743 warn "reloading cf.pm";
3515 require cf; 3744 require cf;
3516 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3517 3746
3518 warn "loading config and database again"; 3747 warn "loading config and database again";
3519 cf::reload_config; 3748 cf::reload_config;
3520 3749
3521 warn "loading extensions"; 3750 warn "loading extensions";
3522 cf::load_extensions; 3751 cf::load_extensions;
3523 3752
3753 if ($REATTACH_ON_RELOAD) {
3524 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3525 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3526 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3527 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3528 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3529 reattach $_ for values %PLAYER; 3759 reattach $_ for values %PLAYER;
3760 }
3530 3761
3762 warn "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764
3531 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3532 3766
3533 1 3767 1
3534 } or do { 3768 } or do {
3535 warn $@; 3769 warn $@;
3536 warn "error while reloading, exiting."; 3770 cf::cleanup "error while reloading, exiting.";
3537 exit 1;
3538 }; 3771 };
3539 3772
3540 warn "reloaded"; 3773 warn "reloaded";
3774 --$RELOAD;
3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3541}; 3779};
3542 3780
3543our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3544 3782
3545sub reload_perl() { 3783sub reload_perl() {
3546 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3547 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3548 3786
3549 $RELOAD_WATCHER ||= Event->timer ( 3787 $RELOAD_WATCHER ||= cf::async {
3550 reentrant => 0, 3788 Coro::AIO::aio_wait cache_extensions;
3551 after => 0, 3789
3552 data => WF_AUTOCANCEL, 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3553 cb => sub {
3554 do_reload_perl; 3791 do_reload_perl;
3555 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3556 }, 3793 };
3557 ); 3794 };
3558} 3795}
3559 3796
3560register_command "reload" => sub { 3797register_command "reload" => sub {
3561 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
3562 3799
3575 3812
3576our @WAIT_FOR_TICK; 3813our @WAIT_FOR_TICK;
3577our @WAIT_FOR_TICK_BEGIN; 3814our @WAIT_FOR_TICK_BEGIN;
3578 3815
3579sub wait_for_tick { 3816sub wait_for_tick {
3580 return unless $TICK_WATCHER->is_active;
3581 return if $Coro::current == $Coro::main; 3817 return if tick_inhibit || $Coro::current == $Coro::main;
3582 3818
3583 my $signal = new Coro::Signal; 3819 my $signal = new Coro::Signal;
3584 push @WAIT_FOR_TICK, $signal; 3820 push @WAIT_FOR_TICK, $signal;
3585 $signal->wait; 3821 $signal->wait;
3586} 3822}
3587 3823
3588sub wait_for_tick_begin { 3824sub wait_for_tick_begin {
3589 return unless $TICK_WATCHER->is_active;
3590 return if $Coro::current == $Coro::main; 3825 return if tick_inhibit || $Coro::current == $Coro::main;
3591 3826
3592 my $signal = new Coro::Signal; 3827 my $signal = new Coro::Signal;
3593 push @WAIT_FOR_TICK_BEGIN, $signal; 3828 push @WAIT_FOR_TICK_BEGIN, $signal;
3594 $signal->wait; 3829 $signal->wait;
3595} 3830}
3596 3831
3597$TICK_WATCHER = Event->timer ( 3832sub tick {
3598 reentrant => 0,
3599 parked => 1,
3600 prio => 0,
3601 at => $NEXT_TICK || $TICK,
3602 data => WF_AUTOCANCEL,
3603 cb => sub {
3604 if ($Coro::current != $Coro::main) { 3833 if ($Coro::current != $Coro::main) {
3605 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"
3606 unless ++$bug_warning > 10; 3835 unless ++$bug_warning > 10;
3607 return; 3836 return;
3608 } 3837 }
3609 3838
3610 $NOW = $tick_start = Event::time;
3611
3612 cf::server_tick; # one server iteration 3839 cf::server_tick; # one server iteration
3613 3840
3614 $RUNTIME += $TICK;
3615 $NEXT_TICK += $TICK;
3616
3617 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3841 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3618 $NEXT_RUNTIME_WRITE = $NOW + 10; 3842 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3619 Coro::async_pool { 3843 Coro::async_pool {
3620 $Coro::current->{desc} = "runtime saver"; 3844 $Coro::current->{desc} = "runtime saver";
3621 write_runtime 3845 write_runtime_sync
3622 or warn "ERROR: unable to write runtime file: $!"; 3846 or warn "ERROR: unable to write runtime file: $!";
3623 };
3624 } 3847 };
3848 }
3625 3849
3626 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3850 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3627 $sig->send; 3851 $sig->send;
3628 } 3852 }
3629 while (my $sig = shift @WAIT_FOR_TICK) { 3853 while (my $sig = shift @WAIT_FOR_TICK) {
3630 $sig->send; 3854 $sig->send;
3631 } 3855 }
3632 3856
3633 $NOW = Event::time; 3857 $LOAD = ($NOW - $TICK_START) / $TICK;
3634
3635 # if we are delayed by four ticks or more, skip them all
3636 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3637
3638 $TICK_WATCHER->at ($NEXT_TICK);
3639 $TICK_WATCHER->start;
3640
3641 $LOAD = ($NOW - $tick_start) / $TICK;
3642 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3858 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3643 3859
3644 _post_tick; 3860 if (0) {
3861 if ($NEXT_TICK) {
3862 my $jitter = $TICK_START - $NEXT_TICK;
3863 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3864 warn "jitter $JITTER\n";#d#
3865 }
3645 }, 3866 }
3646); 3867}
3647 3868
3648{ 3869{
3870 # configure BDB
3871
3649 BDB::min_parallel 8; 3872 BDB::min_parallel 8;
3650 BDB::max_poll_time $TICK * 0.1; 3873 BDB::max_poll_reqs $TICK * 0.1;
3651 $BDB_POLL_WATCHER = Event->io ( 3874 $AnyEvent::BDB::WATCHER->priority (1);
3652 reentrant => 0,
3653 fd => BDB::poll_fileno,
3654 poll => 'r',
3655 prio => 0,
3656 data => WF_AUTOCANCEL,
3657 cb => \&BDB::poll_cb,
3658 );
3659
3660 BDB::set_sync_prepare {
3661 my $status;
3662 my $current = $Coro::current;
3663 (
3664 sub {
3665 $status = $!;
3666 $current->ready; undef $current;
3667 },
3668 sub {
3669 Coro::schedule while defined $current;
3670 $! = $status;
3671 },
3672 )
3673 };
3674 3875
3675 unless ($DB_ENV) { 3876 unless ($DB_ENV) {
3676 $DB_ENV = BDB::db_env_create; 3877 $DB_ENV = BDB::db_env_create;
3677 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3878 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3678 | BDB::LOG_AUTOREMOVE, 1); 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;
3679 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3881 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3680 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3882 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3681 3883
3682 cf::sync_job { 3884 cf::sync_job {
3683 eval { 3885 eval {
3693 3895
3694 cf::cleanup "db_env_open(db): $@" if $@; 3896 cf::cleanup "db_env_open(db): $@" if $@;
3695 }; 3897 };
3696 } 3898 }
3697 3899
3698 $BDB_DEADLOCK_WATCHER = Event->timer ( 3900 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3699 after => 3,
3700 interval => 1,
3701 hard => 1,
3702 prio => 0,
3703 data => WF_AUTOCANCEL,
3704 cb => sub {
3705 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3901 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3706 },
3707 ); 3902 };
3708 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3903 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3709 after => 11,
3710 interval => 60,
3711 hard => 1,
3712 prio => 0,
3713 data => WF_AUTOCANCEL,
3714 cb => sub {
3715 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3904 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3716 },
3717 ); 3905 };
3718 $BDB_TRICKLE_WATCHER = Event->timer ( 3906 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3719 after => 5,
3720 interval => 10,
3721 hard => 1,
3722 prio => 0,
3723 data => WF_AUTOCANCEL,
3724 cb => sub {
3725 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3907 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3726 },
3727 ); 3908 };
3728} 3909}
3729 3910
3730{ 3911{
3912 # configure IO::AIO
3913
3731 IO::AIO::min_parallel 8; 3914 IO::AIO::min_parallel 8;
3732
3733 undef $Coro::AIO::WATCHER;
3734 IO::AIO::max_poll_time $TICK * 0.1; 3915 IO::AIO::max_poll_time $TICK * 0.1;
3735 $AIO_POLL_WATCHER = Event->io ( 3916 undef $AnyEvent::AIO::WATCHER;
3736 reentrant => 0,
3737 data => WF_AUTOCANCEL,
3738 fd => IO::AIO::poll_fileno,
3739 poll => 'r',
3740 prio => 0,
3741 cb => \&IO::AIO::poll_cb,
3742 );
3743} 3917}
3744 3918
3745my $_log_backtrace; 3919my $_log_backtrace;
3746 3920
3747sub _log_backtrace { 3921sub _log_backtrace {
3750 $msg =~ s/\n//; 3924 $msg =~ s/\n//;
3751 3925
3752 # limit the # of concurrent backtraces 3926 # limit the # of concurrent backtraces
3753 if ($_log_backtrace < 2) { 3927 if ($_log_backtrace < 2) {
3754 ++$_log_backtrace; 3928 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg;
3755 async { 3930 async {
3756 $Coro::current->{desc} = "abt $msg"; 3931 $Coro::current->{desc} = "abt $msg";
3757 3932
3758 my @bt = fork_call { 3933 my @bt = fork_call {
3759 @addr = map { sprintf "%x", $_ } @addr; 3934 @addr = map { sprintf "%x", $_ } @addr;
3770 } 3945 }
3771 3946
3772 @funcs 3947 @funcs
3773 }; 3948 };
3774 3949
3775 LOG llevInfo, "[ABT] $msg\n"; 3950 LOG llevInfo, "[ABT] $perl_bt\n";
3951 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3776 LOG llevInfo, "[ABT] $_\n" for @bt; 3952 LOG llevInfo, "[ABT] $_\n" for @bt;
3777 --$_log_backtrace; 3953 --$_log_backtrace;
3778 }; 3954 };
3779 } else { 3955 } else {
3780 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $msg\n";
3781 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3782 } 3958 }
3783} 3959}
3784 3960
3785# load additional modules 3961# load additional modules
3786use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3787 3963
3788END { cf::emergency_save } 3964END { cf::emergency_save }
3789 3965
37901 39661
3791 3967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines