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.414 by root, Thu Apr 10 09:10:45 2008 UTC vs.
Revision 1.476 by root, Wed Sep 2 16:54:20 2009 UTC

19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 3.2; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5; 56use Digest::MD5;
52use Fcntl; 57use Fcntl;
53use YAML (); 58use YAML ();
54use IO::AIO 2.51 (); 59use IO::AIO ();
55use Time::HiRes; 60use Time::HiRes;
56use Compress::LZF; 61use Compress::LZF;
57use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
58 65
59# configure various modules to our taste 66# configure various modules to our taste
60# 67#
61$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
62Coro::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";
63Compress::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
64 76
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 79
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 81
69our %COMMAND = (); 82our %COMMAND = ();
70our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
73our %EXTCMD = (); 86our %EXTCMD = ();
74our %EXTICMD = (); 87our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
77 90
78our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 92our @EVENT;
80 93
81our $CONFDIR = confdir; 94our $CONFDIR = confdir;
82our $DATADIR = datadir; 95our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
92our %RESOURCE; 108our %RESOURCE;
93 109
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 112our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
99 114
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 118our $DB_ENV;
105 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
106our %CFG; 122our %CFG;
107 123
108our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 125our $RUNTIME;
110our $NOW; 126our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 137our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
123 139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
144
124binmode STDOUT; 145binmode STDOUT;
125binmode STDERR; 146binmode STDERR;
126 147
127# read virtual server time, if available 148# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
132} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
133 156
134mkdir $_ 157mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 159
137our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
242for my $pkg (qw( 265for my $pkg (qw(
243 cf::global cf::attachable 266 cf::global cf::attachable
244 cf::object cf::object::player 267 cf::object cf::object::player
245 cf::client cf::player 268 cf::client cf::player
246 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
247 cf::map cf::party cf::region 271 cf::party cf::region
248)) { 272)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 274}
252 275
253$EV::DIED = sub { 276$EV::DIED = sub {
254 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 320
298sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
300 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
301=item cf::lock_wait $string 338=item cf::lock_wait $string
302 339
303Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
304 341
305=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
306 343
307Wait until the given lock is available and then acquires it and returns 344Wait until the given lock is available and then acquires it and returns
308a Coro::guard object. If the guard object gets destroyed (goes out of scope, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
310returned. 347returned.
311 348
312Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 350deadlocked coro.
319 356
320Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
321 358
322=cut 359=cut
323 360
324our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 362
327sub lock_wait($) { 363sub lock_wait($) {
328 my ($key) = @_; 364 $LOCKS->wait ($_[0]);
329
330 if ($LOCKER{$key} == $Coro::current) {#d#
331 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
332 return;#d#
333 }#d#
334
335 # wait for lock, if any
336 while ($LOCK{$key}) {
337 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule;
339 }
340} 365}
341 366
342sub lock_acquire($) { 367sub lock_acquire($) {
343 my ($key) = @_; 368 $LOCKS->guard ($_[0])
344
345 # wait, to be sure we are not locked
346 lock_wait $key;
347
348 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d#
350
351 Coro::guard {
352 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} };
355 }
356} 369}
357 370
358sub lock_active($) { 371sub lock_active($) {
359 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 373}
363 374
364sub freeze_mainloop { 375sub freeze_mainloop {
365 tick_inhibit_inc; 376 tick_inhibit_inc;
366 377
367 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
368} 379}
369 380
370=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
371 382
372Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
427 } 438 }
428 } 439 }
429}; 440};
430 441
431sub get_slot($;$$) { 442sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main;
444
432 my ($time, $pri, $name) = @_; 445 my ($time, $pri, $name) = @_;
433 446
434 $time = $TICK * .6 if $time > $TICK * .6; 447 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 448 my $sig = new Coro::Signal;
436 449
547 reset_signals; 560 reset_signals;
548 &$cb 561 &$cb
549 }, @args; 562 }, @args;
550 563
551 wantarray ? @res : $res[-1] 564 wantarray ? @res : $res[-1]
565}
566
567=item $coin = coin_from_name $name
568
569=cut
570
571our %coin_alias = (
572 "silver" => "silvercoin",
573 "silvercoin" => "silvercoin",
574 "silvercoins" => "silvercoin",
575 "gold" => "goldcoin",
576 "goldcoin" => "goldcoin",
577 "goldcoins" => "goldcoin",
578 "platinum" => "platinacoin",
579 "platinumcoin" => "platinacoin",
580 "platinumcoins" => "platinacoin",
581 "platina" => "platinacoin",
582 "platinacoin" => "platinacoin",
583 "platinacoins" => "platinacoin",
584 "royalty" => "royalty",
585 "royalties" => "royalty",
586);
587
588sub coin_from_name($) {
589 $coin_alias{$_[0]}
590 ? cf::arch::find $coin_alias{$_[0]}
591 : undef
552} 592}
553 593
554=item $value = cf::db_get $family => $key 594=item $value = cf::db_get $family => $key
555 595
556Returns a single value from the environment database. 596Returns a single value from the environment database.
695 735
696############################################################################# 736#############################################################################
697 737
698=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
699 739
700Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
703 743
704In the following description, CLASS can be any of C<global>, C<object> 744In the following description, CLASS can be any of C<global>, C<object>
705C<player>, C<client> or C<map> (i.e. the attachable objects in 745C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
756 796
757Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
759 799
760Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
762 802
763These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
764 804
765=over 4 805=over 4
1056 1096
1057sub reattach { 1097sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1099 my ($obj) = @_;
1060 1100
1101 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1103
1063 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
1064 1105
1065 @$registry = (); 1106 @$registry = ();
1066 1107
1112 utf8::decode (my $decname = $filename); 1153 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1115 1156
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1120 close $fh; 1164 aio_close $fh;
1121 1165
1122 if (@$objs) { 1166 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1128 close $fh; 1175 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1177 }
1131 } else { 1178 } else {
1132 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1133 } 1180 }
1134 1181
1135 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1186 } else {
1137 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1138 } 1188 }
1139 } else { 1189 } else {
1140 aio_unlink $filename; 1190 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1142 } 1192 }
1233 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1234 1284
1235 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1236} 1286}
1237 1287
1288use File::Glob ();
1289
1238cf::player->attach ( 1290cf::player->attach (
1239 on_command => sub { 1291 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1241 1293
1242 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1274 1326
1275 cf::override; 1327 cf::override;
1276 }, 1328 },
1277); 1329);
1278 1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1343
1279sub load_extensions { 1344sub load_extensions {
1280 cf::sync_job { 1345 cf::sync_job {
1281 my %todo; 1346 my %todo;
1282 1347
1283 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
1302 1367
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1370
1306 $ext{source} = 1371 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1309 . $source 1374 . $source
1310 . "\n};\n1"; 1375 . "\n};\n1";
1311 1376
1312 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
1352 1417
1353=back 1418=back
1354 1419
1355=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1356 1421
1357Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1358 1423
1359=cut 1424=cut
1360 1425
1361package cf::player; 1426package cf::player;
1362 1427
1405 1470
1406sub exists($) { 1471sub exists($) {
1407 my ($login) = @_; 1472 my ($login) = @_;
1408 1473
1409 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1411} 1476}
1412 1477
1413sub find($) { 1478sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1480 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1492 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1493 or return;
1429 1494
1430 my $pl = cf::player::load_pl $f 1495 my $pl = cf::player::load_pl $f
1431 or return; 1496 or return;
1497
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1498 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1499 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1435 } 1501 }
1436 } 1502 }
1446 1512
1447 return if $pl->{deny_save}; 1513 return if $pl->{deny_save};
1448 1514
1449 aio_mkdir playerdir $pl, 0770; 1515 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1516 $pl->{last_save} = $cf::RUNTIME;
1517
1518 cf::get_slot 0.01;
1451 1519
1452 $pl->save_pl ($path); 1520 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1521 cf::cede_to_tick;
1454} 1522}
1455 1523
1487 my ($pl) = @_; 1555 my ($pl) = @_;
1488 1556
1489 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1490 1558
1491 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1561
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1498 1568
1499 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1609
1540 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1541 my $path = path $login; 1611 my $path = path $login;
1542 1612
1543 # a .pst is a dead give-away for a valid player 1613 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1619 }
1549 1620
1580 } 1651 }
1581 1652
1582 \@paths 1653 \@paths
1583} 1654}
1584 1655
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1657
1587Expand crossfire pod fragments into protocol xml. 1658Expand deliantra pod fragments into protocol xml.
1588
1589=cut
1590
1591use re 'eval';
1592
1593my $group;
1594my $interior; $interior = qr{
1595 # match a pod interior sequence sans C<< >>
1596 (?:
1597 \ (.*?)\ (?{ $group = $^N })
1598 | < (??{$interior}) >
1599 )
1600}x;
1601
1602sub expand_cfpod {
1603 my ($self, $pod) = @_;
1604
1605 my $xml;
1606
1607 while () {
1608 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1609 $group = $1;
1610
1611 $group =~ s/&/&amp;/g;
1612 $group =~ s/</&lt;/g;
1613
1614 $xml .= $group;
1615 } elsif ($pod =~ m%\G
1616 ([BCGHITU])
1617 <
1618 (?:
1619 ([^<>]*) (?{ $group = $^N })
1620 | < $interior >
1621 )
1622 >
1623 %gcsx
1624 ) {
1625 my ($code, $data) = ($1, $group);
1626
1627 if ($code eq "B") {
1628 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1629 } elsif ($code eq "I") {
1630 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1631 } elsif ($code eq "U") {
1632 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1633 } elsif ($code eq "C") {
1634 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1635 } elsif ($code eq "T") {
1636 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1637 } elsif ($code eq "G") {
1638 my ($male, $female) = split /\|/, $data;
1639 $data = $self->gender ? $female : $male;
1640 $xml .= expand_cfpod ($self, $data);
1641 } elsif ($code eq "H") {
1642 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1643 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1644 "")
1645 [$self->{hintmode}];
1646 } else {
1647 $xml .= "error processing '$code($data)' directive";
1648 }
1649 } else {
1650 if ($pod =~ /\G(.+)/) {
1651 warn "parse error while expanding $pod (at $1)";
1652 }
1653 last;
1654 }
1655 }
1656
1657 for ($xml) {
1658 # create single paragraphs (very hackish)
1659 s/(?<=\S)\n(?=\w)/ /g;
1660
1661 # compress some whitespace
1662 s/\s+\n/\n/g; # ws line-ends
1663 s/\n\n+/\n/g; # double lines
1664 s/^\n+//; # beginning lines
1665 s/\n+$//; # ending lines
1666 }
1667
1668 $xml
1669}
1670
1671no re 'eval';
1672
1673sub hintmode {
1674 $_[0]{hintmode} = $_[1] if @_ > 1;
1675 $_[0]{hintmode}
1676}
1677 1659
1678=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1679 1661
1680Sends an ext reply to the player. 1662Sends an ext reply to the player.
1681 1663
1748our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1750 1732
1751sub generate_random_map { 1733sub generate_random_map {
1752 my ($self, $rmp) = @_; 1734 my ($self, $rmp) = @_;
1735
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737
1753 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1739 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1864
1880# the temporary/swap location 1865# the temporary/swap location
1881sub save_path { 1866sub save_path {
1882 my ($self) = @_; 1867 my ($self) = @_;
1883 1868
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1886} 1871}
1887 1872
1888# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1889sub uniq_path { 1874sub uniq_path {
1890 my ($self) = @_; 1875 my ($self) = @_;
1891 1876
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1878 "$UNIQUEDIR/$path"
1894}
1895
1896# and all this just because we cannot iterate over
1897# all maps in C++...
1898sub change_all_map_light {
1899 my ($change) = @_;
1900
1901 $_->change_map_light ($change)
1902 for grep $_->outdoor, values %cf::MAP;
1903} 1879}
1904 1880
1905sub decay_objects { 1881sub decay_objects {
1906 my ($self) = @_; 1882 my ($self) = @_;
1907 1883
1991sub find { 1967sub find {
1992 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
1993 1969
1994 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
1995 1971
1996 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
1998 1974
1999 $cf::MAP{$path} || do { 1975 $cf::MAP{$path} || do {
2000 my $guard1 = cf::lock_acquire "map_find:$path";
2001 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2002
2003 my $map = new_from_path cf::map $path 1976 my $map = new_from_path cf::map $path
2004 or return; 1977 or return;
2005 1978
2006 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2007 1980
2009 or return; 1982 or return;
2010 1983
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
2014 undef $guard1; 1988 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1989 $map->reset;
2017 return find $path; 1990 return find $path;
2018 } 1991 }
2019 1992
2020 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2021 $f->skip_block;
2049 $self->_load_objects ($f) 2022 $self->_load_objects ($f)
2050 or return; 2023 or return;
2051 2024
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
2053 if delete $self->{load_original}; 2026 if delete $self->{load_original};
2054 2027
2055 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2029 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2030 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2049 $self->decay_objects;
2077 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2078 $self->update_buttons; 2051 $self->update_buttons;
2079 cf::cede_to_tick; 2052 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2053 $self->activate;
2083 } 2054 }
2084 2055
2085 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2057 $self->last_access ($cf::RUNTIME);
2087 2058
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2060 }
2090 2061
2091 $self->post_load; 2062 $self->post_load;
2092} 2063}
2093 2064
2151 my ($path, $origin, $load) = @_; 2122 my ($path, $origin, $load) = @_;
2152 2123
2153 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
2154 2125
2155 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2128 }
2158 2129
2159 $MAP_PREFETCH{$path} |= $load; 2130 $MAP_PREFETCH{$path} |= $load;
2160 2131
2161 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2169 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2170 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
2201 }; 2172 };
2202 2173
2174 cf::get_slot 0.02;
2175
2203 if ($uniq) { 2176 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2179 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2215 $self->save; 2188 $self->save;
2216 2189
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2191
2219 return if $self->players; 2192 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2222 2195
2223 $self->in_memory (cf::MAP_SWAPPED); 2196 $self->in_memory (cf::MAP_SWAPPED);
2224 2197
2225 $self->deactivate; 2198 $self->deactivate;
2343 2316
2344sub unique_maps() { 2317sub unique_maps() {
2345 [ 2318 [
2346 map { 2319 map {
2347 utf8::decode $_; 2320 utf8::decode $_;
2348 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2349 ? normalise $_ 2324 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2326 ]
2353} 2327}
2354 2328
2355package cf;
2356
2357=back 2329=back
2358 2330
2359=head3 cf::object 2331=head3 cf::object
2360 2332
2361=cut 2333=cut
2364 2336
2365=over 4 2337=over 4
2366 2338
2367=item $ob->inv_recursive 2339=item $ob->inv_recursive
2368 2340
2369Returns the inventory of the object _and_ their inventories, recursively. 2341Returns the inventory of the object I<and> their inventories, recursively,
2342but I<not> the object itself.
2370 2343
2371=cut 2344=cut
2372 2345
2373sub inv_recursive_; 2346sub inv_recursive_;
2374sub inv_recursive_ { 2347sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2380} 2353}
2381 2354
2382=item $ref = $ob->ref 2355=item $ref = $ob->ref
2383 2356
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2357Creates and returns a persistent reference to an object that can be stored as a string.
2385 2358
2386=item $ob = cf::object::deref ($refstring) 2359=item $ob = cf::object::deref ($refstring)
2387 2360
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2361returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2362even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2395dialogue with the given NPC character.
2423 2396
2424=cut 2397=cut
2425 2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2412
2426# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2414# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2417 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2430
2444 } else { 2431 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2434 }
2448 } 2435 }
2449} 2436}
2450 2437
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2463
2477=item $player_object->enter_link 2464=item $player_object->enter_link
2478 2465
2479Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2480 2467
2481The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2483 2472
2484Will never block. 2473Will never block.
2485 2474
2486=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2487 2476
2545 2534
2546 $map->load; 2535 $map->load;
2547 $map->load_neighbours; 2536 $map->load_neighbours;
2548 2537
2549 return unless $self->contr->active; 2538 return unless $self->contr->active;
2550 $self->activate_recursive;
2551 2539
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2540 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2541 $self->enter_map ($map, $x, $y);
2542
2543 # only activate afterwards, to support waiting in hooks
2544 $self->activate_recursive;
2554} 2545}
2555 2546
2556=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2547=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2557 2548
2558Moves the player to the given map-path and coordinates by first freezing 2549Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2550her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2551that has to return the map if sucecssful, and then unfreezes the player on
2561the new (success) or old (failed) map position. In either case, $done will 2552the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2553be called at the end of this process.
2554
2555Note that $check will be called with a potentially non-loaded map, so if
2556it needs a loaded map it has to call C<< ->load >>.
2563 2557
2564=cut 2558=cut
2565 2559
2566our $GOTOGEN; 2560our $GOTOGEN;
2567 2561
2646} 2640}
2647 2641
2648sub prepare_random_map { 2642sub prepare_random_map {
2649 my ($exit) = @_; 2643 my ($exit) = @_;
2650 2644
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2645 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2646 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2647 # that depends on the exit object
2656 2648
2657 my $rmp = parse_random_map_params $exit->msg; 2649 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2651 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2652 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2653 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2654 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2655 $rmp->{origin_y} = $exit->y;
2656
2657 $exit->map->touch;
2664 } 2658 }
2665 2659
2666 $rmp->{random_seed} ||= $exit->random_seed; 2660 $rmp->{random_seed} ||= $exit->random_seed;
2667 2661
2668 my $data = cf::encode_json $rmp; 2662 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2663 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2664 my $meta = "$RANDOMDIR/$md5.meta";
2671 2665
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2666 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2667 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2668 undef $fh;
2675 aio_rename "$meta~", $meta; 2669 aio_rename "$meta~", $meta;
2676 2670
2671 my $slaying = "?random/$md5";
2672
2673 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2674 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2675 $exit->msg (undef);
2676 }
2679 } 2677 }
2680} 2678}
2681 2679
2682sub cf::object::player::enter_exit { 2680sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2681 my ($self, $exit) = @_;
2684 2682
2685 return unless $self->type == cf::PLAYER; 2683 return unless $self->type == cf::PLAYER;
2686 2684
2687 if ($exit->slaying eq "/!") {
2688 #TODO: this should de-fi-ni-te-ly not be a sync-job
2689 # the problem is that $exit might not survive long enough
2690 # so it needs to be done right now, right here
2691 cf::sync_job { prepare_random_map $exit };
2692 }
2693
2694 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2695 my $hp = $exit->stats->hp;
2696 my $sp = $exit->stats->sp;
2697
2698 $self->enter_link; 2685 $self->enter_link;
2699 2686
2700 # if exit is damned, update players death & WoR home-position
2701 $self->contr->savebed ($slaying, $hp, $sp)
2702 if $exit->flag (FLAG_DAMNED);
2703
2704 (async { 2687 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2688 $Coro::current->{desc} = "enter_exit";
2706 2689
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2690 unless (eval {
2691 $self->deactivate_recursive; # just to be sure
2692
2693 # random map handling
2694 {
2695 my $guard = cf::lock_acquire "exit_prepare:$exit";
2696
2697 prepare_random_map $exit
2698 if $exit->slaying eq "/!";
2699 }
2700
2701 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2702 my $x = $exit->stats->hp;
2703 my $y = $exit->stats->sp;
2704
2709 $self->goto ($slaying, $hp, $sp); 2705 $self->goto ($map, $x, $y);
2710 2706
2707 # if exit is damned, update players death & WoR home-position
2708 $self->contr->savebed ($map, $x, $y)
2709 if $exit->flag (cf::FLAG_DAMNED);
2710
2711 1; 2711 1
2712 }) { 2712 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2713 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2714 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2715 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2716 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2717
2718 warn "ERROR in enter_exit: $@"; 2718 warn "ERROR in enter_exit: $@";
2784 id => "infobox", 2784 id => "infobox",
2785 title => "Body Parts", 2785 title => "Body Parts",
2786 reply => undef, 2786 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2787 tooltip => "Shows which body parts you posess and are available",
2788 }, 2788 },
2789 "c/statistics" => {
2790 id => "infobox",
2791 title => "Statistics",
2792 reply => undef,
2793 tooltip => "Shows your primary statistics",
2794 },
2795 "c/skills" => {
2796 id => "infobox",
2797 title => "Skills",
2798 reply => undef,
2799 tooltip => "Shows your experience per skill and item power",
2800 },
2801 "c/shopitems" => {
2802 id => "infobox",
2803 title => "Shop Items",
2804 reply => undef,
2805 tooltip => "Shows the items currently for sale in this shop",
2806 },
2807 "c/resistances" => {
2808 id => "infobox",
2809 title => "Resistances",
2810 reply => undef,
2811 tooltip => "Shows your resistances",
2812 },
2813 "c/pets" => {
2814 id => "infobox",
2815 title => "Pets",
2816 reply => undef,
2817 tooltip => "Shows information abotu your pets/a specific pet",
2818 },
2819 "c/perceiveself" => {
2820 id => "infobox",
2821 title => "Perceive Self",
2822 reply => undef,
2823 tooltip => "You gained detailed knowledge about yourself",
2824 },
2789 "c/uptime" => { 2825 "c/uptime" => {
2790 id => "infobox", 2826 id => "infobox",
2791 title => "Uptime", 2827 title => "Uptime",
2792 reply => undef, 2828 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2829 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2832 id => "infobox",
2797 title => "Map Info", 2833 title => "Map Info",
2798 reply => undef, 2834 reply => undef,
2799 tooltip => "Information related to the maps", 2835 tooltip => "Information related to the maps",
2800 }, 2836 },
2837 "c/party" => {
2838 id => "party",
2839 title => "Party",
2840 reply => "gsay ",
2841 tooltip => "Messages and chat related to your party",
2842 },
2843 "c/death" => {
2844 id => "death",
2845 title => "Death",
2846 reply => undef,
2847 tooltip => "Reason for and more info about your most recent death",
2848 },
2849 "c/say" => $SAY_CHANNEL,
2850 "c/chat" => $CHAT_CHANNEL,
2801); 2851);
2802 2852
2803sub cf::client::send_msg { 2853sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2854 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2855
2806 $msg = $self->pl->expand_cfpod ($msg); 2856 $msg = $self->pl->expand_cfpod ($msg)
2857 unless $color & cf::NDI_VERBATIM;
2807 2858
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2859 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2860
2810 # check predefined channels, for the benefit of C 2861 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2862 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2863 $channel = $CHANNEL{$channel};
2813 2864
2814 $self->ext_msg (channel_info => $channel) 2865 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2866 $channel = $channel->{id};
2818 2867
2819 } elsif (ref $channel) { 2868 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2869 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2870 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2871 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2872 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2873 }
2826 2874
2827 $channel = $channel->{id}; 2875 $channel = $channel->{id};
2828 } 2876 }
2829 2877
2830 return unless @extra || length $msg; 2878 return unless @extra || length $msg;
2831 2879
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2880 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2881 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2882 if $color & cf::NDI_DEF;
2836 2883
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2884 my $pkt = "msg "
2885 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2886 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 2887 );
2840 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones
2842 for ($msg) {
2843 1 while
2844 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2845 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2846 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2847 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2848 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2849 }
2850 2888
2851 $color &= cf::NDI_COLOR_MASK; 2889 # try lzf for large packets
2890 $pkt = "lzf " . Compress::LZF::compress $pkt
2891 if 1024 <= length $pkt and $self->{can_lzf};
2852 2892
2853 utf8::encode $msg; 2893 # split very large packets
2854 2894 if (8192 < length $pkt and $self->{can_lzf}) {
2855 if (0 && $msg =~ /\[/) { 2895 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 # COMMAND/INFO 2896 $pkt = "frag";
2857 $self->send_packet ("drawextinfo $color 10 8 $msg")
2858 } else {
2859 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2860 $self->send_packet ("drawinfo $color $msg")
2861 }
2862 }
2863 } 2897 }
2898
2899 $self->send_packet ($pkt);
2864} 2900}
2865 2901
2866=item $client->ext_msg ($type, @msg) 2902=item $client->ext_msg ($type, @msg)
2867 2903
2868Sends an ext event to the client. 2904Sends an ext event to the client.
3042 3078
3043The following functions and methods are available within a safe environment: 3079The following functions and methods are available within a safe environment:
3044 3080
3045 cf::object 3081 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3082 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3083 insert remove name archname title slaying race decrease split
3084 value
3048 3085
3049 cf::object::player 3086 cf::object::player
3050 player 3087 player
3051 3088
3052 cf::player 3089 cf::player
3057 3094
3058=cut 3095=cut
3059 3096
3060for ( 3097for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3098 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3099 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3100 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3101 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3102 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3103 ["cf::map" => qw(trigger)],
3067) { 3104) {
3068 no strict 'refs'; 3105 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3106 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3107 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3087 my ($code, %vars) = @_; 3124 my ($code, %vars) = @_;
3088 3125
3089 my $qcode = $code; 3126 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3127 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3128 $qcode =~ s/\n/\\n/g;
3129
3130 %vars = (_dummy => 0) unless %vars;
3092 3131
3093 local $_; 3132 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars; 3133 local @safe::cf::_safe_eval_args = values %vars;
3095 3134
3096 my $eval = 3135 my $eval =
3276 while (my ($k, $v) = each %$want) { 3315 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3316 $ns->fx_want ($k, $v);
3278 } 3317 }
3279}; 3318};
3280 3319
3320sub load_resource_file($) {
3321 my $guard = lock_acquire "load_resource_file";
3322
3323 my $status = load_resource_file_ $_[0];
3324 get_slot 0.1, 100;
3325 cf::arch::commit_load;
3326
3327 $status
3328}
3329
3281sub reload_regions { 3330sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3331 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3332 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3333 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3334
3298} 3347}
3299 3348
3300sub reload_archetypes { 3349sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3350 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3351 or die "unable to load archetypes\n";
3303 #d# NEED to laod twice to resolve forward references
3304 # this really needs to be done in an extra post-pass
3305 # (which needs to be synchronous, so solve it differently)
3306 load_resource_file "$DATADIR/archetypes"
3307 or die "unable to load archetypes\n";
3308} 3352}
3309 3353
3310sub reload_treasures { 3354sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3355 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3356 or die "unable to load treasurelists\n";
3313} 3357}
3314 3358
3315sub reload_resources { 3359sub reload_resources {
3316 warn "reloading resource files...\n"; 3360 warn "reloading resource files...\n";
3317 3361
3362 reload_facedata;
3363 reload_archetypes;
3318 reload_regions; 3364 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3365 reload_treasures;
3323 3366
3324 warn "finished reloading resource files\n"; 3367 warn "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3368}
3330 3369
3331sub reload_config { 3370sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3371 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3372 or return;
3347 }; 3386 };
3348 warn $@ if $@; 3387 warn $@ if $@;
3349 } 3388 }
3350} 3389}
3351 3390
3391sub pidfile() {
3392 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3393 or die "$PIDFILE: $!";
3394 flock $fh, &Fcntl::LOCK_EX
3395 or die "$PIDFILE: flock: $!";
3396 $fh
3397}
3398
3399# make sure only one server instance is running at any one time
3400sub atomic {
3401 my $fh = pidfile;
3402
3403 my $pid = <$fh>;
3404 kill 9, $pid if $pid > 0;
3405
3406 seek $fh, 0, 0;
3407 print $fh $$;
3408}
3409
3410sub main_loop {
3411 warn "EV::loop starting\n";
3412 if (1) {
3413 EV::loop;
3414 }
3415 warn "EV::loop returned\n";
3416 goto &main_loop unless $REALLY_UNLOOP;
3417}
3418
3352sub main { 3419sub main {
3420 cf::init_globals; # initialise logging
3421
3422 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3423 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3424 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3425 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3426
3427 cf::init_experience;
3428 cf::init_anim;
3429 cf::init_attackmess;
3430 cf::init_dynamic;
3431
3432 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3433
3353 # we must not ever block the main coroutine 3434 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3435 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3436 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3437 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3438 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3439 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3440 })->prio (Coro::PRIO_MAX);
3360 }; 3441 };
3361 3442
3362 reload_config;
3363 db_init;
3364 load_extensions;
3365
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3367 evthread_start IO::AIO::poll_fileno; 3443 evthread_start IO::AIO::poll_fileno;
3368 EV::loop; 3444
3445 cf::sync_job {
3446 reload_resources;
3447 reload_config;
3448 db_init;
3449
3450 cf::load_settings;
3451 cf::load_materials;
3452 cf::init_uuid;
3453 cf::init_signals;
3454 cf::init_commands;
3455 cf::init_skills;
3456
3457 cf::init_beforeplay;
3458
3459 atomic;
3460
3461 load_extensions;
3462
3463 utime time, time, $RUNTIMEFILE;
3464
3465 # no (long-running) fork's whatsoever before this point(!)
3466 use POSIX ();
3467 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3468
3469 (pop @POST_INIT)->(0) while @POST_INIT;
3470 };
3471
3472 main_loop;
3369} 3473}
3370 3474
3371############################################################################# 3475#############################################################################
3372# initialisation and cleanup 3476# initialisation and cleanup
3373 3477
3379 cf::cleanup "SIG$signal"; 3483 cf::cleanup "SIG$signal";
3380 }; 3484 };
3381 } 3485 }
3382} 3486}
3383 3487
3384sub write_runtime { 3488sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3489 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3490 # the fsync below can take a very very long time.
3389 3491
3390 IO::AIO::aio_utime $runtime, undef, undef; 3492 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3493
3392 my $guard = cf::lock_acquire "write_runtime"; 3494 my $guard = cf::lock_acquire "write_runtime";
3393 3495
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3496 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3497 or return;
3396 3498
3397 my $value = $cf::RUNTIME + 90 + 10; 3499 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3500 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3501 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3511 aio_utime $fh, undef, undef;
3410 3512
3411 close $fh 3513 close $fh
3412 or return; 3514 or return;
3413 3515
3414 aio_rename "$runtime~", $runtime 3516 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3517 and return;
3416 3518
3417 warn "runtime file written.\n"; 3519 warn "runtime file written.\n";
3418 3520
3419 1 3521 1
3522}
3523
3524our $uuid_lock;
3525our $uuid_skip;
3526
3527sub write_uuid_sync($) {
3528 $uuid_skip ||= $_[0];
3529
3530 return if $uuid_lock;
3531 local $uuid_lock = 1;
3532
3533 my $uuid = "$LOCALDIR/uuid";
3534
3535 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3536 or return;
3537
3538 my $value = uuid_seq uuid_cur;
3539
3540 unless ($value) {
3541 warn "cowardly refusing to write zero uuid value!\n";
3542 return;
3543 }
3544
3545 my $value = uuid_str $value + $uuid_skip;
3546 $uuid_skip = 0;
3547
3548 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3549 and return;
3550
3551 # always fsync - this file is important
3552 aio_fsync $fh
3553 and return;
3554
3555 close $fh
3556 or return;
3557
3558 aio_rename "$uuid~", $uuid
3559 and return;
3560
3561 warn "uuid file written ($value).\n";
3562
3563 1
3564
3565}
3566
3567sub write_uuid($$) {
3568 my ($skip, $sync) = @_;
3569
3570 $sync ? write_uuid_sync $skip
3571 : async { write_uuid_sync $skip };
3420} 3572}
3421 3573
3422sub emergency_save() { 3574sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3575 my $freeze_guard = cf::freeze_mainloop;
3424 3576
3425 warn "enter emergency perl save\n"; 3577 warn "emergency_perl_save: enter\n";
3426 3578
3427 cf::sync_job { 3579 cf::sync_job {
3580 # this is a trade-off: we want to be very quick here, so
3581 # save all maps without fsync, and later call a global sync
3582 # (which in turn might be very very slow)
3583 local $USE_FSYNC = 0;
3584
3428 # use a peculiar iteration method to avoid tripping on perl 3585 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3586 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3587 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3588 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3589 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3590 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3591 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3592 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3593 $pl->save;
3437 } 3594 }
3438 warn "end emergency player save\n"; 3595 warn "emergency_perl_save: end player save\n";
3439 3596
3440 warn "begin emergency map save\n"; 3597 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3598 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3599 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3600 $map->valid or next;
3444 $map->save; 3601 $map->save;
3445 } 3602 }
3446 warn "end emergency map save\n"; 3603 warn "emergency_perl_save: end map save\n";
3447 3604
3448 warn "begin emergency database checkpoint\n"; 3605 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3606 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3607 warn "emergency_perl_save: end database checkpoint\n";
3608
3609 warn "emergency_perl_save: begin write uuid\n";
3610 write_uuid_sync 1;
3611 warn "emergency_perl_save: end write uuid\n";
3451 }; 3612 };
3452 3613
3614 warn "emergency_perl_save: starting sync()\n";
3615 IO::AIO::aio_sync sub {
3616 warn "emergency_perl_save: finished sync()\n";
3617 };
3618
3453 warn "leave emergency perl save\n"; 3619 warn "emergency_perl_save: leave\n";
3454} 3620}
3455 3621
3456sub post_cleanup { 3622sub post_cleanup {
3457 my ($make_core) = @_; 3623 my ($make_core) = @_;
3458 3624
3459 warn Carp::longmess "post_cleanup backtrace" 3625 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3626 if $make_core;
3627
3628 my $fh = pidfile;
3629 unlink $PIDFILE if <$fh> == $$;
3630}
3631
3632# a safer delete_package, copied from Symbol
3633sub clear_package($) {
3634 my $pkg = shift;
3635
3636 # expand to full symbol table name if needed
3637 unless ($pkg =~ /^main::.*::$/) {
3638 $pkg = "main$pkg" if $pkg =~ /^::/;
3639 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3640 $pkg .= '::' unless $pkg =~ /::$/;
3641 }
3642
3643 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3644 my $stem_symtab = *{$stem}{HASH};
3645
3646 defined $stem_symtab and exists $stem_symtab->{$leaf}
3647 or return;
3648
3649 # clear all symbols
3650 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3651 for my $name (keys %$leaf_symtab) {
3652 _gv_clear *{"$pkg$name"};
3653# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3654 }
3655 warn "cleared package $pkg\n";#d#
3461} 3656}
3462 3657
3463sub do_reload_perl() { 3658sub do_reload_perl() {
3464 # can/must only be called in main 3659 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3660 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3661 warn "can only reload from main coroutine";
3467 return; 3662 return;
3468 } 3663 }
3469 3664
3665 return if $RELOAD++;
3666
3667 my $t1 = EV::time;
3668
3669 while ($RELOAD) {
3470 warn "reloading..."; 3670 warn "reloading...";
3471 3671
3472 warn "entering sync_job"; 3672 warn "entering sync_job";
3473 3673
3474 cf::sync_job { 3674 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3676 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3677 cf::write_runtime_sync; # external watchdog should not bark
3478 3678
3479 warn "syncing database to disk"; 3679 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3680 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3681
3482 # if anything goes wrong in here, we should simply crash as we already saved 3682 # if anything goes wrong in here, we should simply crash as we already saved
3483 3683
3484 warn "flushing outstanding aio requests"; 3684 warn "flushing outstanding aio requests";
3485 for (;;) {
3486 BDB::flush;
3487 IO::AIO::flush;
3488 Coro::cede_notself;
3489 last unless IO::AIO::nreqs || BDB::nreqs; 3685 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3686 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3491 }
3492
3493 ++$RELOAD;
3494
3495 warn "cancelling all extension coros";
3496 $_->cancel for values %EXT_CORO;
3497 %EXT_CORO = ();
3498
3499 warn "removing commands";
3500 %COMMAND = ();
3501
3502 warn "removing ext/exti commands";
3503 %EXTCMD = ();
3504 %EXTICMD = ();
3505
3506 warn "unloading/nuking all extensions";
3507 for my $pkg (@EXTS) {
3508 warn "... unloading $pkg";
3509
3510 if (my $cb = $pkg->can ("unload")) {
3511 eval {
3512 $cb->($pkg);
3513 1
3514 } or warn "$pkg unloaded, but with errors: $@";
3515 } 3687 }
3516 3688
3517 warn "... nuking $pkg"; 3689 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3690 $_->cancel for values %EXT_CORO;
3519 } 3691 %EXT_CORO = ();
3520 3692
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3693 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3694 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3695
3696 warn "removing ext/exti commands";
3697 %EXTCMD = ();
3698 %EXTICMD = ();
3699
3700 warn "unloading/nuking all extensions";
3701 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3702 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3703
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3704 if (my $cb = $pkg->can ("unload")) {
3705 eval {
3532 $cb->(); 3706 $cb->($pkg);
3707 1
3708 } or warn "$pkg unloaded, but with errors: $@";
3709 }
3710
3711 warn "... clearing $pkg";
3712 clear_package $pkg;
3533 } 3713 }
3534 3714
3535 Symbol::delete_package $k; 3715 warn "unloading all perl modules loaded from $LIBDIR";
3716 while (my ($k, $v) = each %INC) {
3717 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3718
3719 warn "... unloading $k";
3720 delete $INC{$k};
3721
3722 $k =~ s/\.pm$//;
3723 $k =~ s/\//::/g;
3724
3725 if (my $cb = $k->can ("unload_module")) {
3726 $cb->();
3727 }
3728
3729 clear_package $k;
3536 } 3730 }
3537 3731
3538 warn "getting rid of safe::, as good as possible"; 3732 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3733 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3734 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3735
3542 warn "unloading cf.pm \"a bit\""; 3736 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3737 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3738 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3739
3546 # don't, removes xs symbols, too, 3740 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3741 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3742 #clear_package __PACKAGE__;
3549 3743
3550 warn "unload completed, starting to reload now"; 3744 warn "unload completed, starting to reload now";
3551 3745
3552 warn "reloading cf.pm"; 3746 warn "reloading cf.pm";
3553 require cf; 3747 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3748 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3749
3556 warn "loading config and database again"; 3750 warn "loading config and database again";
3557 cf::reload_config; 3751 cf::reload_config;
3558 3752
3559 warn "loading extensions"; 3753 warn "loading extensions";
3560 cf::load_extensions; 3754 cf::load_extensions;
3561 3755
3756 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3757 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3758 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3759 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3760 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3761 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3762 reattach $_ for values %PLAYER;
3763 }
3568 3764
3765 warn "running post_init jobs";
3766 (pop @POST_INIT)->(1) while @POST_INIT;
3767
3569 warn "leaving sync_job"; 3768 warn "leaving sync_job";
3570 3769
3571 1 3770 1
3572 } or do { 3771 } or do {
3573 warn $@; 3772 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3773 cf::cleanup "error while reloading, exiting.";
3575 }; 3774 };
3576 3775
3577 warn "reloaded"; 3776 warn "reloaded";
3777 --$RELOAD;
3778 }
3779
3780 $t1 = EV::time - $t1;
3781 warn "reload completed in ${t1}s\n";
3578}; 3782};
3579 3783
3580our $RELOAD_WATCHER; # used only during reload 3784our $RELOAD_WATCHER; # used only during reload
3581 3785
3582sub reload_perl() { 3786sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3787 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3788 # coro crashes during coro_state_free->destroy here.
3585 3789
3790 $RELOAD_WATCHER ||= cf::async {
3791 Coro::AIO::aio_wait cache_extensions;
3792
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3793 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3794 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3795 undef $RELOAD_WATCHER;
3796 };
3589 }; 3797 };
3590} 3798}
3591 3799
3592register_command "reload" => sub { 3800register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3801 my ($who, $arg) = @_;
3607 3815
3608our @WAIT_FOR_TICK; 3816our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3817our @WAIT_FOR_TICK_BEGIN;
3610 3818
3611sub wait_for_tick { 3819sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3820 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3821
3615 my $signal = new Coro::Signal; 3822 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3823 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3824 $signal->wait;
3618} 3825}
3619 3826
3620sub wait_for_tick_begin { 3827sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3828 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3829
3624 my $signal = new Coro::Signal; 3830 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3831 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3832 $signal->wait;
3627} 3833}
3637 3843
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3844 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3845 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3846 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3847 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3848 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3849 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3850 };
3645 } 3851 }
3646 3852
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3853 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3872{
3667 # configure BDB 3873 # configure BDB
3668 3874
3669 BDB::min_parallel 8; 3875 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3876 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3877 $AnyEvent::BDB::WATCHER->priority (1);
3672 3878
3673 unless ($DB_ENV) { 3879 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3880 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3881 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3882 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3883 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3884 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3885 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3886
3680 cf::sync_job { 3887 cf::sync_job {
3681 eval { 3888 eval {
3707{ 3914{
3708 # configure IO::AIO 3915 # configure IO::AIO
3709 3916
3710 IO::AIO::min_parallel 8; 3917 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3918 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3919 undef $AnyEvent::AIO::WATCHER;
3713} 3920}
3714 3921
3715my $_log_backtrace; 3922my $_log_backtrace;
3716 3923
3717sub _log_backtrace { 3924sub _log_backtrace {
3720 $msg =~ s/\n//; 3927 $msg =~ s/\n//;
3721 3928
3722 # limit the # of concurrent backtraces 3929 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3930 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3931 ++$_log_backtrace;
3932 my $perl_bt = Carp::longmess $msg;
3725 async { 3933 async {
3726 $Coro::current->{desc} = "abt $msg"; 3934 $Coro::current->{desc} = "abt $msg";
3727 3935
3728 my @bt = fork_call { 3936 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3937 @addr = map { sprintf "%x", $_ } @addr;
3740 } 3948 }
3741 3949
3742 @funcs 3950 @funcs
3743 }; 3951 };
3744 3952
3745 LOG llevInfo, "[ABT] $msg\n"; 3953 LOG llevInfo, "[ABT] $perl_bt\n";
3954 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3955 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3956 --$_log_backtrace;
3748 }; 3957 };
3749 } else { 3958 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3959 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 3960 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 3961 }
3753} 3962}
3754 3963
3755# load additional modules 3964# load additional modules
3756use cf::pod; 3965require "cf/$_.pm" for @EXTRA_MODULES;
3757 3966
3758END { cf::emergency_save } 3967END { cf::emergency_save }
3759 3968
37601 39691
3761 3970

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines