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.407 by root, Sun Jan 13 09:53:53 2008 UTC vs.
Revision 1.459 by root, Sat Dec 13 21:46:12 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 EV 1.86; 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.32 (); 38use Coro ();
16use Coro::State; 39use Coro::State;
17use Coro::Handle; 40use Coro::Handle;
18use Coro::EV; 41use Coro::EV;
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;
23use Coro::BDB; 49use Coro::BDB 1.6;
24use Coro::Storable; 50use Coro::Storable;
25use Coro::Util (); 51use Coro::Util ();
26 52
27use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
28use BDB (); 54use BDB ();
29use Data::Dumper; 55use Data::Dumper;
30use Digest::MD5; 56use Digest::MD5;
31use Fcntl; 57use Fcntl;
32use YAML::Syck (); 58use YAML ();
33use IO::AIO 2.51 (); 59use IO::AIO ();
34use Time::HiRes; 60use Time::HiRes;
35use Compress::LZF; 61use Compress::LZF;
36use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
37 65
38# configure various modules to our taste 66# configure various modules to our taste
39# 67#
40$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
41Coro::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";
42Compress::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
43
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 76
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 78
51our %COMMAND = (); 79our %COMMAND = ();
52our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
55our %EXTCMD = (); 83our %EXTCMD = ();
56our %EXTICMD = (); 84our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
59 87
60our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 89our @EVENT;
62 90
63our $CONFDIR = confdir; 91our $CONFDIR = confdir;
64our $DATADIR = datadir; 92our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
74our %RESOURCE; 105our %RESOURCE;
75 106
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $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 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
80our $NEXT_TICK; 109our $NEXT_TICK;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
82 111
83our $BDB_POLL_WATCHER;
84our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
85our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
86our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
87our $DB_ENV; 115our $DB_ENV;
88 116
99# used to convert map paths into valid unix filenames by replacing / by ∕ 127# used to convert map paths into valid unix filenames by replacing / by ∕
100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 128our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
101 129
102our $LOAD; # a number between 0 (idle) and 1 (too many objects) 130our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing 131our $LOADAVG; # same thing, but with alpha-smoothing
132our $JITTER; # average jitter
104our $tick_start; # for load detecting purposes 133our $TICK_START; # for load detecting purposes
134
135our @POST_INIT;
136
137our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
105 138
106binmode STDOUT; 139binmode STDOUT;
107binmode STDERR; 140binmode STDERR;
108 141
109# read virtual server time, if available 142# read virtual server time, if available
110unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 143unless ($RUNTIME || !-e $RUNTIMEFILE) {
111 open my $fh, "<", "$LOCALDIR/runtime" 144 open my $fh, "<", $RUNTIMEFILE
112 or die "unable to read runtime file: $!"; 145 or die "unable to read $RUNTIMEFILE file: $!";
113 $RUNTIME = <$fh> + 0.; 146 $RUNTIME = <$fh> + 0.;
114} 147}
115 148
116mkdir $_ 149mkdir $_
117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 150 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
195 LOG llevError, $msg; 228 LOG llevError, $msg;
196 }; 229 };
197} 230}
198 231
199$Coro::State::DIEHOOK = sub { 232$Coro::State::DIEHOOK = sub {
233 return unless $^S eq 0; # "eq", not "=="
234
235 if ($Coro::current == $Coro::main) {#d#
236 warn "DIEHOOK called in main context, Coro bug?\n";#d#
237 return;#d#
238 }#d#
239
240 # kill coroutine otherwise
200 warn Carp::longmess $_[0]; 241 warn Carp::longmess $_[0];
201 Coro::terminate; 242 Coro::terminate
202}; 243};
244
245$SIG{__DIE__} = sub { }; #d#?
203 246
204@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 247@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
205@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 248@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
206@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 249@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
207@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 250@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
214for my $pkg (qw( 257for my $pkg (qw(
215 cf::global cf::attachable 258 cf::global cf::attachable
216 cf::object cf::object::player 259 cf::object cf::object::player
217 cf::client cf::player 260 cf::client cf::player
218 cf::arch cf::living 261 cf::arch cf::living
262 cf::map cf::mapspace
219 cf::map cf::party cf::region 263 cf::party cf::region
220)) { 264)) {
221 no strict 'refs';
222 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 265 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
223} 266}
224 267
225$EV::DIED = sub { 268$EV::DIED = sub {
226 warn "error in event callback: @_"; 269 warn "error in event callback: @_";
268our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 311our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
269 312
270sub encode_json($) { $json_coder->encode ($_[0]) } 313sub encode_json($) { $json_coder->encode ($_[0]) }
271sub decode_json($) { $json_coder->decode ($_[0]) } 314sub decode_json($) { $json_coder->decode ($_[0]) }
272 315
316=item cf::post_init { BLOCK }
317
318Execute the given codeblock, I<after> all extensions have been (re-)loaded,
319but I<before> the server starts ticking again.
320
321The cdoeblock will have a single boolean argument to indicate whether this
322is a reload or not.
323
324=cut
325
326sub post_init(&) {
327 push @POST_INIT, shift;
328}
329
273=item cf::lock_wait $string 330=item cf::lock_wait $string
274 331
275Wait until the given lock is available. See cf::lock_acquire. 332Wait until the given lock is available. See cf::lock_acquire.
276 333
277=item my $lock = cf::lock_acquire $string 334=item my $lock = cf::lock_acquire $string
278 335
279Wait until the given lock is available and then acquires it and returns 336Wait until the given lock is available and then acquires it and returns
280a Coro::guard object. If the guard object gets destroyed (goes out of scope, 337a L<Guard> object. If the guard object gets destroyed (goes out of scope,
281for example when the coroutine gets canceled), the lock is automatically 338for example when the coroutine gets canceled), the lock is automatically
282returned. 339returned.
283 340
284Locks are *not* recursive, locking from the same coro twice results in a 341Locks are *not* recursive, locking from the same coro twice results in a
285deadlocked coro. 342deadlocked coro.
291 348
292Return true if the lock is currently active, i.e. somebody has locked it. 349Return true if the lock is currently active, i.e. somebody has locked it.
293 350
294=cut 351=cut
295 352
296our %LOCK; 353our $LOCKS = new Coro::SemaphoreSet;
297our %LOCKER;#d#
298 354
299sub lock_wait($) { 355sub lock_wait($) {
300 my ($key) = @_; 356 $LOCKS->wait ($_[0]);
301
302 if ($LOCKER{$key} == $Coro::current) {#d#
303 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
304 return;#d#
305 }#d#
306
307 # wait for lock, if any
308 while ($LOCK{$key}) {
309 push @{ $LOCK{$key} }, $Coro::current;
310 Coro::schedule;
311 }
312} 357}
313 358
314sub lock_acquire($) { 359sub lock_acquire($) {
315 my ($key) = @_; 360 $LOCKS->guard ($_[0])
316
317 # wait, to be sure we are not locked
318 lock_wait $key;
319
320 $LOCK{$key} = [];
321 $LOCKER{$key} = $Coro::current;#d#
322
323 Coro::guard {
324 delete $LOCKER{$key};#d#
325 # wake up all waiters, to be on the safe side
326 $_->ready for @{ delete $LOCK{$key} };
327 }
328} 361}
329 362
330sub lock_active($) { 363sub lock_active($) {
331 my ($key) = @_; 364 $LOCKS->count ($_[0]) < 1
332
333 ! ! $LOCK{$key}
334} 365}
335 366
336sub freeze_mainloop { 367sub freeze_mainloop {
337 return unless $TICK_WATCHER->is_active; 368 tick_inhibit_inc;
338 369
339 my $guard = Coro::guard { 370 &Guard::guard (\&tick_inhibit_dec);
340 $TICK_WATCHER->start;
341 };
342 $TICK_WATCHER->stop;
343 $guard
344} 371}
345 372
346=item cf::periodic $interval, $cb 373=item cf::periodic $interval, $cb
347 374
348Like EV::periodic, but randomly selects a starting point so that the actions 375Like EV::periodic, but randomly selects a starting point so that the actions
403 } 430 }
404 } 431 }
405}; 432};
406 433
407sub get_slot($;$$) { 434sub get_slot($;$$) {
435 return if tick_inhibit || $Coro::current == $Coro::main;
436
408 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
409 438
410 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
411 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
412 441
449 # this is the main coro, too bad, we have to block 478 # this is the main coro, too bad, we have to block
450 # till the operation succeeds, freezing the server :/ 479 # till the operation succeeds, freezing the server :/
451 480
452 LOG llevError, Carp::longmess "sync job";#d# 481 LOG llevError, Carp::longmess "sync job";#d#
453 482
454 # TODO: use suspend/resume instead
455 # (but this is cancel-safe)
456 my $freeze_guard = freeze_mainloop; 483 my $freeze_guard = freeze_mainloop;
457 484
458 my $busy = 1; 485 my $busy = 1;
459 my @res; 486 my @res;
460 487
471 } else { 498 } else {
472 EV::loop EV::LOOP_ONESHOT; 499 EV::loop EV::LOOP_ONESHOT;
473 } 500 }
474 } 501 }
475 502
476 $time = EV::time - $time; 503 my $time = EV::time - $time;
477 504
478 LOG llevError | logBacktrace, Carp::longmess "long sync job"
479 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
480
481 $tick_start += $time; # do not account sync jobs to server load 505 $TICK_START += $time; # do not account sync jobs to server load
482 506
483 wantarray ? @res : $res[0] 507 wantarray ? @res : $res[0]
484 } else { 508 } else {
485 # we are in another coroutine, how wonderful, everything just works 509 # we are in another coroutine, how wonderful, everything just works
486 510
528 reset_signals; 552 reset_signals;
529 &$cb 553 &$cb
530 }, @args; 554 }, @args;
531 555
532 wantarray ? @res : $res[-1] 556 wantarray ? @res : $res[-1]
557}
558
559=item $coin = coin_from_name $name
560
561=cut
562
563our %coin_alias = (
564 "silver" => "silvercoin",
565 "silvercoin" => "silvercoin",
566 "silvercoins" => "silvercoin",
567 "gold" => "goldcoin",
568 "goldcoin" => "goldcoin",
569 "goldcoins" => "goldcoin",
570 "platinum" => "platinacoin",
571 "platinumcoin" => "platinacoin",
572 "platinumcoins" => "platinacoin",
573 "platina" => "platinacoin",
574 "platinacoin" => "platinacoin",
575 "platinacoins" => "platinacoin",
576 "royalty" => "royalty",
577 "royalties" => "royalty",
578);
579
580sub coin_from_name($) {
581 $coin_alias{$_[0]}
582 ? cf::arch::find $coin_alias{$_[0]}
583 : undef
533} 584}
534 585
535=item $value = cf::db_get $family => $key 586=item $value = cf::db_get $family => $key
536 587
537Returns a single value from the environment database. 588Returns a single value from the environment database.
676 727
677############################################################################# 728#############################################################################
678 729
679=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
680 731
681Many objects in crossfire are so-called attachable objects. That means you can 732Many objects in deliantra are so-called attachable objects. That means you can
682attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
683to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
684 735
685In the following description, CLASS can be any of C<global>, C<object> 736In the following description, CLASS can be any of C<global>, C<object>
686C<player>, C<client> or C<map> (i.e. the attachable objects in 737C<player>, C<client> or C<map> (i.e. the attachable objects in
736=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
737 788
738Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
739given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
740 791
741Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
742that are attached at load/instantiate time, thus the need for a name. 793that are attached at load/instantiate time, thus the need for a name.
743 794
744These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
745 796
746=over 4 797=over 4
1037 1088
1038sub reattach { 1089sub reattach {
1039 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1040 my ($obj) = @_; 1091 my ($obj) = @_;
1041 1092
1093 # no longer needed after getting rid of delete_package?
1042 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1094 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1043 1095
1044 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1045 1097
1046 @$registry = (); 1098 @$registry = ();
1047 1099
1093 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1094 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1095 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1096 1148
1097 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1098 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1099 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1100 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1101 close $fh; 1153 aio_close $fh;
1102 1154
1103 if (@$objs) { 1155 if (@$objs) {
1104 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1156 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1105 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1106 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1107 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1108 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1109 close $fh; 1161 aio_close $fh;
1110 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1111 } 1163 }
1112 } else { 1164 } else {
1113 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1114 } 1166 }
1115 1167
1116 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1117 } else { 1172 } else {
1118 warn "FATAL: $filename~: $!\n"; 1173 warn "FATAL: $filename~: $!\n";
1119 } 1174 }
1120 } else { 1175 } else {
1121 aio_unlink $filename; 1176 aio_unlink $filename;
1214 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1215 1270
1216 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1217} 1272}
1218 1273
1274use File::Glob ();
1275
1219cf::player->attach ( 1276cf::player->attach (
1220 on_command => sub { 1277 on_command => sub {
1221 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1222 1279
1223 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1255 1312
1256 cf::override; 1313 cf::override;
1257 }, 1314 },
1258); 1315);
1259 1316
1317# "readahead" all extensions
1318sub cache_extensions {
1319 my $grp = IO::AIO::aio_group;
1320
1321 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1322 for (grep /\.ext$/, @{$_[0]}) {
1323 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1324 }
1325 };
1326
1327 $grp
1328}
1329
1260sub load_extensions { 1330sub load_extensions {
1261 cf::sync_job { 1331 cf::sync_job {
1262 my %todo; 1332 my %todo;
1263 1333
1264 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1283 1353
1284 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1285 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1286 1356
1287 $ext{source} = 1357 $ext{source} =
1288 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1289 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1290 . $source 1360 . $source
1291 . "\n};\n1"; 1361 . "\n};\n1";
1292 1362
1293 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1309 my $msg = $@ ? "$v->{path}: $@\n" 1379 my $msg = $@ ? "$v->{path}: $@\n"
1310 : "$v->{base}: extension inactive.\n"; 1380 : "$v->{base}: extension inactive.\n";
1311 1381
1312 if (exists $v->{meta}{mandatory}) { 1382 if (exists $v->{meta}{mandatory}) {
1313 warn $msg; 1383 warn $msg;
1314 warn "mandatory extension failed to load, exiting.\n"; 1384 cf::cleanup "mandatory extension failed to load, exiting.";
1315 exit 1;
1316 } 1385 }
1317 1386
1318 warn $msg; 1387 warn $msg;
1319 } 1388 }
1320 1389
1334 1403
1335=back 1404=back
1336 1405
1337=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1338 1407
1339Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1340 1409
1341=cut 1410=cut
1342 1411
1343package cf::player; 1412package cf::player;
1344 1413
1387 1456
1388sub exists($) { 1457sub exists($) {
1389 my ($login) = @_; 1458 my ($login) = @_;
1390 1459
1391 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1392 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1393} 1462}
1394 1463
1395sub find($) { 1464sub find($) {
1396 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1397 my $login = $_[0]; 1466 my $login = $_[0];
1409 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1410 or return; 1479 or return;
1411 1480
1412 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1413 or return; 1482 or return;
1483
1414 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1415 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1416 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1417 } 1487 }
1418 } 1488 }
1428 1498
1429 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1430 1500
1431 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1432 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1433 1505
1434 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1435 cf::cede_to_tick; 1507 cf::cede_to_tick;
1436} 1508}
1437 1509
1469 my ($pl) = @_; 1541 my ($pl) = @_;
1470 1542
1471 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1472 1544
1473 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1474 $pl->password ("*"); # this should lock out the player until we nuked the dir 1546 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1475 1547
1476 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1477 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1478 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1479 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1480 1554
1481 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1482 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1521 1595
1522 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1523 my $path = path $login; 1597 my $path = path $login;
1524 1598
1525 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1526 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1527 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1528 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1529 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1530 } 1605 }
1531 1606
1562 } 1637 }
1563 1638
1564 \@paths 1639 \@paths
1565} 1640}
1566 1641
1567=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1568 1643
1569Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1570
1571=cut
1572
1573use re 'eval';
1574
1575my $group;
1576my $interior; $interior = qr{
1577 # match a pod interior sequence sans C<< >>
1578 (?:
1579 \ (.*?)\ (?{ $group = $^N })
1580 | < (??{$interior}) >
1581 )
1582}x;
1583
1584sub expand_cfpod {
1585 my ($self, $pod) = @_;
1586
1587 my $xml;
1588
1589 while () {
1590 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1591 $group = $1;
1592
1593 $group =~ s/&/&amp;/g;
1594 $group =~ s/</&lt;/g;
1595
1596 $xml .= $group;
1597 } elsif ($pod =~ m%\G
1598 ([BCGHITU])
1599 <
1600 (?:
1601 ([^<>]*) (?{ $group = $^N })
1602 | < $interior >
1603 )
1604 >
1605 %gcsx
1606 ) {
1607 my ($code, $data) = ($1, $group);
1608
1609 if ($code eq "B") {
1610 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1611 } elsif ($code eq "I") {
1612 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1613 } elsif ($code eq "U") {
1614 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1615 } elsif ($code eq "C") {
1616 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1617 } elsif ($code eq "T") {
1618 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1619 } elsif ($code eq "G") {
1620 my ($male, $female) = split /\|/, $data;
1621 $data = $self->gender ? $female : $male;
1622 $xml .= expand_cfpod ($self, $data);
1623 } elsif ($code eq "H") {
1624 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1625 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1626 "")
1627 [$self->{hintmode}];
1628 } else {
1629 $xml .= "error processing '$code($data)' directive";
1630 }
1631 } else {
1632 if ($pod =~ /\G(.+)/) {
1633 warn "parse error while expanding $pod (at $1)";
1634 }
1635 last;
1636 }
1637 }
1638
1639 for ($xml) {
1640 # create single paragraphs (very hackish)
1641 s/(?<=\S)\n(?=\w)/ /g;
1642
1643 # compress some whitespace
1644 s/\s+\n/\n/g; # ws line-ends
1645 s/\n\n+/\n/g; # double lines
1646 s/^\n+//; # beginning lines
1647 s/\n+$//; # ending lines
1648 }
1649
1650 $xml
1651}
1652
1653no re 'eval';
1654
1655sub hintmode {
1656 $_[0]{hintmode} = $_[1] if @_ > 1;
1657 $_[0]{hintmode}
1658}
1659 1645
1660=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1661 1647
1662Sends an ext reply to the player. 1648Sends an ext reply to the player.
1663 1649
1730our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1731our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1732 1718
1733sub generate_random_map { 1719sub generate_random_map {
1734 my ($self, $rmp) = @_; 1720 my ($self, $rmp) = @_;
1721
1722 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1723
1735 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1736 $self->_create_random_map ( 1725 $self->_create_random_map (
1737 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1738 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1739 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1861 1850
1862# the temporary/swap location 1851# the temporary/swap location
1863sub save_path { 1852sub save_path {
1864 my ($self) = @_; 1853 my ($self) = @_;
1865 1854
1866 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1867 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1868} 1857}
1869 1858
1870# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1871sub uniq_path { 1860sub uniq_path {
1872 my ($self) = @_; 1861 my ($self) = @_;
1873 1862
1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1875 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1876} 1865}
1877 1866
1878# and all this just because we cannot iterate over 1867# and all this just because we cannot iterate over
1879# all maps in C++... 1868# all maps in C++...
1973sub find { 1962sub find {
1974 my ($path, $origin) = @_; 1963 my ($path, $origin) = @_;
1975 1964
1976 $path = normalise $path, $origin && $origin->path; 1965 $path = normalise $path, $origin && $origin->path;
1977 1966
1978 cf::lock_wait "map_data:$path";#d#remove 1967 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1979 cf::lock_wait "map_find:$path"; 1968 my $guard2 = cf::lock_acquire "map_find:$path";
1980 1969
1981 $cf::MAP{$path} || do { 1970 $cf::MAP{$path} || do {
1982 my $guard1 = cf::lock_acquire "map_find:$path";
1983 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1984
1985 my $map = new_from_path cf::map $path 1971 my $map = new_from_path cf::map $path
1986 or return; 1972 or return;
1987 1973
1988 $map->{last_save} = $cf::RUNTIME; 1974 $map->{last_save} = $cf::RUNTIME;
1989 1975
1991 or return; 1977 or return;
1992 1978
1993 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1979 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1994 # doing this can freeze the server in a sync job, obviously 1980 # doing this can freeze the server in a sync job, obviously
1995 #$cf::WAIT_FOR_TICK->wait; 1981 #$cf::WAIT_FOR_TICK->wait;
1982 undef $guard2;
1996 undef $guard1; 1983 undef $guard1;
1997 undef $guard2;
1998 $map->reset; 1984 $map->reset;
1999 return find $path; 1985 return find $path;
2000 } 1986 }
2001 1987
2002 $cf::MAP{$path} = $map 1988 $cf::MAP{$path} = $map
2029 my $f = new_from_file cf::object::thawer $self->{load_path}; 2015 my $f = new_from_file cf::object::thawer $self->{load_path};
2030 $f->skip_block; 2016 $f->skip_block;
2031 $self->_load_objects ($f) 2017 $self->_load_objects ($f)
2032 or return; 2018 or return;
2033 2019
2034 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2020 $self->post_load_original
2035 if delete $self->{load_original}; 2021 if delete $self->{load_original};
2036 2022
2037 if (my $uniq = $self->uniq_path) { 2023 if (my $uniq = $self->uniq_path) {
2038 utf8::encode $uniq; 2024 utf8::encode $uniq;
2039 unless (aio_stat $uniq) { 2025 unless (aio_stat $uniq) {
2065 } 2051 }
2066 2052
2067 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
2068 $self->last_access ($cf::RUNTIME); 2054 $self->last_access ($cf::RUNTIME);
2069 2055
2070 $self->in_memory (cf::MAP_IN_MEMORY); 2056 $self->in_memory (cf::MAP_ACTIVE);
2071 } 2057 }
2072 2058
2073 $self->post_load; 2059 $self->post_load;
2074} 2060}
2075 2061
2133 my ($path, $origin, $load) = @_; 2119 my ($path, $origin, $load) = @_;
2134 2120
2135 $path = normalise $path, $origin && $origin->{path}; 2121 $path = normalise $path, $origin && $origin->{path};
2136 2122
2137 if (my $map = $cf::MAP{$path}) { 2123 if (my $map = $cf::MAP{$path}) {
2138 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2124 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2139 } 2125 }
2140 2126
2141 $MAP_PREFETCH{$path} |= $load; 2127 $MAP_PREFETCH{$path} |= $load;
2142 2128
2143 $MAP_PREFETCHER ||= cf::async { 2129 $MAP_PREFETCHER ||= cf::async {
2180 cf::async { 2166 cf::async {
2181 $Coro::current->{desc} = "map player save"; 2167 $Coro::current->{desc} = "map player save";
2182 $_->contr->save for $self->players; 2168 $_->contr->save for $self->players;
2183 }; 2169 };
2184 2170
2171 cf::get_slot 0.02;
2172
2185 if ($uniq) { 2173 if ($uniq) {
2186 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2174 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2187 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2175 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2188 } else { 2176 } else {
2189 $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);
2197 $self->save; 2185 $self->save;
2198 2186
2199 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2187 my $lock = cf::lock_acquire "map_data:$self->{path}";
2200 2188
2201 return if $self->players; 2189 return if $self->players;
2202 return if $self->in_memory != cf::MAP_IN_MEMORY; 2190 return if $self->in_memory != cf::MAP_ACTIVE;
2203 return if $self->{deny_save}; 2191 return if $self->{deny_save};
2204 2192
2205 $self->in_memory (cf::MAP_SWAPPED); 2193 $self->in_memory (cf::MAP_SWAPPED);
2206 2194
2207 $self->deactivate; 2195 $self->deactivate;
2325 2313
2326sub unique_maps() { 2314sub unique_maps() {
2327 [ 2315 [
2328 map { 2316 map {
2329 utf8::decode $_; 2317 utf8::decode $_;
2330 /\.map$/ 2318 s/\.map$//; # TODO future compatibility hack
2319 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2320 ? ()
2331 ? normalise $_ 2321 : normalise $_
2332 : ()
2333 } @{ aio_readdir $UNIQUEDIR or [] } 2322 } @{ aio_readdir $UNIQUEDIR or [] }
2334 ] 2323 ]
2335} 2324}
2336 2325
2337package cf;
2338
2339=back 2326=back
2340 2327
2341=head3 cf::object 2328=head3 cf::object
2342 2329
2343=cut 2330=cut
2346 2333
2347=over 4 2334=over 4
2348 2335
2349=item $ob->inv_recursive 2336=item $ob->inv_recursive
2350 2337
2351Returns 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.
2352 2340
2353=cut 2341=cut
2354 2342
2355sub inv_recursive_; 2343sub inv_recursive_;
2356sub inv_recursive_ { 2344sub inv_recursive_ {
2361 inv_recursive_ inv $_[0] 2349 inv_recursive_ inv $_[0]
2362} 2350}
2363 2351
2364=item $ref = $ob->ref 2352=item $ref = $ob->ref
2365 2353
2366creates 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.
2367 2355
2368=item $ob = cf::object::deref ($refstring) 2356=item $ob = cf::object::deref ($refstring)
2369 2357
2370returns 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,
2371even if the object actually exists. May block. 2359even if the object actually exists. May block.
2403can 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
2404dialogue with the given NPC character. 2392dialogue with the given NPC character.
2405 2393
2406=cut 2394=cut
2407 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
2408# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2409# with dialog boxes. 2411# with dialog boxes.
2410#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
2411sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
2412 my ($self, $npc, $msg, $flags) = @_; 2414 my ($self, $npc, $msg, $flags) = @_;
2423 my $dialog = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2424 $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));
2425 2427
2426 } else { 2428 } else {
2427 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2428 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2429 } 2431 }
2430 } 2432 }
2431} 2433}
2432 2434
2433=item $object->send_msg ($channel, $msg, $color, [extra...]) 2435=item $object->send_msg ($channel, $msg, $color, [extra...])
2458 2460
2459=item $player_object->enter_link 2461=item $player_object->enter_link
2460 2462
2461Freezes 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}>).
2462 2464
2463The 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.
2464I<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.
2465 2469
2466Will never block. 2470Will never block.
2467 2471
2468=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2469 2473
2527 2531
2528 $map->load; 2532 $map->load;
2529 $map->load_neighbours; 2533 $map->load_neighbours;
2530 2534
2531 return unless $self->contr->active; 2535 return unless $self->contr->active;
2536 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2532 $self->activate_recursive; 2537 $self->activate_recursive;
2533 2538
2534 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2539 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2535 $self->enter_map ($map, $x, $y); 2540 $self->enter_map ($map, $x, $y);
2536} 2541}
2540Moves the player to the given map-path and coordinates by first freezing 2545Moves the player to the given map-path and coordinates by first freezing
2541her, loading and preparing them map, calling the provided $check callback 2546her, loading and preparing them map, calling the provided $check callback
2542that has to return the map if sucecssful, and then unfreezes the player on 2547that has to return the map if sucecssful, and then unfreezes the player on
2543the new (success) or old (failed) map position. In either case, $done will 2548the new (success) or old (failed) map position. In either case, $done will
2544be called at the end of this process. 2549be called at the end of this process.
2550
2551Note that $check will be called with a potentially non-loaded map, so if
2552it needs a loaded map it has to call C<< ->load >>.
2545 2553
2546=cut 2554=cut
2547 2555
2548our $GOTOGEN; 2556our $GOTOGEN;
2549 2557
2628} 2636}
2629 2637
2630sub prepare_random_map { 2638sub prepare_random_map {
2631 my ($exit) = @_; 2639 my ($exit) = @_;
2632 2640
2633 my $guard = cf::lock_acquire "exit_prepare:$exit";
2634
2635 # all this does is basically replace the /! path by 2641 # all this does is basically replace the /! path by
2636 # a new random map path (?random/...) with a seed 2642 # a new random map path (?random/...) with a seed
2637 # that depends on the exit object 2643 # that depends on the exit object
2638 2644
2639 my $rmp = parse_random_map_params $exit->msg; 2645 my $rmp = parse_random_map_params $exit->msg;
2641 if ($exit->map) { 2647 if ($exit->map) {
2642 $rmp->{region} = $exit->region->name; 2648 $rmp->{region} = $exit->region->name;
2643 $rmp->{origin_map} = $exit->map->path; 2649 $rmp->{origin_map} = $exit->map->path;
2644 $rmp->{origin_x} = $exit->x; 2650 $rmp->{origin_x} = $exit->x;
2645 $rmp->{origin_y} = $exit->y; 2651 $rmp->{origin_y} = $exit->y;
2652
2653 $exit->map->touch;
2646 } 2654 }
2647 2655
2648 $rmp->{random_seed} ||= $exit->random_seed; 2656 $rmp->{random_seed} ||= $exit->random_seed;
2649 2657
2650 my $data = cf::encode_json $rmp; 2658 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2651 my $md5 = Digest::MD5::md5_hex $data; 2659 my $md5 = Digest::MD5::md5_hex $data;
2652 my $meta = "$RANDOMDIR/$md5.meta"; 2660 my $meta = "$RANDOMDIR/$md5.meta";
2653 2661
2654 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2662 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2655 aio_write $fh, 0, (length $data), $data, 0; 2663 aio_write $fh, 0, (length $data), $data, 0;
2656 undef $fh; 2664 undef $fh;
2657 aio_rename "$meta~", $meta; 2665 aio_rename "$meta~", $meta;
2658 2666
2667 my $slaying = "?random/$md5";
2668
2669 if ($exit->valid) {
2659 $exit->slaying ("?random/$md5"); 2670 $exit->slaying ("?random/$md5");
2660 $exit->msg (undef); 2671 $exit->msg (undef);
2672 }
2661 } 2673 }
2662} 2674}
2663 2675
2664sub cf::object::player::enter_exit { 2676sub cf::object::player::enter_exit {
2665 my ($self, $exit) = @_; 2677 my ($self, $exit) = @_;
2666 2678
2667 return unless $self->type == cf::PLAYER; 2679 return unless $self->type == cf::PLAYER;
2668 2680
2669 if ($exit->slaying eq "/!") {
2670 #TODO: this should de-fi-ni-te-ly not be a sync-job
2671 # the problem is that $exit might not survive long enough
2672 # so it needs to be done right now, right here
2673 cf::sync_job { prepare_random_map $exit };
2674 }
2675
2676 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2677 my $hp = $exit->stats->hp;
2678 my $sp = $exit->stats->sp;
2679
2680 $self->enter_link; 2681 $self->enter_link;
2681 2682
2682 # if exit is damned, update players death & WoR home-position
2683 $self->contr->savebed ($slaying, $hp, $sp)
2684 if $exit->flag (FLAG_DAMNED);
2685
2686 (async { 2683 (async {
2687 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2684 $Coro::current->{desc} = "enter_exit";
2688 2685
2689 $self->deactivate_recursive; # just to be sure
2690 unless (eval { 2686 unless (eval {
2687 $self->deactivate_recursive; # just to be sure
2688
2689 # random map handling
2690 {
2691 my $guard = cf::lock_acquire "exit_prepare:$exit";
2692
2693 prepare_random_map $exit
2694 if $exit->slaying eq "/!";
2695 }
2696
2697 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2698 my $x = $exit->stats->hp;
2699 my $y = $exit->stats->sp;
2700
2691 $self->goto ($slaying, $hp, $sp); 2701 $self->goto ($map, $x, $y);
2692 2702
2703 # if exit is damned, update players death & WoR home-position
2704 $self->contr->savebed ($map, $x, $y)
2705 if $exit->flag (cf::FLAG_DAMNED);
2706
2693 1; 2707 1
2694 }) { 2708 }) {
2695 $self->message ("Something went wrong deep within the crossfire server. " 2709 $self->message ("Something went wrong deep within the deliantra server. "
2696 . "I'll try to bring you back to the map you were before. " 2710 . "I'll try to bring you back to the map you were before. "
2697 . "Please report this to the dungeon master!", 2711 . "Please report this to the dungeon master!",
2698 cf::NDI_UNIQUE | cf::NDI_RED); 2712 cf::NDI_UNIQUE | cf::NDI_RED);
2699 2713
2700 warn "ERROR in enter_exit: $@"; 2714 warn "ERROR in enter_exit: $@";
2766 id => "infobox", 2780 id => "infobox",
2767 title => "Body Parts", 2781 title => "Body Parts",
2768 reply => undef, 2782 reply => undef,
2769 tooltip => "Shows which body parts you posess and are available", 2783 tooltip => "Shows which body parts you posess and are available",
2770 }, 2784 },
2785 "c/skills" => {
2786 id => "infobox",
2787 title => "Skills",
2788 reply => undef,
2789 tooltip => "Shows your experience per skill and item power",
2790 },
2771 "c/uptime" => { 2791 "c/uptime" => {
2772 id => "infobox", 2792 id => "infobox",
2773 title => "Uptime", 2793 title => "Uptime",
2774 reply => undef, 2794 reply => undef,
2775 tooltip => "How long the server has been running since last restart", 2795 tooltip => "How long the server has been running since last restart",
2778 id => "infobox", 2798 id => "infobox",
2779 title => "Map Info", 2799 title => "Map Info",
2780 reply => undef, 2800 reply => undef,
2781 tooltip => "Information related to the maps", 2801 tooltip => "Information related to the maps",
2782 }, 2802 },
2803 "c/party" => {
2804 id => "party",
2805 title => "Party",
2806 reply => "gsay ",
2807 tooltip => "Messages and chat related to your party",
2808 },
2783); 2809);
2784 2810
2785sub cf::client::send_msg { 2811sub cf::client::send_msg {
2786 my ($self, $channel, $msg, $color, @extra) = @_; 2812 my ($self, $channel, $msg, $color, @extra) = @_;
2787 2813
2788 $msg = $self->pl->expand_cfpod ($msg); 2814 $msg = $self->pl->expand_cfpod ($msg)
2815 unless $color & cf::NDI_VERBATIM;
2789 2816
2790 $color &= cf::NDI_CLIENT_MASK; # just in case... 2817 $color &= cf::NDI_CLIENT_MASK; # just in case...
2791 2818
2792 # check predefined channels, for the benefit of C 2819 # check predefined channels, for the benefit of C
2793 if ($CHANNEL{$channel}) { 2820 if ($CHANNEL{$channel}) {
2814 if ($self->can_msg) { 2841 if ($self->can_msg) {
2815 # default colour, mask it out 2842 # default colour, mask it out
2816 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2843 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2817 if $color & cf::NDI_DEF; 2844 if $color & cf::NDI_DEF;
2818 2845
2819 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2846 my $pkt = "msg "
2847 . $self->{json_coder}->encode (
2820 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2848 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2849 );
2850
2851 # try lzf for large packets
2852 $pkt = "lzf " . Compress::LZF::compress $pkt
2853 if 1024 <= length $pkt and $self->{can_lzf};
2854
2855 # split very large packets
2856 if (8192 < length $pkt and $self->{can_lzf}) {
2857 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2858 $pkt = "frag";
2859 }
2860
2861 $self->send_packet ($pkt);
2821 } else { 2862 } else {
2822 if ($color >= 0) { 2863 if ($color >= 0) {
2823 # replace some tags by gcfclient-compatible ones 2864 # replace some tags by gcfclient-compatible ones
2824 for ($msg) { 2865 for ($msg) {
2825 1 while 2866 1 while
3024 3065
3025The following functions and methods are available within a safe environment: 3066The following functions and methods are available within a safe environment:
3026 3067
3027 cf::object 3068 cf::object
3028 contr pay_amount pay_player map x y force_find force_add destroy 3069 contr pay_amount pay_player map x y force_find force_add destroy
3029 insert remove name archname title slaying race decrease_ob_nr 3070 insert remove name archname title slaying race decrease split
3030 3071
3031 cf::object::player 3072 cf::object::player
3032 player 3073 player
3033 3074
3034 cf::player 3075 cf::player
3039 3080
3040=cut 3081=cut
3041 3082
3042for ( 3083for (
3043 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3084 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3044 insert remove inv name archname title slaying race 3085 insert remove inv nrof name archname title slaying race
3045 decrease_ob_nr destroy)], 3086 decrease split destroy change_exp)],
3046 ["cf::object::player" => qw(player)], 3087 ["cf::object::player" => qw(player)],
3047 ["cf::player" => qw(peaceful)], 3088 ["cf::player" => qw(peaceful)],
3048 ["cf::map" => qw(trigger)], 3089 ["cf::map" => qw(trigger)],
3049) { 3090) {
3050 no strict 'refs'; 3091 no strict 'refs';
3258 while (my ($k, $v) = each %$want) { 3299 while (my ($k, $v) = each %$want) {
3259 $ns->fx_want ($k, $v); 3300 $ns->fx_want ($k, $v);
3260 } 3301 }
3261}; 3302};
3262 3303
3304sub load_resource_file($) {
3305 my $guard = lock_acquire "load_resource_file";
3306
3307 my $status = load_resource_file_ $_[0];
3308 get_slot 0.1, 100;
3309 cf::arch::commit_load;
3310
3311 $status
3312}
3313
3263sub reload_regions { 3314sub reload_regions {
3264 # HACK to clear player env face cache, we need some signal framework 3315 # HACK to clear player env face cache, we need some signal framework
3265 # for this (global event?) 3316 # for this (global event?)
3266 %ext::player_env::MUSIC_FACE_CACHE = (); 3317 %ext::player_env::MUSIC_FACE_CACHE = ();
3267 3318
3280} 3331}
3281 3332
3282sub reload_archetypes { 3333sub reload_archetypes {
3283 load_resource_file "$DATADIR/archetypes" 3334 load_resource_file "$DATADIR/archetypes"
3284 or die "unable to load archetypes\n"; 3335 or die "unable to load archetypes\n";
3285 #d# NEED to laod twice to resolve forward references
3286 # this really needs to be done in an extra post-pass
3287 # (which needs to be synchronous, so solve it differently)
3288 load_resource_file "$DATADIR/archetypes"
3289 or die "unable to load archetypes\n";
3290} 3336}
3291 3337
3292sub reload_treasures { 3338sub reload_treasures {
3293 load_resource_file "$DATADIR/treasures" 3339 load_resource_file "$DATADIR/treasures"
3294 or die "unable to load treasurelists\n"; 3340 or die "unable to load treasurelists\n";
3295} 3341}
3296 3342
3297sub reload_resources { 3343sub reload_resources {
3298 warn "reloading resource files...\n"; 3344 warn "reloading resource files...\n";
3299 3345
3346 reload_facedata;
3347 reload_archetypes;
3300 reload_regions; 3348 reload_regions;
3301 reload_facedata;
3302 #reload_archetypes;#d#
3303 reload_archetypes;
3304 reload_treasures; 3349 reload_treasures;
3305 3350
3306 warn "finished reloading resource files\n"; 3351 warn "finished reloading resource files\n";
3307}
3308
3309sub init {
3310 reload_resources;
3311} 3352}
3312 3353
3313sub reload_config { 3354sub reload_config {
3314 open my $fh, "<:utf8", "$CONFDIR/config" 3355 open my $fh, "<:utf8", "$CONFDIR/config"
3315 or return; 3356 or return;
3316 3357
3317 local $/; 3358 local $/;
3318 *CFG = YAML::Syck::Load <$fh>; 3359 *CFG = YAML::Load <$fh>;
3319 3360
3320 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3361 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3321 3362
3322 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3363 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3323 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3364 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
3329 }; 3370 };
3330 warn $@ if $@; 3371 warn $@ if $@;
3331 } 3372 }
3332} 3373}
3333 3374
3375sub pidfile() {
3376 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3377 or die "$PIDFILE: $!";
3378 flock $fh, &Fcntl::LOCK_EX
3379 or die "$PIDFILE: flock: $!";
3380 $fh
3381}
3382
3383# make sure only one server instance is running at any one time
3384sub atomic {
3385 my $fh = pidfile;
3386
3387 my $pid = <$fh>;
3388 kill 9, $pid if $pid > 0;
3389
3390 seek $fh, 0, 0;
3391 print $fh $$;
3392}
3393
3334sub main { 3394sub main {
3395 cf::init_globals; # initialise logging
3396
3397 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3398 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3399 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3400 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3401
3402 cf::init_experience;
3403 cf::init_anim;
3404 cf::init_attackmess;
3405 cf::init_dynamic;
3406 cf::init_block;
3407
3408 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3409
3335 # we must not ever block the main coroutine 3410 # we must not ever block the main coroutine
3336 local $Coro::idle = sub { 3411 local $Coro::idle = sub {
3337 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3412 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3338 (async { 3413 (async {
3339 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3414 $Coro::current->{desc} = "IDLE BUG HANDLER";
3340 EV::loop EV::LOOP_ONESHOT; 3415 EV::loop EV::LOOP_ONESHOT;
3341 })->prio (Coro::PRIO_MAX); 3416 })->prio (Coro::PRIO_MAX);
3342 }; 3417 };
3343 3418
3419 evthread_start IO::AIO::poll_fileno;
3420
3421 cf::sync_job {
3422 reload_resources;
3344 reload_config; 3423 reload_config;
3345 db_init; 3424 db_init;
3425
3426 cf::load_settings;
3427 cf::load_materials;
3428 cf::init_uuid;
3429 cf::init_signals;
3430 cf::init_commands;
3431 cf::init_skills;
3432
3433 cf::init_beforeplay;
3434
3435 atomic;
3436
3346 load_extensions; 3437 load_extensions;
3347 3438
3348 $TICK_WATCHER->start; 3439 utime time, time, $RUNTIMEFILE;
3349 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3440
3441 # no (long-running) fork's whatsoever before this point(!)
3442 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3443
3444 (pop @POST_INIT)->(0) while @POST_INIT;
3445 };
3446
3350 EV::loop; 3447 EV::loop;
3351} 3448}
3352 3449
3353############################################################################# 3450#############################################################################
3354# initialisation and cleanup 3451# initialisation and cleanup
3361 cf::cleanup "SIG$signal"; 3458 cf::cleanup "SIG$signal";
3362 }; 3459 };
3363 } 3460 }
3364} 3461}
3365 3462
3366sub write_runtime { 3463sub write_runtime_sync {
3367 my $runtime = "$LOCALDIR/runtime";
3368
3369 # first touch the runtime file to show we are still running: 3464 # first touch the runtime file to show we are still running:
3370 # the fsync below can take a very very long time. 3465 # the fsync below can take a very very long time.
3371 3466
3372 IO::AIO::aio_utime $runtime, undef, undef; 3467 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3373 3468
3374 my $guard = cf::lock_acquire "write_runtime"; 3469 my $guard = cf::lock_acquire "write_runtime";
3375 3470
3376 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3471 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3377 or return; 3472 or return;
3378 3473
3379 my $value = $cf::RUNTIME + 90 + 10; 3474 my $value = $cf::RUNTIME + 90 + 10;
3380 # 10 is the runtime save interval, for a monotonic clock 3475 # 10 is the runtime save interval, for a monotonic clock
3381 # 60 allows for the watchdog to kill the server. 3476 # 60 allows for the watchdog to kill the server.
3391 aio_utime $fh, undef, undef; 3486 aio_utime $fh, undef, undef;
3392 3487
3393 close $fh 3488 close $fh
3394 or return; 3489 or return;
3395 3490
3396 aio_rename "$runtime~", $runtime 3491 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3397 and return; 3492 and return;
3398 3493
3399 warn "runtime file written.\n"; 3494 warn "runtime file written.\n";
3400 3495
3401 1 3496 1
3497}
3498
3499our $uuid_lock;
3500our $uuid_skip;
3501
3502sub write_uuid_sync($) {
3503 $uuid_skip ||= $_[0];
3504
3505 return if $uuid_lock;
3506 local $uuid_lock = 1;
3507
3508 my $uuid = "$LOCALDIR/uuid";
3509
3510 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3511 or return;
3512
3513 my $value = uuid_seq uuid_cur;
3514
3515 unless ($value) {
3516 warn "cowardly refusing to write zero uuid value!\n";
3517 return;
3518 }
3519
3520 my $value = uuid_str $value + $uuid_skip;
3521 $uuid_skip = 0;
3522
3523 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3524 and return;
3525
3526 # always fsync - this file is important
3527 aio_fsync $fh
3528 and return;
3529
3530 close $fh
3531 or return;
3532
3533 aio_rename "$uuid~", $uuid
3534 and return;
3535
3536 warn "uuid file written ($value).\n";
3537
3538 1
3539
3540}
3541
3542sub write_uuid($$) {
3543 my ($skip, $sync) = @_;
3544
3545 $sync ? write_uuid_sync $skip
3546 : async { write_uuid_sync $skip };
3402} 3547}
3403 3548
3404sub emergency_save() { 3549sub emergency_save() {
3405 my $freeze_guard = cf::freeze_mainloop; 3550 my $freeze_guard = cf::freeze_mainloop;
3406 3551
3407 warn "enter emergency perl save\n"; 3552 warn "emergency_perl_save: enter\n";
3408 3553
3409 cf::sync_job { 3554 cf::sync_job {
3555 # this is a trade-off: we want to be very quick here, so
3556 # save all maps without fsync, and later call a global sync
3557 # (which in turn might be very very slow)
3558 local $USE_FSYNC = 0;
3559
3410 # use a peculiar iteration method to avoid tripping on perl 3560 # use a peculiar iteration method to avoid tripping on perl
3411 # refcount bugs in for. also avoids problems with players 3561 # refcount bugs in for. also avoids problems with players
3412 # and maps saved/destroyed asynchronously. 3562 # and maps saved/destroyed asynchronously.
3413 warn "begin emergency player save\n"; 3563 warn "emergency_perl_save: begin player save\n";
3414 for my $login (keys %cf::PLAYER) { 3564 for my $login (keys %cf::PLAYER) {
3415 my $pl = $cf::PLAYER{$login} or next; 3565 my $pl = $cf::PLAYER{$login} or next;
3416 $pl->valid or next; 3566 $pl->valid or next;
3417 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3567 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3418 $pl->save; 3568 $pl->save;
3419 } 3569 }
3420 warn "end emergency player save\n"; 3570 warn "emergency_perl_save: end player save\n";
3421 3571
3422 warn "begin emergency map save\n"; 3572 warn "emergency_perl_save: begin map save\n";
3423 for my $path (keys %cf::MAP) { 3573 for my $path (keys %cf::MAP) {
3424 my $map = $cf::MAP{$path} or next; 3574 my $map = $cf::MAP{$path} or next;
3425 $map->valid or next; 3575 $map->valid or next;
3426 $map->save; 3576 $map->save;
3427 } 3577 }
3428 warn "end emergency map save\n"; 3578 warn "emergency_perl_save: end map save\n";
3429 3579
3430 warn "begin emergency database checkpoint\n"; 3580 warn "emergency_perl_save: begin database checkpoint\n";
3431 BDB::db_env_txn_checkpoint $DB_ENV; 3581 BDB::db_env_txn_checkpoint $DB_ENV;
3432 warn "end emergency database checkpoint\n"; 3582 warn "emergency_perl_save: end database checkpoint\n";
3583
3584 warn "emergency_perl_save: begin write uuid\n";
3585 write_uuid_sync 1;
3586 warn "emergency_perl_save: end write uuid\n";
3433 }; 3587 };
3434 3588
3589 warn "emergency_perl_save: starting sync()\n";
3590 IO::AIO::aio_sync sub {
3591 warn "emergency_perl_save: finished sync()\n";
3592 };
3593
3435 warn "leave emergency perl save\n"; 3594 warn "emergency_perl_save: leave\n";
3436} 3595}
3437 3596
3438sub post_cleanup { 3597sub post_cleanup {
3439 my ($make_core) = @_; 3598 my ($make_core) = @_;
3440 3599
3441 warn Carp::longmess "post_cleanup backtrace" 3600 warn Carp::longmess "post_cleanup backtrace"
3442 if $make_core; 3601 if $make_core;
3602
3603 my $fh = pidfile;
3604 unlink $PIDFILE if <$fh> == $$;
3605}
3606
3607# a safer delete_package, copied from Symbol
3608sub clear_package($) {
3609 my $pkg = shift;
3610
3611 # expand to full symbol table name if needed
3612 unless ($pkg =~ /^main::.*::$/) {
3613 $pkg = "main$pkg" if $pkg =~ /^::/;
3614 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3615 $pkg .= '::' unless $pkg =~ /::$/;
3616 }
3617
3618 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3619 my $stem_symtab = *{$stem}{HASH};
3620
3621 defined $stem_symtab and exists $stem_symtab->{$leaf}
3622 or return;
3623
3624 # clear all symbols
3625 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3626 for my $name (keys %$leaf_symtab) {
3627 _gv_clear *{"$pkg$name"};
3628# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3629 }
3630 warn "cleared package $pkg\n";#d#
3443} 3631}
3444 3632
3445sub do_reload_perl() { 3633sub do_reload_perl() {
3446 # can/must only be called in main 3634 # can/must only be called in main
3447 if ($Coro::current != $Coro::main) { 3635 if ($Coro::current != $Coro::main) {
3448 warn "can only reload from main coroutine"; 3636 warn "can only reload from main coroutine";
3449 return; 3637 return;
3450 } 3638 }
3451 3639
3640 return if $RELOAD++;
3641
3642 my $t1 = EV::time;
3643
3644 while ($RELOAD) {
3452 warn "reloading..."; 3645 warn "reloading...";
3453 3646
3454 warn "entering sync_job"; 3647 warn "entering sync_job";
3455 3648
3456 cf::sync_job { 3649 cf::sync_job {
3457 cf::write_runtime; # external watchdog should not bark 3650 cf::write_runtime_sync; # external watchdog should not bark
3458 cf::emergency_save; 3651 cf::emergency_save;
3459 cf::write_runtime; # external watchdog should not bark 3652 cf::write_runtime_sync; # external watchdog should not bark
3460 3653
3461 warn "syncing database to disk"; 3654 warn "syncing database to disk";
3462 BDB::db_env_txn_checkpoint $DB_ENV; 3655 BDB::db_env_txn_checkpoint $DB_ENV;
3463 3656
3464 # if anything goes wrong in here, we should simply crash as we already saved 3657 # if anything goes wrong in here, we should simply crash as we already saved
3465 3658
3466 warn "flushing outstanding aio requests"; 3659 warn "flushing outstanding aio requests";
3467 for (;;) {
3468 BDB::flush;
3469 IO::AIO::flush;
3470 Coro::cede_notself;
3471 last unless IO::AIO::nreqs || BDB::nreqs; 3660 while (IO::AIO::nreqs || BDB::nreqs) {
3472 warn "iterate..."; 3661 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3473 }
3474
3475 ++$RELOAD;
3476
3477 warn "cancelling all extension coros";
3478 $_->cancel for values %EXT_CORO;
3479 %EXT_CORO = ();
3480
3481 warn "removing commands";
3482 %COMMAND = ();
3483
3484 warn "removing ext/exti commands";
3485 %EXTCMD = ();
3486 %EXTICMD = ();
3487
3488 warn "unloading/nuking all extensions";
3489 for my $pkg (@EXTS) {
3490 warn "... unloading $pkg";
3491
3492 if (my $cb = $pkg->can ("unload")) {
3493 eval {
3494 $cb->($pkg);
3495 1
3496 } or warn "$pkg unloaded, but with errors: $@";
3497 } 3662 }
3498 3663
3499 warn "... nuking $pkg"; 3664 warn "cancelling all extension coros";
3500 Symbol::delete_package $pkg; 3665 $_->cancel for values %EXT_CORO;
3501 } 3666 %EXT_CORO = ();
3502 3667
3503 warn "unloading all perl modules loaded from $LIBDIR"; 3668 warn "removing commands";
3504 while (my ($k, $v) = each %INC) { 3669 %COMMAND = ();
3505 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3506 3670
3671 warn "removing ext/exti commands";
3672 %EXTCMD = ();
3673 %EXTICMD = ();
3674
3675 warn "unloading/nuking all extensions";
3676 for my $pkg (@EXTS) {
3507 warn "... unloading $k"; 3677 warn "... unloading $pkg";
3508 delete $INC{$k};
3509 3678
3510 $k =~ s/\.pm$//;
3511 $k =~ s/\//::/g;
3512
3513 if (my $cb = $k->can ("unload_module")) { 3679 if (my $cb = $pkg->can ("unload")) {
3680 eval {
3514 $cb->(); 3681 $cb->($pkg);
3682 1
3683 } or warn "$pkg unloaded, but with errors: $@";
3684 }
3685
3686 warn "... clearing $pkg";
3687 clear_package $pkg;
3515 } 3688 }
3516 3689
3517 Symbol::delete_package $k; 3690 warn "unloading all perl modules loaded from $LIBDIR";
3691 while (my ($k, $v) = each %INC) {
3692 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3693
3694 warn "... unloading $k";
3695 delete $INC{$k};
3696
3697 $k =~ s/\.pm$//;
3698 $k =~ s/\//::/g;
3699
3700 if (my $cb = $k->can ("unload_module")) {
3701 $cb->();
3702 }
3703
3704 clear_package $k;
3518 } 3705 }
3519 3706
3520 warn "getting rid of safe::, as good as possible"; 3707 warn "getting rid of safe::, as good as possible";
3521 Symbol::delete_package "safe::$_" 3708 clear_package "safe::$_"
3522 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3709 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3523 3710
3524 warn "unloading cf.pm \"a bit\""; 3711 warn "unloading cf.pm \"a bit\"";
3525 delete $INC{"cf.pm"}; 3712 delete $INC{"cf.pm"};
3526 delete $INC{"cf/pod.pm"}; 3713 delete $INC{"cf/pod.pm"};
3527 3714
3528 # don't, removes xs symbols, too, 3715 # don't, removes xs symbols, too,
3529 # and global variables created in xs 3716 # and global variables created in xs
3530 #Symbol::delete_package __PACKAGE__; 3717 #clear_package __PACKAGE__;
3531 3718
3532 warn "unload completed, starting to reload now"; 3719 warn "unload completed, starting to reload now";
3533 3720
3534 warn "reloading cf.pm"; 3721 warn "reloading cf.pm";
3535 require cf; 3722 require cf;
3536 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3723 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3537 3724
3538 warn "loading config and database again"; 3725 warn "loading config and database again";
3539 cf::reload_config; 3726 cf::reload_config;
3540 3727
3541 warn "loading extensions"; 3728 warn "loading extensions";
3542 cf::load_extensions; 3729 cf::load_extensions;
3543 3730
3731 if ($REATTACH_ON_RELOAD) {
3544 warn "reattaching attachments to objects/players"; 3732 warn "reattaching attachments to objects/players";
3545 _global_reattach; # objects, sockets 3733 _global_reattach; # objects, sockets
3546 warn "reattaching attachments to maps"; 3734 warn "reattaching attachments to maps";
3547 reattach $_ for values %MAP; 3735 reattach $_ for values %MAP;
3548 warn "reattaching attachments to players"; 3736 warn "reattaching attachments to players";
3549 reattach $_ for values %PLAYER; 3737 reattach $_ for values %PLAYER;
3738 }
3550 3739
3740 warn "running post_init jobs";
3741 (pop @POST_INIT)->(1) while @POST_INIT;
3742
3551 warn "leaving sync_job"; 3743 warn "leaving sync_job";
3552 3744
3553 1 3745 1
3554 } or do { 3746 } or do {
3555 warn $@; 3747 warn $@;
3556 warn "error while reloading, exiting."; 3748 cf::cleanup "error while reloading, exiting.";
3557 exit 1;
3558 }; 3749 };
3559 3750
3560 warn "reloaded"; 3751 warn "reloaded";
3752 --$RELOAD;
3753 }
3754
3755 $t1 = EV::time - $t1;
3756 warn "reload completed in ${t1}s\n";
3561}; 3757};
3562 3758
3563our $RELOAD_WATCHER; # used only during reload 3759our $RELOAD_WATCHER; # used only during reload
3564 3760
3565sub reload_perl() { 3761sub reload_perl() {
3566 # doing reload synchronously and two reloads happen back-to-back, 3762 # doing reload synchronously and two reloads happen back-to-back,
3567 # coro crashes during coro_state_free->destroy here. 3763 # coro crashes during coro_state_free->destroy here.
3568 3764
3765 $RELOAD_WATCHER ||= cf::async {
3766 Coro::AIO::aio_wait cache_extensions;
3767
3569 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3768 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3769 do_reload_perl;
3570 undef $RELOAD_WATCHER; 3770 undef $RELOAD_WATCHER;
3571 do_reload_perl; 3771 };
3572 }; 3772 };
3573} 3773}
3574 3774
3575register_command "reload" => sub { 3775register_command "reload" => sub {
3576 my ($who, $arg) = @_; 3776 my ($who, $arg) = @_;
3590 3790
3591our @WAIT_FOR_TICK; 3791our @WAIT_FOR_TICK;
3592our @WAIT_FOR_TICK_BEGIN; 3792our @WAIT_FOR_TICK_BEGIN;
3593 3793
3594sub wait_for_tick { 3794sub wait_for_tick {
3595 return unless $TICK_WATCHER->is_active;
3596 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
3597 3796
3598 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
3599 push @WAIT_FOR_TICK, $signal; 3798 push @WAIT_FOR_TICK, $signal;
3600 $signal->wait; 3799 $signal->wait;
3601} 3800}
3602 3801
3603sub wait_for_tick_begin { 3802sub wait_for_tick_begin {
3604 return unless $TICK_WATCHER->is_active;
3605 return if $Coro::current == $Coro::main; 3803 return if tick_inhibit || $Coro::current == $Coro::main;
3606 3804
3607 my $signal = new Coro::Signal; 3805 my $signal = new Coro::Signal;
3608 push @WAIT_FOR_TICK_BEGIN, $signal; 3806 push @WAIT_FOR_TICK_BEGIN, $signal;
3609 $signal->wait; 3807 $signal->wait;
3610} 3808}
3611 3809
3612$TICK_WATCHER = EV::periodic_ns 0, $TICK, 0, sub { 3810sub tick {
3613 if ($Coro::current != $Coro::main) { 3811 if ($Coro::current != $Coro::main) {
3614 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3812 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3615 unless ++$bug_warning > 10; 3813 unless ++$bug_warning > 10;
3616 return; 3814 return;
3617 } 3815 }
3618 3816
3619 $NOW = $tick_start = EV::now;
3620
3621 cf::server_tick; # one server iteration 3817 cf::server_tick; # one server iteration
3622
3623 $RUNTIME += $TICK;
3624 $NEXT_TICK = $_[0]->at;
3625 3818
3626 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3819 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3627 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3820 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3628 Coro::async_pool { 3821 Coro::async_pool {
3629 $Coro::current->{desc} = "runtime saver"; 3822 $Coro::current->{desc} = "runtime saver";
3630 write_runtime 3823 write_runtime_sync
3631 or warn "ERROR: unable to write runtime file: $!"; 3824 or warn "ERROR: unable to write runtime file: $!";
3632 }; 3825 };
3633 } 3826 }
3634 3827
3635 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3828 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3637 } 3830 }
3638 while (my $sig = shift @WAIT_FOR_TICK) { 3831 while (my $sig = shift @WAIT_FOR_TICK) {
3639 $sig->send; 3832 $sig->send;
3640 } 3833 }
3641 3834
3642 $LOAD = ($NOW - $tick_start) / $TICK; 3835 $LOAD = ($NOW - $TICK_START) / $TICK;
3643 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 3836 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3644 3837
3645 _post_tick; 3838 if (0) {
3646}; 3839 if ($NEXT_TICK) {
3647$TICK_WATCHER->priority (EV::MAXPRI); 3840 my $jitter = $TICK_START - $NEXT_TICK;
3841 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
3842 warn "jitter $JITTER\n";#d#
3843 }
3844 }
3845}
3648 3846
3649{ 3847{
3650 # configure BDB 3848 # configure BDB
3651 3849
3652 BDB::min_parallel 8; 3850 BDB::min_parallel 8;
3653 BDB::max_poll_reqs $TICK * 0.1; 3851 BDB::max_poll_reqs $TICK * 0.1;
3654 $Coro::BDB::WATCHER->priority (1); 3852 $AnyEvent::BDB::WATCHER->priority (1);
3655 3853
3656 unless ($DB_ENV) { 3854 unless ($DB_ENV) {
3657 $DB_ENV = BDB::db_env_create; 3855 $DB_ENV = BDB::db_env_create;
3658 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3856 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3659 | BDB::LOG_AUTOREMOVE, 1); 3857 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3858 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3660 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3859 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3661 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3860 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3662 3861
3663 cf::sync_job { 3862 cf::sync_job {
3664 eval { 3863 eval {
3690{ 3889{
3691 # configure IO::AIO 3890 # configure IO::AIO
3692 3891
3693 IO::AIO::min_parallel 8; 3892 IO::AIO::min_parallel 8;
3694 IO::AIO::max_poll_time $TICK * 0.1; 3893 IO::AIO::max_poll_time $TICK * 0.1;
3695 $Coro::AIO::WATCHER->priority (1); 3894 undef $AnyEvent::AIO::WATCHER;
3696} 3895}
3697 3896
3698my $_log_backtrace; 3897my $_log_backtrace;
3699 3898
3700sub _log_backtrace { 3899sub _log_backtrace {
3703 $msg =~ s/\n//; 3902 $msg =~ s/\n//;
3704 3903
3705 # limit the # of concurrent backtraces 3904 # limit the # of concurrent backtraces
3706 if ($_log_backtrace < 2) { 3905 if ($_log_backtrace < 2) {
3707 ++$_log_backtrace; 3906 ++$_log_backtrace;
3907 my $perl_bt = Carp::longmess $msg;
3708 async { 3908 async {
3709 $Coro::current->{desc} = "abt $msg"; 3909 $Coro::current->{desc} = "abt $msg";
3710 3910
3711 my @bt = fork_call { 3911 my @bt = fork_call {
3712 @addr = map { sprintf "%x", $_ } @addr; 3912 @addr = map { sprintf "%x", $_ } @addr;
3723 } 3923 }
3724 3924
3725 @funcs 3925 @funcs
3726 }; 3926 };
3727 3927
3728 LOG llevInfo, "[ABT] $msg\n"; 3928 LOG llevInfo, "[ABT] $perl_bt\n";
3929 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3729 LOG llevInfo, "[ABT] $_\n" for @bt; 3930 LOG llevInfo, "[ABT] $_\n" for @bt;
3730 --$_log_backtrace; 3931 --$_log_backtrace;
3731 }; 3932 };
3732 } else { 3933 } else {
3733 LOG llevInfo, "[ABT] $msg\n"; 3934 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines