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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines