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.391 by root, Fri Oct 26 04:22:05 2007 UTC vs.
Revision 1.447 by root, Fri Sep 19 01:39:45 2008 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify
7# it under the terms of the GNU General Public License as published by
8# the Free Software Foundation, either version 3 of the License, or
9# (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19# The authors can be reached via e-mail to <support@deliantra.net>
20#
21
1package cf; 22package cf;
2 23
24use 5.10.0;
3use utf8; 25use utf8;
4use strict; 26use strict "vars", "subs";
5 27
6use Symbol; 28use Symbol;
7use List::Util; 29use List::Util;
8use Socket; 30use Socket;
9use Event; 31use EV;
10use Opcode; 32use Opcode;
11use Safe; 33use Safe;
12use Safe::Hole; 34use Safe::Hole;
13use Storable (); 35use Storable ();
14 36
15use Coro 4.1 (); 37use Coro ();
16use Coro::State; 38use Coro::State;
17use Coro::Handle; 39use Coro::Handle;
40use Coro::EV;
18use Coro::Event; 41use Coro::AnyEvent;
19use Coro::Timer; 42use Coro::Timer;
20use Coro::Signal; 43use Coro::Signal;
21use Coro::Semaphore; 44use Coro::Semaphore;
45use Coro::AnyEvent;
22use Coro::AIO; 46use Coro::AIO;
47use Coro::BDB 1.6;
23use Coro::Storable; 48use Coro::Storable;
24use Coro::Util (); 49use Coro::Util ();
25 50
26use JSON::XS (); 51use JSON::XS 2.01 ();
27use BDB (); 52use BDB ();
28use Data::Dumper; 53use Data::Dumper;
29use Digest::MD5; 54use Digest::MD5;
30use Fcntl; 55use Fcntl;
31use YAML::Syck (); 56use YAML ();
32use IO::AIO 2.51 (); 57use IO::AIO ();
33use Time::HiRes; 58use Time::HiRes;
34use Compress::LZF; 59use Compress::LZF;
35use Digest::MD5 (); 60use Digest::MD5 ();
61
62AnyEvent::detect;
36 63
37# configure various modules to our taste 64# configure various modules to our taste
38# 65#
39$Storable::canonical = 1; # reduce rsync transfers 66$Storable::canonical = 1; # reduce rsync transfers
40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 67Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 68Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42 69
43$Event::Eval = 1; # no idea why this is required, but it is
44
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 70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
49 71
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 72sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51 73
52our %COMMAND = (); 74our %COMMAND = ();
59our %EXT_MAP = (); # pluggable maps 81our %EXT_MAP = (); # pluggable maps
60 82
61our $RELOAD; # number of reloads so far 83our $RELOAD; # number of reloads so far
62our @EVENT; 84our @EVENT;
63 85
64our $CONFDIR = confdir; 86our $CONFDIR = confdir;
65our $DATADIR = datadir; 87our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext"; 88our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod"; 89our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir; 90our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir; 91our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir; 92our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 93our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir; 94our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random"; 95our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db"; 96our $BDBDIR = "$LOCALDIR/db";
97our $PIDFILE = "$LOCALDIR/pid";
98our $RUNTIMEFILE = "$LOCALDIR/runtime";
99
100our %RESOURCE;
75 101
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 102our $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 103our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 104our $NEXT_TICK;
81our $NOW;
82our $USE_FSYNC = 1; # use fsync to write maps - default off 105our $USE_FSYNC = 1; # use fsync to write maps - default off
83 106
84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER; 107our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER; 108our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER; 109our $BDB_TRICKLE_WATCHER;
88our $DB_ENV; 110our $DB_ENV;
89 111
90our %CFG; 112our %CFG;
91 113
92our $UPTIME; $UPTIME ||= time; 114our $UPTIME; $UPTIME ||= time;
93our $RUNTIME; 115our $RUNTIME;
116our $NOW;
94 117
95our (%PLAYER, %PLAYER_LOADING); # all users 118our (%PLAYER, %PLAYER_LOADING); # all users
96our (%MAP, %MAP_LOADING ); # all maps 119our (%MAP, %MAP_LOADING ); # all maps
97our $LINK_MAP; # the special {link} map, which is always available 120our $LINK_MAP; # the special {link} map, which is always available
98 121
99# used to convert map paths into valid unix filenames by replacing / by ∕ 122# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 123our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 124
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 125our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 126our $LOADAVG; # same thing, but with alpha-smoothing
127our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 128our $TICK_START; # for load detecting purposes
105 129
106binmode STDOUT; 130binmode STDOUT;
107binmode STDERR; 131binmode STDERR;
108 132
109# read virtual server time, if available 133# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 134unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 135 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 136 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 137 $RUNTIME = <$fh> + 0.;
114} 138}
115 139
116mkdir $_ 140mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 141 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
162 186
163The raw value load value from the last tick. 187The raw value load value from the last tick.
164 188
165=item %cf::CFG 189=item %cf::CFG
166 190
167Configuration for the server, loaded from C</etc/crossfire/config>, or 191Configuration for the server, loaded from C</etc/deliantra-server/config>, or
168from wherever your confdir points to. 192from wherever your confdir points to.
169 193
170=item cf::wait_for_tick, cf::wait_for_tick_begin 194=item cf::wait_for_tick, cf::wait_for_tick_begin
171 195
172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 196These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 217 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
194 218
195 LOG llevError, $msg; 219 LOG llevError, $msg;
196 }; 220 };
197} 221}
222
223$Coro::State::DIEHOOK = sub {
224 return unless $^S eq 0; # "eq", not "=="
225
226 if ($Coro::current == $Coro::main) {#d#
227 warn "DIEHOOK called in main context, Coro bug?\n";#d#
228 return;#d#
229 }#d#
230
231 # kill coroutine otherwise
232 warn Carp::longmess $_[0];
233 Coro::terminate
234};
235
236$SIG{__DIE__} = sub { }; #d#?
198 237
199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 238@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 239@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 240@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 241@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
209for my $pkg (qw( 248for my $pkg (qw(
210 cf::global cf::attachable 249 cf::global cf::attachable
211 cf::object cf::object::player 250 cf::object cf::object::player
212 cf::client cf::player 251 cf::client cf::player
213 cf::arch cf::living 252 cf::arch cf::living
253 cf::map cf::mapspace
214 cf::map cf::party cf::region 254 cf::party cf::region
215)) { 255)) {
216 no strict 'refs';
217 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 256 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
218} 257}
219 258
220$Event::DIED = sub { 259$EV::DIED = sub {
221 warn "error in event callback: @_"; 260 warn "error in event callback: @_";
222}; 261};
223 262
224############################################################################# 263#############################################################################
225 264
248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 287 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
249 $d 288 $d
250 } || "[unable to dump $_[0]: '$@']"; 289 } || "[unable to dump $_[0]: '$@']";
251} 290}
252 291
253=item $ref = cf::from_json $json 292=item $ref = cf::decode_json $json
254 293
255Converts a JSON string into the corresponding perl data structure. 294Converts a JSON string into the corresponding perl data structure.
256 295
257=item $json = cf::to_json $ref 296=item $json = cf::encode_json $ref
258 297
259Converts a perl data structure into its JSON representation. 298Converts a perl data structure into its JSON representation.
260 299
261=cut 300=cut
262 301
263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 302our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
264 303
265sub to_json ($) { $json_coder->encode ($_[0]) } 304sub encode_json($) { $json_coder->encode ($_[0]) }
266sub from_json ($) { $json_coder->decode ($_[0]) } 305sub decode_json($) { $json_coder->decode ($_[0]) }
267 306
268=item cf::lock_wait $string 307=item cf::lock_wait $string
269 308
270Wait until the given lock is available. See cf::lock_acquire. 309Wait until the given lock is available. See cf::lock_acquire.
271 310
327 366
328 ! ! $LOCK{$key} 367 ! ! $LOCK{$key}
329} 368}
330 369
331sub freeze_mainloop { 370sub freeze_mainloop {
332 return unless $TICK_WATCHER->is_active; 371 tick_inhibit_inc;
333 372
334 my $guard = Coro::guard { 373 Coro::guard \&tick_inhibit_dec;
335 $TICK_WATCHER->start; 374}
336 }; 375
337 $TICK_WATCHER->stop; 376=item cf::periodic $interval, $cb
338 $guard 377
378Like EV::periodic, but randomly selects a starting point so that the actions
379get spread over timer.
380
381=cut
382
383sub periodic($$) {
384 my ($interval, $cb) = @_;
385
386 my $start = rand List::Util::min 180, $interval;
387
388 EV::periodic $start, $interval, 0, $cb
339} 389}
340 390
341=item cf::get_slot $time[, $priority[, $name]] 391=item cf::get_slot $time[, $priority[, $name]]
342 392
343Allocate $time seconds of blocking CPU time at priority C<$priority>: 393Allocate $time seconds of blocking CPU time at priority C<$priority>:
383 } 433 }
384 } 434 }
385}; 435};
386 436
387sub get_slot($;$$) { 437sub get_slot($;$$) {
438 return if tick_inhibit || $Coro::current == $Coro::main;
439
388 my ($time, $pri, $name) = @_; 440 my ($time, $pri, $name) = @_;
389 441
390 $time = $TICK * .6 if $time > $TICK * .6; 442 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal; 443 my $sig = new Coro::Signal;
392 444
406 458
407BEGIN { *async = \&Coro::async_pool } 459BEGIN { *async = \&Coro::async_pool }
408 460
409=item cf::sync_job { BLOCK } 461=item cf::sync_job { BLOCK }
410 462
411The design of Crossfire TRT requires that the main coroutine ($Coro::main) 463The design of Deliantra requires that the main coroutine ($Coro::main)
412is always able to handle events or runnable, as Crossfire TRT is only 464is always able to handle events or runnable, as Deliantra is only
413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 465partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable. 466acceptable.
415 467
416If it must be done, put the blocking parts into C<sync_job>. This will run 468If it must be done, put the blocking parts into C<sync_job>. This will run
417the given BLOCK in another coroutine while waiting for the result. The 469the given BLOCK in another coroutine while waiting for the result. The
422 474
423sub sync_job(&) { 475sub sync_job(&) {
424 my ($job) = @_; 476 my ($job) = @_;
425 477
426 if ($Coro::current == $Coro::main) { 478 if ($Coro::current == $Coro::main) {
427 my $time = Event::time; 479 my $time = EV::time;
428 480
429 # this is the main coro, too bad, we have to block 481 # this is the main coro, too bad, we have to block
430 # till the operation succeeds, freezing the server :/ 482 # till the operation succeeds, freezing the server :/
431 483
432 LOG llevError, Carp::longmess "sync job";#d# 484 LOG llevError, Carp::longmess "sync job";#d#
433 485
434 # TODO: use suspend/resume instead
435 # (but this is cancel-safe)
436 my $freeze_guard = freeze_mainloop; 486 my $freeze_guard = freeze_mainloop;
437 487
438 my $busy = 1; 488 my $busy = 1;
439 my @res; 489 my @res;
440 490
447 497
448 while ($busy) { 498 while ($busy) {
449 if (Coro::nready) { 499 if (Coro::nready) {
450 Coro::cede_notself; 500 Coro::cede_notself;
451 } else { 501 } else {
452 Event::one_event; 502 EV::loop EV::LOOP_ONESHOT;
453 } 503 }
454 } 504 }
455 505
456 $time = Event::time - $time; 506 my $time = EV::time - $time;
457 507
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 508 $TICK_START += $time; # do not account sync jobs to server load
462 509
463 wantarray ? @res : $res[0] 510 wantarray ? @res : $res[0]
464 } else { 511 } else {
465 # we are in another coroutine, how wonderful, everything just works 512 # we are in another coroutine, how wonderful, everything just works
466 513
491=item fork_call { }, $args 538=item fork_call { }, $args
492 539
493Executes the given code block with the given arguments in a seperate 540Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with 541process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may 542Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling. 543never block itself or use any form of event handling.
497 544
498=cut 545=cut
499 546
500sub fork_call(&@) { 547sub fork_call(&@) {
501 my ($cb, @args) = @_; 548 my ($cb, @args) = @_;
508 reset_signals; 555 reset_signals;
509 &$cb 556 &$cb
510 }, @args; 557 }, @args;
511 558
512 wantarray ? @res : $res[-1] 559 wantarray ? @res : $res[-1]
560}
561
562=item $coin = coin_from_name $name
563
564=cut
565
566our %coin_alias = (
567 "silver" => "silvercoin",
568 "silvercoin" => "silvercoin",
569 "silvercoins" => "silvercoin",
570 "gold" => "goldcoin",
571 "goldcoin" => "goldcoin",
572 "goldcoins" => "goldcoin",
573 "platinum" => "platinacoin",
574 "platinumcoin" => "platinacoin",
575 "platinumcoins" => "platinacoin",
576 "platina" => "platinacoin",
577 "platinacoin" => "platinacoin",
578 "platinacoins" => "platinacoin",
579 "royalty" => "royalty",
580 "royalties" => "royalty",
581);
582
583sub coin_from_name($) {
584 $coin_alias{$_[0]}
585 ? cf::arch::find $coin_alias{$_[0]}
586 : undef
513} 587}
514 588
515=item $value = cf::db_get $family => $key 589=item $value = cf::db_get $family => $key
516 590
517Returns a single value from the environment database. 591Returns a single value from the environment database.
656 730
657############################################################################# 731#############################################################################
658 732
659=head2 ATTACHABLE OBJECTS 733=head2 ATTACHABLE OBJECTS
660 734
661Many objects in crossfire are so-called attachable objects. That means you can 735Many objects in deliantra are so-called attachable objects. That means you can
662attach callbacks/event handlers (a collection of which is called an "attachment") 736attach callbacks/event handlers (a collection of which is called an "attachment")
663to it. All such attachable objects support the following methods. 737to it. All such attachable objects support the following methods.
664 738
665In the following description, CLASS can be any of C<global>, C<object> 739In 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 740C<player>, C<client> or C<map> (i.e. the attachable objects in
667Crossfire TRT). 741Deliantra).
668 742
669=over 4 743=over 4
670 744
671=item $attachable->attach ($attachment, key => $value...) 745=item $attachable->attach ($attachment, key => $value...)
672 746
716=item cf::CLASS::attachment $name, ... 790=item cf::CLASS::attachment $name, ...
717 791
718Register an attachment by C<$name> through which attachable objects of the 792Register an attachment by C<$name> through which attachable objects of the
719given CLASS can refer to this attachment. 793given CLASS can refer to this attachment.
720 794
721Some classes such as crossfire maps and objects can specify attachments 795Some classes such as deliantra maps and objects can specify attachments
722that are attached at load/instantiate time, thus the need for a name. 796that are attached at load/instantiate time, thus the need for a name.
723 797
724These calls expect any number of the following handler/hook descriptions: 798These calls expect any number of the following handler/hook descriptions:
725 799
726=over 4 800=over 4
954 } 1028 }
955 1029
956 0 1030 0
957} 1031}
958 1032
959=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1033=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
960 1034
961=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1035=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
962 1036
963Generate an object-specific event with the given arguments. 1037Generate an object-specific event with the given arguments.
964 1038
1017 1091
1018sub reattach { 1092sub reattach {
1019 # basically do the same as instantiate, without calling instantiate 1093 # basically do the same as instantiate, without calling instantiate
1020 my ($obj) = @_; 1094 my ($obj) = @_;
1021 1095
1096 # no longer needed after getting rid of delete_package?
1022 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1097 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1023 1098
1024 my $registry = $obj->registry; 1099 my $registry = $obj->registry;
1025 1100
1026 @$registry = (); 1101 @$registry = ();
1027 1102
1042cf::attachable->attach ( 1117cf::attachable->attach (
1043 prio => -1000000, 1118 prio => -1000000,
1044 on_instantiate => sub { 1119 on_instantiate => sub {
1045 my ($obj, $data) = @_; 1120 my ($obj, $data) = @_;
1046 1121
1047 $data = from_json $data; 1122 $data = decode_json $data;
1048 1123
1049 for (@$data) { 1124 for (@$data) {
1050 my ($name, $args) = @$_; 1125 my ($name, $args) = @$_;
1051 1126
1052 $obj->attach ($name, %{$args || {} }); 1127 $obj->attach ($name, %{$args || {} });
1073 utf8::decode (my $decname = $filename); 1148 utf8::decode (my $decname = $filename);
1074 warn sprintf "saving %s (%d,%d)\n", 1149 warn sprintf "saving %s (%d,%d)\n",
1075 $decname, length $$rdata, scalar @$objs; 1150 $decname, length $$rdata, scalar @$objs;
1076 1151
1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1152 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1078 chmod SAVE_MODE, $fh; 1153 aio_chmod $fh, SAVE_MODE;
1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1154 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1080 aio_fsync $fh if $cf::USE_FSYNC; 1155 aio_fsync $fh if $cf::USE_FSYNC;
1081 close $fh; 1156 aio_close $fh;
1082 1157
1083 if (@$objs) { 1158 if (@$objs) {
1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1159 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1085 chmod SAVE_MODE, $fh; 1160 aio_chmod $fh, SAVE_MODE;
1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1161 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1087 aio_write $fh, 0, (length $data), $data, 0; 1162 aio_write $fh, 0, (length $data), $data, 0;
1088 aio_fsync $fh if $cf::USE_FSYNC; 1163 aio_fsync $fh if $cf::USE_FSYNC;
1089 close $fh; 1164 aio_close $fh;
1090 aio_rename "$filename.pst~", "$filename.pst"; 1165 aio_rename "$filename.pst~", "$filename.pst";
1091 } 1166 }
1092 } else { 1167 } else {
1093 aio_unlink "$filename.pst"; 1168 aio_unlink "$filename.pst";
1094 } 1169 }
1263 1338
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1339 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1340 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266 1341
1267 $ext{source} = 1342 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n" 1343 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n" 1344 . "#line 1 \"$path\"\n{\n"
1270 . $source 1345 . $source
1271 . "\n};\n1"; 1346 . "\n};\n1";
1272 1347
1273 $todo{$base} = \%ext; 1348 $todo{$base} = \%ext;
1289 my $msg = $@ ? "$v->{path}: $@\n" 1364 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n"; 1365 : "$v->{base}: extension inactive.\n";
1291 1366
1292 if (exists $v->{meta}{mandatory}) { 1367 if (exists $v->{meta}{mandatory}) {
1293 warn $msg; 1368 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n"; 1369 cf::cleanup "mandatory extension failed to load, exiting.";
1295 exit 1;
1296 } 1370 }
1297 1371
1298 warn $msg; 1372 warn $msg;
1299 } 1373 }
1300 1374
1314 1388
1315=back 1389=back
1316 1390
1317=head2 CORE EXTENSIONS 1391=head2 CORE EXTENSIONS
1318 1392
1319Functions and methods that extend core crossfire objects. 1393Functions and methods that extend core deliantra objects.
1320 1394
1321=cut 1395=cut
1322 1396
1323package cf::player; 1397package cf::player;
1324 1398
1389 my $f = new_from_file cf::object::thawer path $login 1463 my $f = new_from_file cf::object::thawer path $login
1390 or return; 1464 or return;
1391 1465
1392 my $pl = cf::player::load_pl $f 1466 my $pl = cf::player::load_pl $f
1393 or return; 1467 or return;
1468
1394 local $cf::PLAYER_LOADING{$login} = $pl; 1469 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs; 1470 $f->resolve_delayed_derefs;
1396 $cf::PLAYER{$login} = $pl 1471 $cf::PLAYER{$login} = $pl
1397 } 1472 }
1398 } 1473 }
1408 1483
1409 return if $pl->{deny_save}; 1484 return if $pl->{deny_save};
1410 1485
1411 aio_mkdir playerdir $pl, 0770; 1486 aio_mkdir playerdir $pl, 0770;
1412 $pl->{last_save} = $cf::RUNTIME; 1487 $pl->{last_save} = $cf::RUNTIME;
1488
1489 cf::get_slot 0.01;
1413 1490
1414 $pl->save_pl ($path); 1491 $pl->save_pl ($path);
1415 cf::cede_to_tick; 1492 cf::cede_to_tick;
1416} 1493}
1417 1494
1449 my ($pl) = @_; 1526 my ($pl) = @_;
1450 1527
1451 my $name = $pl->ob->name; 1528 my $name = $pl->ob->name;
1452 1529
1453 $pl->{deny_save} = 1; 1530 $pl->{deny_save} = 1;
1454 $pl->password ("*"); # this should lock out the player until we nuked the dir 1531 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1455 1532
1456 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1533 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1457 $pl->deactivate; 1534 $pl->deactivate;
1535 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1536 $pl->ob->check_score;
1458 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1537 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1459 $pl->ns->destroy if $pl->ns; 1538 $pl->ns->destroy if $pl->ns;
1460 1539
1461 my $path = playerdir $pl; 1540 my $path = playerdir $pl;
1462 my $temp = "$path~$cf::RUNTIME~deleting~"; 1541 my $temp = "$path~$cf::RUNTIME~deleting~";
1501 1580
1502 for my $login (@$dirs) { 1581 for my $login (@$dirs) {
1503 my $path = path $login; 1582 my $path = path $login;
1504 1583
1505 # a .pst is a dead give-away for a valid player 1584 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") { 1585 # if no pst file found, open and chekc for blocked users
1586 if (aio_stat "$path.pst") {
1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1587 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1508 aio_read $fh, 0, 512, my $buf, 0 or next; 1588 aio_read $fh, 0, 512, my $buf, 0 or next;
1509 $buf !~ /^password -------------$/m or next; # official not-valid tag 1589 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 } 1590 }
1511 1591
1542 } 1622 }
1543 1623
1544 \@paths 1624 \@paths
1545} 1625}
1546 1626
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1627=item $protocol_xml = $player->expand_cfpod ($cfpod)
1548 1628
1549Expand crossfire pod fragments into protocol xml. 1629Expand deliantra pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636 1630
1637=item $player->ext_reply ($msgid, @msg) 1631=item $player->ext_reply ($msgid, @msg)
1638 1632
1639Sends an ext reply to the player. 1633Sends an ext reply to the player.
1640 1634
1707our $MAX_RESET = 3600; 1701our $MAX_RESET = 3600;
1708our $DEFAULT_RESET = 3000; 1702our $DEFAULT_RESET = 3000;
1709 1703
1710sub generate_random_map { 1704sub generate_random_map {
1711 my ($self, $rmp) = @_; 1705 my ($self, $rmp) = @_;
1706
1707 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1708
1712 # mit "rum" bekleckern, nicht 1709 # mit "rum" bekleckern, nicht
1713 $self->_create_random_map ( 1710 $self->_create_random_map (
1714 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1711 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1715 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1712 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1716 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1713 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1838 1835
1839# the temporary/swap location 1836# the temporary/swap location
1840sub save_path { 1837sub save_path {
1841 my ($self) = @_; 1838 my ($self) = @_;
1842 1839
1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1840 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1844 "$TMPDIR/$path.map" 1841 "$TMPDIR/$path.map"
1845} 1842}
1846 1843
1847# the unique path, undef == no special unique path 1844# the unique path, undef == no special unique path
1848sub uniq_path { 1845sub uniq_path {
1849 my ($self) = @_; 1846 my ($self) = @_;
1850 1847
1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1848 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1852 "$UNIQUEDIR/$path" 1849 "$UNIQUEDIR/$path"
1853} 1850}
1854 1851
1855# and all this just because we cannot iterate over 1852# and all this just because we cannot iterate over
1856# all maps in C++... 1853# all maps in C++...
1954 1951
1955 cf::lock_wait "map_data:$path";#d#remove 1952 cf::lock_wait "map_data:$path";#d#remove
1956 cf::lock_wait "map_find:$path"; 1953 cf::lock_wait "map_find:$path";
1957 1954
1958 $cf::MAP{$path} || do { 1955 $cf::MAP{$path} || do {
1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it 1956 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1957 my $guard2 = cf::lock_acquire "map_find:$path";
1961 1958
1962 my $map = new_from_path cf::map $path 1959 my $map = new_from_path cf::map $path
1963 or return; 1960 or return;
1964 1961
1965 $map->{last_save} = $cf::RUNTIME; 1962 $map->{last_save} = $cf::RUNTIME;
1968 or return; 1965 or return;
1969 1966
1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1967 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1971 # doing this can freeze the server in a sync job, obviously 1968 # doing this can freeze the server in a sync job, obviously
1972 #$cf::WAIT_FOR_TICK->wait; 1969 #$cf::WAIT_FOR_TICK->wait;
1970 undef $guard2;
1973 undef $guard1; 1971 undef $guard1;
1974 undef $guard2;
1975 $map->reset; 1972 $map->reset;
1976 return find $path; 1973 return find $path;
1977 } 1974 }
1978 1975
1979 $cf::MAP{$path} = $map 1976 $cf::MAP{$path} = $map
2006 my $f = new_from_file cf::object::thawer $self->{load_path}; 2003 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block; 2004 $f->skip_block;
2008 $self->_load_objects ($f) 2005 $self->_load_objects ($f)
2009 or return; 2006 or return;
2010 2007
2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2008 $self->post_load_original
2012 if delete $self->{load_original}; 2009 if delete $self->{load_original};
2013 2010
2014 if (my $uniq = $self->uniq_path) { 2011 if (my $uniq = $self->uniq_path) {
2015 utf8::encode $uniq; 2012 utf8::encode $uniq;
2016 unless (aio_stat $uniq) { 2013 unless (aio_stat $uniq) {
2042 } 2039 }
2043 2040
2044 $self->{last_save} = $cf::RUNTIME; 2041 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME); 2042 $self->last_access ($cf::RUNTIME);
2046 2043
2047 $self->in_memory (cf::MAP_IN_MEMORY); 2044 $self->in_memory (cf::MAP_ACTIVE);
2048 } 2045 }
2049 2046
2050 $self->post_load; 2047 $self->post_load;
2051} 2048}
2052 2049
2110 my ($path, $origin, $load) = @_; 2107 my ($path, $origin, $load) = @_;
2111 2108
2112 $path = normalise $path, $origin && $origin->{path}; 2109 $path = normalise $path, $origin && $origin->{path};
2113 2110
2114 if (my $map = $cf::MAP{$path}) { 2111 if (my $map = $cf::MAP{$path}) {
2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2112 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2116 } 2113 }
2117 2114
2118 $MAP_PREFETCH{$path} |= $load; 2115 $MAP_PREFETCH{$path} |= $load;
2119 2116
2120 $MAP_PREFETCHER ||= cf::async { 2117 $MAP_PREFETCHER ||= cf::async {
2157 cf::async { 2154 cf::async {
2158 $Coro::current->{desc} = "map player save"; 2155 $Coro::current->{desc} = "map player save";
2159 $_->contr->save for $self->players; 2156 $_->contr->save for $self->players;
2160 }; 2157 };
2161 2158
2159 cf::get_slot 0.02;
2160
2162 if ($uniq) { 2161 if ($uniq) {
2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2162 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2164 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2163 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2165 } else { 2164 } else {
2166 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2174 $self->save; 2173 $self->save;
2175 2174
2176 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2175 my $lock = cf::lock_acquire "map_data:$self->{path}";
2177 2176
2178 return if $self->players; 2177 return if $self->players;
2179 return if $self->in_memory != cf::MAP_IN_MEMORY; 2178 return if $self->in_memory != cf::MAP_ACTIVE;
2180 return if $self->{deny_save}; 2179 return if $self->{deny_save};
2181 2180
2182 $self->in_memory (cf::MAP_SWAPPED); 2181 $self->in_memory (cf::MAP_SWAPPED);
2183 2182
2184 $self->deactivate; 2183 $self->deactivate;
2302 2301
2303sub unique_maps() { 2302sub unique_maps() {
2304 [ 2303 [
2305 map { 2304 map {
2306 utf8::decode $_; 2305 utf8::decode $_;
2307 /\.map$/ 2306 s/\.map$//; # TODO future compatibility hack
2307 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2308 ? ()
2308 ? normalise $_ 2309 : normalise $_
2309 : ()
2310 } @{ aio_readdir $UNIQUEDIR or [] } 2310 } @{ aio_readdir $UNIQUEDIR or [] }
2311 ] 2311 ]
2312} 2312}
2313 2313
2314package cf;
2315
2316=back 2314=back
2317 2315
2318=head3 cf::object 2316=head3 cf::object
2319 2317
2320=cut 2318=cut
2323 2321
2324=over 4 2322=over 4
2325 2323
2326=item $ob->inv_recursive 2324=item $ob->inv_recursive
2327 2325
2328Returns the inventory of the object _and_ their inventories, recursively. 2326Returns the inventory of the object I<and> their inventories, recursively,
2327but I<not> the object itself.
2329 2328
2330=cut 2329=cut
2331 2330
2332sub inv_recursive_; 2331sub inv_recursive_;
2333sub inv_recursive_ { 2332sub inv_recursive_ {
2338 inv_recursive_ inv $_[0] 2337 inv_recursive_ inv $_[0]
2339} 2338}
2340 2339
2341=item $ref = $ob->ref 2340=item $ref = $ob->ref
2342 2341
2343creates and returns a persistent reference to an objetc that can be stored as a string. 2342Creates and returns a persistent reference to an object that can be stored as a string.
2344 2343
2345=item $ob = cf::object::deref ($refstring) 2344=item $ob = cf::object::deref ($refstring)
2346 2345
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2346returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block. 2347even if the object actually exists. May block.
2380can be C<undef>. Does the right thing when the player is currently in a 2379can be C<undef>. Does the right thing when the player is currently in a
2381dialogue with the given NPC character. 2380dialogue with the given NPC character.
2382 2381
2383=cut 2382=cut
2384 2383
2384our $SAY_CHANNEL = {
2385 id => "say",
2386 title => "Map",
2387 reply => "say ",
2388 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2389};
2390
2391our $CHAT_CHANNEL = {
2392 id => "chat",
2393 title => "Chat",
2394 reply => "chat ",
2395 tooltip => "Player chat and shouts, global to the server.",
2396};
2397
2385# rough implementation of a future "reply" method that works 2398# rough implementation of a future "reply" method that works
2386# with dialog boxes. 2399# with dialog boxes.
2387#TODO: the first argument must go, split into a $npc->reply_to ( method 2400#TODO: the first argument must go, split into a $npc->reply_to ( method
2388sub cf::object::player::reply($$$;$) { 2401sub cf::object::player::reply($$$;$) {
2389 my ($self, $npc, $msg, $flags) = @_; 2402 my ($self, $npc, $msg, $flags) = @_;
2400 my $dialog = $pl->{npc_dialog}; 2413 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2414 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402 2415
2403 } else { 2416 } else {
2404 $msg = $npc->name . " says: $msg" if $npc; 2417 $msg = $npc->name . " says: $msg" if $npc;
2405 $self->message ($msg, $flags); 2418 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2406 } 2419 }
2407 } 2420 }
2408} 2421}
2409 2422
2410=item $object->send_msg ($channel, $msg, $color, [extra...]) 2423=item $object->send_msg ($channel, $msg, $color, [extra...])
2435 2448
2436=item $player_object->enter_link 2449=item $player_object->enter_link
2437 2450
2438Freezes the player and moves him/her to a special map (C<{link}>). 2451Freezes the player and moves him/her to a special map (C<{link}>).
2439 2452
2440The player should be reasonably safe there for short amounts of time. You 2453The player should be reasonably safe there for short amounts of time (e.g.
2441I<MUST> call C<leave_link> as soon as possible, though. 2454for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2455though, as the palyer cannot control the character while it is on the link
2456map.
2442 2457
2443Will never block. 2458Will never block.
2444 2459
2445=item $player_object->leave_link ($map, $x, $y) 2460=item $player_object->leave_link ($map, $x, $y)
2446 2461
2504 2519
2505 $map->load; 2520 $map->load;
2506 $map->load_neighbours; 2521 $map->load_neighbours;
2507 2522
2508 return unless $self->contr->active; 2523 return unless $self->contr->active;
2524 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2509 $self->activate_recursive; 2525 $self->activate_recursive;
2510 2526
2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2527 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2512 $self->enter_map ($map, $x, $y); 2528 $self->enter_map ($map, $x, $y);
2513} 2529}
2517Moves the player to the given map-path and coordinates by first freezing 2533Moves the player to the given map-path and coordinates by first freezing
2518her, loading and preparing them map, calling the provided $check callback 2534her, loading and preparing them map, calling the provided $check callback
2519that has to return the map if sucecssful, and then unfreezes the player on 2535that has to return the map if sucecssful, and then unfreezes the player on
2520the new (success) or old (failed) map position. In either case, $done will 2536the new (success) or old (failed) map position. In either case, $done will
2521be called at the end of this process. 2537be called at the end of this process.
2538
2539Note that $check will be called with a potentially non-loaded map, so if
2540it needs a loaded map it has to call C<< ->load >>.
2522 2541
2523=cut 2542=cut
2524 2543
2525our $GOTOGEN; 2544our $GOTOGEN;
2526 2545
2605} 2624}
2606 2625
2607sub prepare_random_map { 2626sub prepare_random_map {
2608 my ($exit) = @_; 2627 my ($exit) = @_;
2609 2628
2610 my $guard = cf::lock_acquire "exit_prepare:$exit";
2611
2612 # all this does is basically replace the /! path by 2629 # all this does is basically replace the /! path by
2613 # a new random map path (?random/...) with a seed 2630 # a new random map path (?random/...) with a seed
2614 # that depends on the exit object 2631 # that depends on the exit object
2615 2632
2616 my $rmp = parse_random_map_params $exit->msg; 2633 my $rmp = parse_random_map_params $exit->msg;
2618 if ($exit->map) { 2635 if ($exit->map) {
2619 $rmp->{region} = $exit->region->name; 2636 $rmp->{region} = $exit->region->name;
2620 $rmp->{origin_map} = $exit->map->path; 2637 $rmp->{origin_map} = $exit->map->path;
2621 $rmp->{origin_x} = $exit->x; 2638 $rmp->{origin_x} = $exit->x;
2622 $rmp->{origin_y} = $exit->y; 2639 $rmp->{origin_y} = $exit->y;
2640
2641 $exit->map->touch;
2623 } 2642 }
2624 2643
2625 $rmp->{random_seed} ||= $exit->random_seed; 2644 $rmp->{random_seed} ||= $exit->random_seed;
2626 2645
2627 my $data = cf::to_json $rmp; 2646 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2628 my $md5 = Digest::MD5::md5_hex $data; 2647 my $md5 = Digest::MD5::md5_hex $data;
2629 my $meta = "$RANDOMDIR/$md5.meta"; 2648 my $meta = "$RANDOMDIR/$md5.meta";
2630 2649
2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2650 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2632 aio_write $fh, 0, (length $data), $data, 0; 2651 aio_write $fh, 0, (length $data), $data, 0;
2633 undef $fh; 2652 undef $fh;
2634 aio_rename "$meta~", $meta; 2653 aio_rename "$meta~", $meta;
2635 2654
2655 my $slaying = "?random/$md5";
2656
2657 if ($exit->valid) {
2636 $exit->slaying ("?random/$md5"); 2658 $exit->slaying ("?random/$md5");
2637 $exit->msg (undef); 2659 $exit->msg (undef);
2660 }
2638 } 2661 }
2639} 2662}
2640 2663
2641sub cf::object::player::enter_exit { 2664sub cf::object::player::enter_exit {
2642 my ($self, $exit) = @_; 2665 my ($self, $exit) = @_;
2643 2666
2644 return unless $self->type == cf::PLAYER; 2667 return unless $self->type == cf::PLAYER;
2645 2668
2646 if ($exit->slaying eq "/!") {
2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
2650 cf::sync_job { prepare_random_map $exit };
2651 }
2652
2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2654 my $hp = $exit->stats->hp;
2655 my $sp = $exit->stats->sp;
2656
2657 $self->enter_link; 2669 $self->enter_link;
2658 2670
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
2663 (async { 2671 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2672 $Coro::current->{desc} = "enter_exit";
2665 2673
2666 $self->deactivate_recursive; # just to be sure
2667 unless (eval { 2674 unless (eval {
2675 $self->deactivate_recursive; # just to be sure
2676
2677 # random map handling
2678 {
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 prepare_random_map $exit
2682 if $exit->slaying eq "/!";
2683 }
2684
2685 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2686 my $x = $exit->stats->hp;
2687 my $y = $exit->stats->sp;
2688
2668 $self->goto ($slaying, $hp, $sp); 2689 $self->goto ($map, $x, $y);
2669 2690
2691 # if exit is damned, update players death & WoR home-position
2692 $self->contr->savebed ($map, $x, $y)
2693 if $exit->flag (cf::FLAG_DAMNED);
2694
2670 1; 2695 1
2671 }) { 2696 }) {
2672 $self->message ("Something went wrong deep within the crossfire server. " 2697 $self->message ("Something went wrong deep within the deliantra server. "
2673 . "I'll try to bring you back to the map you were before. " 2698 . "I'll try to bring you back to the map you were before. "
2674 . "Please report this to the dungeon master!", 2699 . "Please report this to the dungeon master!",
2675 cf::NDI_UNIQUE | cf::NDI_RED); 2700 cf::NDI_UNIQUE | cf::NDI_RED);
2676 2701
2677 warn "ERROR in enter_exit: $@"; 2702 warn "ERROR in enter_exit: $@";
2755 id => "infobox", 2780 id => "infobox",
2756 title => "Map Info", 2781 title => "Map Info",
2757 reply => undef, 2782 reply => undef,
2758 tooltip => "Information related to the maps", 2783 tooltip => "Information related to the maps",
2759 }, 2784 },
2785 "c/party" => {
2786 id => "party",
2787 title => "Party",
2788 reply => "gsay ",
2789 tooltip => "Messages and chat related to your party",
2790 },
2760); 2791);
2761 2792
2762sub cf::client::send_msg { 2793sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_; 2794 my ($self, $channel, $msg, $color, @extra) = @_;
2764 2795
2765 $msg = $self->pl->expand_cfpod ($msg); 2796 $msg = $self->pl->expand_cfpod ($msg)
2797 unless $color & cf::NDI_VERBATIM;
2766 2798
2767 $color &= cf::NDI_CLIENT_MASK; # just in case... 2799 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768 2800
2769 # check predefined channels, for the benefit of C 2801 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) { 2802 if ($CHANNEL{$channel}) {
2791 if ($self->can_msg) { 2823 if ($self->can_msg) {
2792 # default colour, mask it out 2824 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2825 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF; 2826 if $color & cf::NDI_DEF;
2795 2827
2796 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2828 my $pkt = "msg "
2829 . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2830 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2831 );
2832
2833 # try lzf for large packets
2834 $pkt = "lzf " . Compress::LZF::compress $pkt
2835 if 1024 <= length $pkt and $self->{can_lzf};
2836
2837 # split very large packets
2838 if (8192 < length $pkt and $self->{can_lzf}) {
2839 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2840 $pkt = "frag";
2841 }
2842
2843 $self->send_packet ($pkt);
2798 } else { 2844 } else {
2799 if ($color >= 0) { 2845 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones 2846 # replace some tags by gcfclient-compatible ones
2801 for ($msg) { 2847 for ($msg) {
2802 1 while 2848 1 while
3001 3047
3002The following functions and methods are available within a safe environment: 3048The following functions and methods are available within a safe environment:
3003 3049
3004 cf::object 3050 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy 3051 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr 3052 insert remove name archname title slaying race decrease split
3007 3053
3008 cf::object::player 3054 cf::object::player
3009 player 3055 player
3010 3056
3011 cf::player 3057 cf::player
3016 3062
3017=cut 3063=cut
3018 3064
3019for ( 3065for (
3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3066 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race 3067 insert remove inv nrof name archname title slaying race
3022 decrease_ob_nr destroy)], 3068 decrease split destroy change_exp)],
3023 ["cf::object::player" => qw(player)], 3069 ["cf::object::player" => qw(player)],
3024 ["cf::player" => qw(peaceful)], 3070 ["cf::player" => qw(peaceful)],
3025 ["cf::map" => qw(trigger)], 3071 ["cf::map" => qw(trigger)],
3026) { 3072) {
3027 no strict 'refs'; 3073 no strict 'refs';
3132 { 3178 {
3133 my $faces = $facedata->{faceinfo}; 3179 my $faces = $facedata->{faceinfo};
3134 3180
3135 while (my ($face, $info) = each %$faces) { 3181 while (my ($face, $info) = each %$faces) {
3136 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3182 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3183
3137 cf::face::set_visibility $idx, $info->{visibility}; 3184 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap}; 3185 cf::face::set_magicmap $idx, $info->{magicmap};
3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3186 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3187 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
3141 3188
3142 cf::cede_to_tick; 3189 cf::cede_to_tick;
3143 } 3190 }
3144 3191
3145 while (my ($face, $info) = each %$faces) { 3192 while (my ($face, $info) = each %$faces) {
3146 next unless $info->{smooth}; 3193 next unless $info->{smooth};
3194
3147 my $idx = cf::face::find $face 3195 my $idx = cf::face::find $face
3148 or next; 3196 or next;
3197
3149 if (my $smooth = cf::face::find $info->{smooth}) { 3198 if (my $smooth = cf::face::find $info->{smooth}) {
3150 cf::face::set_smooth $idx, $smooth; 3199 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3200 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
3152 } else { 3201 } else {
3153 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3202 warn "smooth face '$info->{smooth}' not found for face '$face'";
3171 { 3220 {
3172 # TODO: for gcfclient pleasure, we should give resources 3221 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index. 3222 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource}; 3223 my $res = $facedata->{resource};
3175 3224
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) { 3225 while (my ($name, $info) = each %$res) {
3226 if (defined $info->{type}) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3227 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data; 3228 my $data;
3181 3229
3182 if ($info->{type} & 1) { 3230 if ($info->{type} & 1) {
3183 # prepend meta info 3231 # prepend meta info
3184 3232
3185 my $meta = $enc->encode ({ 3233 my $meta = $enc->encode ({
3186 name => $name, 3234 name => $name,
3187 %{ $info->{meta} || {} }, 3235 %{ $info->{meta} || {} },
3188 }); 3236 });
3189 3237
3190 $data = pack "(w/a*)*", $meta, $info->{data}; 3238 $data = pack "(w/a*)*", $meta, $info->{data};
3239 } else {
3240 $data = $info->{data};
3241 }
3242
3243 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3244 cf::face::set_type $idx, $info->{type};
3191 } else { 3245 } else {
3192 $data = $info->{data}; 3246 $RESOURCE{$name} = $info;
3193 } 3247 }
3194 3248
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick; 3249 cf::cede_to_tick;
3199 } 3250 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
3218 } 3251 }
3252
3253 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3219 3254
3220 1 3255 1
3221} 3256}
3257
3258cf::global->attach (on_resource_update => sub {
3259 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3260 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3261
3262 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3263 my $sound = $soundconf->{compat}[$_]
3264 or next;
3265
3266 my $face = cf::face::find "sound/$sound->[1]";
3267 cf::sound::set $sound->[0] => $face;
3268 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3269 }
3270
3271 while (my ($k, $v) = each %{$soundconf->{event}}) {
3272 my $face = cf::face::find "sound/$v";
3273 cf::sound::set $k => $face;
3274 }
3275 }
3276});
3222 3277
3223register_exticmd fx_want => sub { 3278register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_; 3279 my ($ns, $want) = @_;
3225 3280
3226 while (my ($k, $v) = each %$want) { 3281 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v); 3282 $ns->fx_want ($k, $v);
3228 } 3283 }
3229}; 3284};
3285
3286sub load_resource_file($) {
3287 my $guard = lock_acquire "load_resource_file";
3288
3289 my $status = load_resource_file_ $_[0];
3290 get_slot 0.1, 100;
3291 cf::arch::commit_load;
3292
3293 $status
3294}
3230 3295
3231sub reload_regions { 3296sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework 3297 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?) 3298 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = (); 3299 %ext::player_env::MUSIC_FACE_CACHE = ();
3248} 3313}
3249 3314
3250sub reload_archetypes { 3315sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes" 3316 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n"; 3317 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258} 3318}
3259 3319
3260sub reload_treasures { 3320sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures" 3321 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n"; 3322 or die "unable to load treasurelists\n";
3263} 3323}
3264 3324
3265sub reload_resources { 3325sub reload_resources {
3266 warn "reloading resource files...\n"; 3326 warn "reloading resource files...\n";
3267 3327
3328 reload_facedata;
3329 reload_archetypes;
3268 reload_regions; 3330 reload_regions;
3269 reload_facedata;
3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures; 3331 reload_treasures;
3273 3332
3274 warn "finished reloading resource files\n"; 3333 warn "finished reloading resource files\n";
3275} 3334}
3276 3335
3277sub init { 3336sub init {
3337 my $guard = freeze_mainloop;
3338
3339 evthread_start IO::AIO::poll_fileno;
3340
3278 reload_resources; 3341 reload_resources;
3279} 3342}
3280 3343
3281sub reload_config { 3344sub reload_config {
3282 open my $fh, "<:utf8", "$CONFDIR/config" 3345 open my $fh, "<:utf8", "$CONFDIR/config"
3283 or return; 3346 or return;
3284 3347
3285 local $/; 3348 local $/;
3286 *CFG = YAML::Syck::Load <$fh>; 3349 *CFG = YAML::Load <$fh>;
3287 3350
3288 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3351 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3289 3352
3290 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3353 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3291 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3354 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3297 }; 3360 };
3298 warn $@ if $@; 3361 warn $@ if $@;
3299 } 3362 }
3300} 3363}
3301 3364
3365sub pidfile() {
3366 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3367 or die "$PIDFILE: $!";
3368 flock $fh, &Fcntl::LOCK_EX
3369 or die "$PIDFILE: flock: $!";
3370 $fh
3371}
3372
3373# make sure only one server instance is running at any one time
3374sub atomic {
3375 my $fh = pidfile;
3376
3377 my $pid = <$fh>;
3378 kill 9, $pid if $pid > 0;
3379
3380 seek $fh, 0, 0;
3381 print $fh $$;
3382}
3383
3302sub main { 3384sub main {
3385 atomic;
3386
3303 # we must not ever block the main coroutine 3387 # we must not ever block the main coroutine
3304 local $Coro::idle = sub { 3388 local $Coro::idle = sub {
3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3389 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3306 (async { 3390 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3391 $Coro::current->{desc} = "IDLE BUG HANDLER";
3308 Event::one_event; 3392 EV::loop EV::LOOP_ONESHOT;
3309 })->prio (Coro::PRIO_MAX); 3393 })->prio (Coro::PRIO_MAX);
3310 }; 3394 };
3311 3395
3396 {
3397 my $guard = freeze_mainloop;
3312 reload_config; 3398 reload_config;
3313 db_init; 3399 db_init;
3314 load_extensions; 3400 load_extensions;
3315 3401
3316 $TICK_WATCHER->start; 3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 }
3404
3405 utime time, time, $RUNTIMEFILE;
3406
3407 # no (long-running) fork's whatsoever before this point(!)
3408 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3409
3317 Event::loop; 3410 EV::loop;
3318} 3411}
3319 3412
3320############################################################################# 3413#############################################################################
3321# initialisation and cleanup 3414# initialisation and cleanup
3322 3415
3323# install some emergency cleanup handlers 3416# install some emergency cleanup handlers
3324BEGIN { 3417BEGIN {
3418 our %SIGWATCHER = ();
3325 for my $signal (qw(INT HUP TERM)) { 3419 for my $signal (qw(INT HUP TERM)) {
3326 Event->signal ( 3420 $SIGWATCHER{$signal} = EV::signal $signal, sub {
3327 reentrant => 0,
3328 data => WF_AUTOCANCEL,
3329 signal => $signal,
3330 prio => 0,
3331 cb => sub {
3332 cf::cleanup "SIG$signal"; 3421 cf::cleanup "SIG$signal";
3333 },
3334 ); 3422 };
3335 } 3423 }
3336} 3424}
3337 3425
3338sub write_runtime { 3426sub write_runtime_sync {
3339 my $runtime = "$LOCALDIR/runtime";
3340
3341 # first touch the runtime file to show we are still running: 3427 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time. 3428 # the fsync below can take a very very long time.
3343 3429
3344 IO::AIO::aio_utime $runtime, undef, undef; 3430 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3345 3431
3346 my $guard = cf::lock_acquire "write_runtime"; 3432 my $guard = cf::lock_acquire "write_runtime";
3347 3433
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3434 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3349 or return; 3435 or return;
3350 3436
3351 my $value = $cf::RUNTIME + 90 + 10; 3437 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock 3438 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server. 3439 # 60 allows for the watchdog to kill the server.
3363 aio_utime $fh, undef, undef; 3449 aio_utime $fh, undef, undef;
3364 3450
3365 close $fh 3451 close $fh
3366 or return; 3452 or return;
3367 3453
3368 aio_rename "$runtime~", $runtime 3454 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3369 and return; 3455 and return;
3370 3456
3371 warn "runtime file written.\n"; 3457 warn "runtime file written.\n";
3372 3458
3373 1 3459 1
3460}
3461
3462our $uuid_lock;
3463our $uuid_skip;
3464
3465sub write_uuid_sync($) {
3466 $uuid_skip ||= $_[0];
3467
3468 return if $uuid_lock;
3469 local $uuid_lock = 1;
3470
3471 my $uuid = "$LOCALDIR/uuid";
3472
3473 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3474 or return;
3475
3476 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur;
3477 $uuid_skip = 0;
3478
3479 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3480 and return;
3481
3482 # always fsync - this file is important
3483 aio_fsync $fh
3484 and return;
3485
3486 close $fh
3487 or return;
3488
3489 aio_rename "$uuid~", $uuid
3490 and return;
3491
3492 warn "uuid file written ($value).\n";
3493
3494 1
3495
3496}
3497
3498sub write_uuid($$) {
3499 my ($skip, $sync) = @_;
3500
3501 $sync ? write_uuid_sync $skip
3502 : async { write_uuid_sync $skip };
3374} 3503}
3375 3504
3376sub emergency_save() { 3505sub emergency_save() {
3377 my $freeze_guard = cf::freeze_mainloop; 3506 my $freeze_guard = cf::freeze_mainloop;
3378 3507
3400 warn "end emergency map save\n"; 3529 warn "end emergency map save\n";
3401 3530
3402 warn "begin emergency database checkpoint\n"; 3531 warn "begin emergency database checkpoint\n";
3403 BDB::db_env_txn_checkpoint $DB_ENV; 3532 BDB::db_env_txn_checkpoint $DB_ENV;
3404 warn "end emergency database checkpoint\n"; 3533 warn "end emergency database checkpoint\n";
3534
3535 warn "begin write uuid\n";
3536 write_uuid_sync 1;
3537 warn "end write uuid\n";
3405 }; 3538 };
3406 3539
3407 warn "leave emergency perl save\n"; 3540 warn "leave emergency perl save\n";
3408} 3541}
3409 3542
3410sub post_cleanup { 3543sub post_cleanup {
3411 my ($make_core) = @_; 3544 my ($make_core) = @_;
3412 3545
3413 warn Carp::longmess "post_cleanup backtrace" 3546 warn Carp::longmess "post_cleanup backtrace"
3414 if $make_core; 3547 if $make_core;
3548
3549 my $fh = pidfile;
3550 unlink $PIDFILE if <$fh> == $$;
3415} 3551}
3552
3553# a safer delete_package, copied from Symbol
3554sub clear_package($) {
3555 my $pkg = shift;
3556
3557 # expand to full symbol table name if needed
3558 unless ($pkg =~ /^main::.*::$/) {
3559 $pkg = "main$pkg" if $pkg =~ /^::/;
3560 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3561 $pkg .= '::' unless $pkg =~ /::$/;
3562 }
3563
3564 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3565 my $stem_symtab = *{$stem}{HASH};
3566
3567 defined $stem_symtab and exists $stem_symtab->{$leaf}
3568 or return;
3569
3570 # clear all symbols
3571 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3572 for my $name (keys %$leaf_symtab) {
3573 _gv_clear *{"$pkg$name"};
3574# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3575 }
3576 warn "cleared package #$pkg\n";#d#
3577}
3578
3579our $RELOAD; # how many times to reload
3416 3580
3417sub do_reload_perl() { 3581sub do_reload_perl() {
3418 # can/must only be called in main 3582 # can/must only be called in main
3419 if ($Coro::current != $Coro::main) { 3583 if ($Coro::current != $Coro::main) {
3420 warn "can only reload from main coroutine"; 3584 warn "can only reload from main coroutine";
3421 return; 3585 return;
3422 } 3586 }
3423 3587
3588 return if $RELOAD++;
3589
3590 while ($RELOAD) {
3424 warn "reloading..."; 3591 warn "reloading...";
3425 3592
3426 warn "entering sync_job"; 3593 warn "entering sync_job";
3427 3594
3428 cf::sync_job { 3595 cf::sync_job {
3429 cf::write_runtime; # external watchdog should not bark 3596 cf::write_runtime_sync; # external watchdog should not bark
3430 cf::emergency_save; 3597 cf::emergency_save;
3431 cf::write_runtime; # external watchdog should not bark 3598 cf::write_runtime_sync; # external watchdog should not bark
3432 3599
3433 warn "syncing database to disk"; 3600 warn "syncing database to disk";
3434 BDB::db_env_txn_checkpoint $DB_ENV; 3601 BDB::db_env_txn_checkpoint $DB_ENV;
3435 3602
3436 # if anything goes wrong in here, we should simply crash as we already saved 3603 # if anything goes wrong in here, we should simply crash as we already saved
3437 3604
3438 warn "cancelling all WF_AUTOCANCEL watchers";
3439 for (Event::all_watchers) {
3440 $_->cancel if $_->data & WF_AUTOCANCEL;
3441 }
3442
3443 warn "flushing outstanding aio requests"; 3605 warn "flushing outstanding aio requests";
3444 for (;;) {
3445 BDB::flush;
3446 IO::AIO::flush;
3447 Coro::cede_notself;
3448 last unless IO::AIO::nreqs || BDB::nreqs; 3606 while (IO::AIO::nreqs || BDB::nreqs) {
3449 warn "iterate..."; 3607 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3450 }
3451
3452 ++$RELOAD;
3453
3454 warn "cancelling all extension coros";
3455 $_->cancel for values %EXT_CORO;
3456 %EXT_CORO = ();
3457
3458 warn "removing commands";
3459 %COMMAND = ();
3460
3461 warn "removing ext/exti commands";
3462 %EXTCMD = ();
3463 %EXTICMD = ();
3464
3465 warn "unloading/nuking all extensions";
3466 for my $pkg (@EXTS) {
3467 warn "... unloading $pkg";
3468
3469 if (my $cb = $pkg->can ("unload")) {
3470 eval {
3471 $cb->($pkg);
3472 1
3473 } or warn "$pkg unloaded, but with errors: $@";
3474 } 3608 }
3475 3609
3476 warn "... nuking $pkg"; 3610 warn "cancelling all extension coros";
3477 Symbol::delete_package $pkg; 3611 $_->cancel for values %EXT_CORO;
3478 } 3612 %EXT_CORO = ();
3479 3613
3480 warn "unloading all perl modules loaded from $LIBDIR"; 3614 warn "removing commands";
3481 while (my ($k, $v) = each %INC) { 3615 %COMMAND = ();
3482 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3483 3616
3617 warn "removing ext/exti commands";
3618 %EXTCMD = ();
3619 %EXTICMD = ();
3620
3621 warn "unloading/nuking all extensions";
3622 for my $pkg (@EXTS) {
3484 warn "... unloading $k"; 3623 warn "... unloading $pkg";
3485 delete $INC{$k};
3486 3624
3487 $k =~ s/\.pm$//;
3488 $k =~ s/\//::/g;
3489
3490 if (my $cb = $k->can ("unload_module")) { 3625 if (my $cb = $pkg->can ("unload")) {
3626 eval {
3491 $cb->(); 3627 $cb->($pkg);
3628 1
3629 } or warn "$pkg unloaded, but with errors: $@";
3630 }
3631
3632 warn "... clearing $pkg";
3633 clear_package $pkg;
3492 } 3634 }
3493 3635
3494 Symbol::delete_package $k; 3636 warn "unloading all perl modules loaded from $LIBDIR";
3637 while (my ($k, $v) = each %INC) {
3638 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3639
3640 warn "... unloading $k";
3641 delete $INC{$k};
3642
3643 $k =~ s/\.pm$//;
3644 $k =~ s/\//::/g;
3645
3646 if (my $cb = $k->can ("unload_module")) {
3647 $cb->();
3648 }
3649
3650 clear_package $k;
3495 } 3651 }
3496 3652
3497 warn "getting rid of safe::, as good as possible"; 3653 warn "getting rid of safe::, as good as possible";
3498 Symbol::delete_package "safe::$_" 3654 clear_package "safe::$_"
3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3655 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3500 3656
3501 warn "unloading cf.pm \"a bit\""; 3657 warn "unloading cf.pm \"a bit\"";
3502 delete $INC{"cf.pm"}; 3658 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"}; 3659 delete $INC{"cf/pod.pm"};
3504 3660
3505 # don't, removes xs symbols, too, 3661 # don't, removes xs symbols, too,
3506 # and global variables created in xs 3662 # and global variables created in xs
3507 #Symbol::delete_package __PACKAGE__; 3663 #clear_package __PACKAGE__;
3508 3664
3509 warn "unload completed, starting to reload now"; 3665 warn "unload completed, starting to reload now";
3510 3666
3511 warn "reloading cf.pm"; 3667 warn "reloading cf.pm";
3512 require cf; 3668 require cf;
3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3669 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3514 3670
3515 warn "loading config and database again"; 3671 warn "loading config and database again";
3516 cf::reload_config; 3672 cf::reload_config;
3517 3673
3518 warn "loading extensions"; 3674 warn "loading extensions";
3519 cf::load_extensions; 3675 cf::load_extensions;
3520 3676
3521 warn "reattaching attachments to objects/players"; 3677 warn "reattaching attachments to objects/players";
3522 _global_reattach; # objects, sockets 3678 _global_reattach; # objects, sockets
3523 warn "reattaching attachments to maps"; 3679 warn "reattaching attachments to maps";
3524 reattach $_ for values %MAP; 3680 reattach $_ for values %MAP;
3525 warn "reattaching attachments to players"; 3681 warn "reattaching attachments to players";
3526 reattach $_ for values %PLAYER; 3682 reattach $_ for values %PLAYER;
3527 3683
3528 warn "leaving sync_job"; 3684 warn "leaving sync_job";
3529 3685
3530 1 3686 1
3531 } or do { 3687 } or do {
3532 warn $@; 3688 warn $@;
3533 warn "error while reloading, exiting."; 3689 cf::cleanup "error while reloading, exiting.";
3534 exit 1;
3535 }; 3690 };
3536 3691
3537 warn "reloaded"; 3692 warn "reloaded";
3693 --$RELOAD;
3694 }
3538}; 3695};
3539 3696
3540our $RELOAD_WATCHER; # used only during reload 3697our $RELOAD_WATCHER; # used only during reload
3541 3698
3542sub reload_perl() { 3699sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back, 3700 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here. 3701 # coro crashes during coro_state_free->destroy here.
3545 3702
3546 $RELOAD_WATCHER ||= Event->timer ( 3703 $RELOAD_WATCHER ||= EV::timer 0, 0, sub {
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl; 3704 do_reload_perl;
3552 undef $RELOAD_WATCHER; 3705 undef $RELOAD_WATCHER;
3553 },
3554 ); 3706 };
3555} 3707}
3556 3708
3557register_command "reload" => sub { 3709register_command "reload" => sub {
3558 my ($who, $arg) = @_; 3710 my ($who, $arg) = @_;
3559 3711
3572 3724
3573our @WAIT_FOR_TICK; 3725our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN; 3726our @WAIT_FOR_TICK_BEGIN;
3575 3727
3576sub wait_for_tick { 3728sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main; 3729 return if tick_inhibit || $Coro::current == $Coro::main;
3579 3730
3580 my $signal = new Coro::Signal; 3731 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal; 3732 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait; 3733 $signal->wait;
3583} 3734}
3584 3735
3585sub wait_for_tick_begin { 3736sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main; 3737 return if tick_inhibit || $Coro::current == $Coro::main;
3588 3738
3589 my $signal = new Coro::Signal; 3739 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal; 3740 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait; 3741 $signal->wait;
3592} 3742}
3593 3743
3594$TICK_WATCHER = Event->timer ( 3744sub tick {
3595 reentrant => 0,
3596 parked => 1,
3597 prio => 0,
3598 at => $NEXT_TICK || $TICK,
3599 data => WF_AUTOCANCEL,
3600 cb => sub {
3601 if ($Coro::current != $Coro::main) { 3745 if ($Coro::current != $Coro::main) {
3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3746 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3603 unless ++$bug_warning > 10; 3747 unless ++$bug_warning > 10;
3604 return; 3748 return;
3605 } 3749 }
3606 3750
3607 $NOW = $tick_start = Event::time;
3608
3609 cf::server_tick; # one server iteration 3751 cf::server_tick; # one server iteration
3610 3752
3611 $RUNTIME += $TICK;
3612 $NEXT_TICK += $TICK;
3613
3614 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3753 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3615 $NEXT_RUNTIME_WRITE = $NOW + 10; 3754 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3616 Coro::async_pool { 3755 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver"; 3756 $Coro::current->{desc} = "runtime saver";
3618 write_runtime 3757 write_runtime_sync
3619 or warn "ERROR: unable to write runtime file: $!"; 3758 or warn "ERROR: unable to write runtime file: $!";
3620 };
3621 } 3759 };
3760 }
3622 3761
3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3762 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3624 $sig->send; 3763 $sig->send;
3625 } 3764 }
3626 while (my $sig = shift @WAIT_FOR_TICK) { 3765 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send; 3766 $sig->send;
3628 } 3767 }
3629 3768
3630 $NOW = Event::time; 3769 $LOAD = ($NOW - $TICK_START) / $TICK;
3631
3632 # if we are delayed by four ticks or more, skip them all
3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3634
3635 $TICK_WATCHER->at ($NEXT_TICK);
3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3770 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640 3771
3641 _post_tick; 3772 if (0) {
3773 if ($NEXT_TICK) {
3774 my $jitter = $TICK_START - $NEXT_TICK;
3775 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3776 warn "jitter $JITTER\n";#d#
3777 }
3642 }, 3778 }
3643); 3779}
3644 3780
3645{ 3781{
3782 # configure BDB
3783
3646 BDB::min_parallel 8; 3784 BDB::min_parallel 8;
3647 BDB::max_poll_time $TICK * 0.1; 3785 BDB::max_poll_reqs $TICK * 0.1;
3648 $BDB_POLL_WATCHER = Event->io ( 3786 $AnyEvent::BDB::WATCHER->priority (1);
3649 reentrant => 0,
3650 fd => BDB::poll_fileno,
3651 poll => 'r',
3652 prio => 0,
3653 data => WF_AUTOCANCEL,
3654 cb => \&BDB::poll_cb,
3655 );
3656
3657 BDB::set_sync_prepare {
3658 my $status;
3659 my $current = $Coro::current;
3660 (
3661 sub {
3662 $status = $!;
3663 $current->ready; undef $current;
3664 },
3665 sub {
3666 Coro::schedule while defined $current;
3667 $! = $status;
3668 },
3669 )
3670 };
3671 3787
3672 unless ($DB_ENV) { 3788 unless ($DB_ENV) {
3673 $DB_ENV = BDB::db_env_create; 3789 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3790 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3675 | BDB::LOG_AUTOREMOVE, 1); 3791 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3792 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3793 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3794 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3678 3795
3679 cf::sync_job { 3796 cf::sync_job {
3680 eval { 3797 eval {
3690 3807
3691 cf::cleanup "db_env_open(db): $@" if $@; 3808 cf::cleanup "db_env_open(db): $@" if $@;
3692 }; 3809 };
3693 } 3810 }
3694 3811
3695 $BDB_DEADLOCK_WATCHER = Event->timer ( 3812 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { }; 3813 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 ); 3814 };
3705 $BDB_CHECKPOINT_WATCHER = Event->timer ( 3815 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { }; 3816 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 ); 3817 };
3715 $BDB_TRICKLE_WATCHER = Event->timer ( 3818 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { }; 3819 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 ); 3820 };
3725} 3821}
3726 3822
3727{ 3823{
3824 # configure IO::AIO
3825
3728 IO::AIO::min_parallel 8; 3826 IO::AIO::min_parallel 8;
3729
3730 undef $Coro::AIO::WATCHER;
3731 IO::AIO::max_poll_time $TICK * 0.1; 3827 IO::AIO::max_poll_time $TICK * 0.1;
3732 $AIO_POLL_WATCHER = Event->io ( 3828 undef $AnyEvent::AIO::WATCHER;
3733 reentrant => 0,
3734 data => WF_AUTOCANCEL,
3735 fd => IO::AIO::poll_fileno,
3736 poll => 'r',
3737 prio => 0,
3738 cb => \&IO::AIO::poll_cb,
3739 );
3740} 3829}
3741 3830
3742my $_log_backtrace; 3831my $_log_backtrace;
3743 3832
3744sub _log_backtrace { 3833sub _log_backtrace {
3747 $msg =~ s/\n//; 3836 $msg =~ s/\n//;
3748 3837
3749 # limit the # of concurrent backtraces 3838 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) { 3839 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace; 3840 ++$_log_backtrace;
3841 my $perl_bt = Carp::longmess $msg;
3752 async { 3842 async {
3753 $Coro::current->{desc} = "abt $msg"; 3843 $Coro::current->{desc} = "abt $msg";
3754 3844
3755 my @bt = fork_call { 3845 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr; 3846 @addr = map { sprintf "%x", $_ } @addr;
3767 } 3857 }
3768 3858
3769 @funcs 3859 @funcs
3770 }; 3860 };
3771 3861
3772 LOG llevInfo, "[ABT] $msg\n"; 3862 LOG llevInfo, "[ABT] $perl_bt\n";
3863 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt; 3864 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace; 3865 --$_log_backtrace;
3775 }; 3866 };
3776 } else { 3867 } else {
3777 LOG llevInfo, "[ABT] $msg\n"; 3868 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines