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.412 by root, Wed Apr 2 11:13:55 2008 UTC vs.
Revision 1.458 by root, Sat Dec 13 20:34:37 2008 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 "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 1.86; 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.32 (); 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::AnyEvent;
43use Coro::AIO; 47use Coro::AIO;
44use Coro::BDB; 48use Coro::BDB 1.6;
45use Coro::Storable; 49use Coro::Storable;
46use Coro::Util (); 50use Coro::Util ();
47 51
48use JSON::XS 2.01 (); 52use JSON::XS 2.01 ();
49use BDB (); 53use BDB ();
50use Data::Dumper; 54use Data::Dumper;
51use Digest::MD5; 55use Digest::MD5;
52use Fcntl; 56use Fcntl;
53use YAML (); 57use YAML ();
54use IO::AIO 2.51 (); 58use IO::AIO ();
55use Time::HiRes; 59use Time::HiRes;
56use Compress::LZF; 60use Compress::LZF;
57use Digest::MD5 (); 61use Digest::MD5 ();
62
63AnyEvent::detect;
58 64
59# configure various modules to our taste 65# configure various modules to our taste
60# 66#
61$Storable::canonical = 1; # reduce rsync transfers 67$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 68Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
69
70$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
71
72# make sure c-lzf reinitialises itself
73Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 74Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 75
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 76sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 77
69our %COMMAND = (); 78our %COMMAND = ();
70our %COMMAND_TIME = (); 79our %COMMAND_TIME = ();
73our %EXTCMD = (); 82our %EXTCMD = ();
74our %EXTICMD = (); 83our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 84our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 85our %EXT_MAP = (); # pluggable maps
77 86
78our $RELOAD; # number of reloads so far 87our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 88our @EVENT;
80 89
81our $CONFDIR = confdir; 90our $CONFDIR = confdir;
82our $DATADIR = datadir; 91our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 92our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 93our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 94our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 95our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 96our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 97our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 98our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 99our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 100our $BDBDIR = "$LOCALDIR/db";
101our $PIDFILE = "$LOCALDIR/pid";
102our $RUNTIMEFILE = "$LOCALDIR/runtime";
103
92our %RESOURCE; 104our %RESOURCE;
93 105
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 106our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 107our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 108our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 109our $USE_FSYNC = 1; # use fsync to write maps - default off
99 110
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 111our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 112our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 113our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 114our $DB_ENV;
105 115
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 129our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 130our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 131our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 132our $TICK_START; # for load detecting purposes
123 133
134our @POST_INIT;
135
136our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
137
124binmode STDOUT; 138binmode STDOUT;
125binmode STDERR; 139binmode STDERR;
126 140
127# read virtual server time, if available 141# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 142unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 143 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 144 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 145 $RUNTIME = <$fh> + 0.;
132} 146}
133 147
134mkdir $_ 148mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 149 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
242for my $pkg (qw( 256for my $pkg (qw(
243 cf::global cf::attachable 257 cf::global cf::attachable
244 cf::object cf::object::player 258 cf::object cf::object::player
245 cf::client cf::player 259 cf::client cf::player
246 cf::arch cf::living 260 cf::arch cf::living
261 cf::map cf::mapspace
247 cf::map cf::party cf::region 262 cf::party cf::region
248)) { 263)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 264 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 265}
252 266
253$EV::DIED = sub { 267$EV::DIED = sub {
254 warn "error in event callback: @_"; 268 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 310our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 311
298sub encode_json($) { $json_coder->encode ($_[0]) } 312sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 313sub decode_json($) { $json_coder->decode ($_[0]) }
300 314
315=item cf::post_init { BLOCK }
316
317Execute the given codeblock, I<after> all extensions have been (re-)loaded,
318but I<before> the server starts ticking again.
319
320The cdoeblock will have a single boolean argument to indicate whether this
321is a reload or not.
322
323=cut
324
325sub post_init(&) {
326 push @POST_INIT, shift;
327}
328
301=item cf::lock_wait $string 329=item cf::lock_wait $string
302 330
303Wait until the given lock is available. See cf::lock_acquire. 331Wait until the given lock is available. See cf::lock_acquire.
304 332
305=item my $lock = cf::lock_acquire $string 333=item my $lock = cf::lock_acquire $string
306 334
307Wait until the given lock is available and then acquires it and returns 335Wait 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, 336a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 337for example when the coroutine gets canceled), the lock is automatically
310returned. 338returned.
311 339
312Locks are *not* recursive, locking from the same coro twice results in a 340Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 341deadlocked coro.
332 return;#d# 360 return;#d#
333 }#d# 361 }#d#
334 362
335 # wait for lock, if any 363 # wait for lock, if any
336 while ($LOCK{$key}) { 364 while ($LOCK{$key}) {
365 #local $Coro::current->{desc} = "$Coro::current->{desc} <waiting for lock $key>";
337 push @{ $LOCK{$key} }, $Coro::current; 366 push @{ $LOCK{$key} }, $Coro::current;
338 Coro::schedule; 367 Coro::schedule;
339 } 368 }
340} 369}
341 370
346 lock_wait $key; 375 lock_wait $key;
347 376
348 $LOCK{$key} = []; 377 $LOCK{$key} = [];
349 $LOCKER{$key} = $Coro::current;#d# 378 $LOCKER{$key} = $Coro::current;#d#
350 379
351 Coro::guard { 380 Guard::guard {
352 delete $LOCKER{$key};#d# 381 delete $LOCKER{$key};#d#
353 # wake up all waiters, to be on the safe side 382 # wake up all waiters, to be on the safe side
354 $_->ready for @{ delete $LOCK{$key} }; 383 $_->ready for @{ delete $LOCK{$key} };
355 } 384 }
356} 385}
362} 391}
363 392
364sub freeze_mainloop { 393sub freeze_mainloop {
365 tick_inhibit_inc; 394 tick_inhibit_inc;
366 395
367 Coro::guard \&tick_inhibit_dec; 396 &Guard::guard (\&tick_inhibit_dec);
368} 397}
369 398
370=item cf::periodic $interval, $cb 399=item cf::periodic $interval, $cb
371 400
372Like EV::periodic, but randomly selects a starting point so that the actions 401Like EV::periodic, but randomly selects a starting point so that the actions
427 } 456 }
428 } 457 }
429}; 458};
430 459
431sub get_slot($;$$) { 460sub get_slot($;$$) {
461 return if tick_inhibit || $Coro::current == $Coro::main;
462
432 my ($time, $pri, $name) = @_; 463 my ($time, $pri, $name) = @_;
433 464
434 $time = $TICK * .6 if $time > $TICK * .6; 465 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 466 my $sig = new Coro::Signal;
436 467
547 reset_signals; 578 reset_signals;
548 &$cb 579 &$cb
549 }, @args; 580 }, @args;
550 581
551 wantarray ? @res : $res[-1] 582 wantarray ? @res : $res[-1]
583}
584
585=item $coin = coin_from_name $name
586
587=cut
588
589our %coin_alias = (
590 "silver" => "silvercoin",
591 "silvercoin" => "silvercoin",
592 "silvercoins" => "silvercoin",
593 "gold" => "goldcoin",
594 "goldcoin" => "goldcoin",
595 "goldcoins" => "goldcoin",
596 "platinum" => "platinacoin",
597 "platinumcoin" => "platinacoin",
598 "platinumcoins" => "platinacoin",
599 "platina" => "platinacoin",
600 "platinacoin" => "platinacoin",
601 "platinacoins" => "platinacoin",
602 "royalty" => "royalty",
603 "royalties" => "royalty",
604);
605
606sub coin_from_name($) {
607 $coin_alias{$_[0]}
608 ? cf::arch::find $coin_alias{$_[0]}
609 : undef
552} 610}
553 611
554=item $value = cf::db_get $family => $key 612=item $value = cf::db_get $family => $key
555 613
556Returns a single value from the environment database. 614Returns a single value from the environment database.
695 753
696############################################################################# 754#############################################################################
697 755
698=head2 ATTACHABLE OBJECTS 756=head2 ATTACHABLE OBJECTS
699 757
700Many objects in crossfire are so-called attachable objects. That means you can 758Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 759attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 760to it. All such attachable objects support the following methods.
703 761
704In the following description, CLASS can be any of C<global>, C<object> 762In 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 763C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 813=item cf::CLASS::attachment $name, ...
756 814
757Register an attachment by C<$name> through which attachable objects of the 815Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 816given CLASS can refer to this attachment.
759 817
760Some classes such as crossfire maps and objects can specify attachments 818Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 819that are attached at load/instantiate time, thus the need for a name.
762 820
763These calls expect any number of the following handler/hook descriptions: 821These calls expect any number of the following handler/hook descriptions:
764 822
765=over 4 823=over 4
1056 1114
1057sub reattach { 1115sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1116 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1117 my ($obj) = @_;
1060 1118
1119 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1120 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1121
1063 my $registry = $obj->registry; 1122 my $registry = $obj->registry;
1064 1123
1065 @$registry = (); 1124 @$registry = ();
1066 1125
1112 utf8::decode (my $decname = $filename); 1171 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1172 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1173 $decname, length $$rdata, scalar @$objs;
1115 1174
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1175 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1176 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1177 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1178 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1179 aio_close $fh;
1121 1180
1122 if (@$objs) { 1181 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1182 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1183 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1184 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1185 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1186 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1187 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1188 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1189 }
1131 } else { 1190 } else {
1132 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1133 } 1192 }
1134 1193
1135 aio_rename "$filename~", $filename; 1194 aio_rename "$filename~", $filename;
1195
1196 $filename =~ s%/[^/]+$%%;
1197 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1198 } else {
1137 warn "FATAL: $filename~: $!\n"; 1199 warn "FATAL: $filename~: $!\n";
1138 } 1200 }
1139 } else { 1201 } else {
1140 aio_unlink $filename; 1202 aio_unlink $filename;
1233 my ($name, $cb) = @_; 1295 my ($name, $cb) = @_;
1234 1296
1235 $EXTICMD{$name} = $cb; 1297 $EXTICMD{$name} = $cb;
1236} 1298}
1237 1299
1300use File::Glob ();
1301
1238cf::player->attach ( 1302cf::player->attach (
1239 on_command => sub { 1303 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1304 my ($pl, $name, $params) = @_;
1241 1305
1242 my $cb = $COMMAND{$name} 1306 my $cb = $COMMAND{$name}
1274 1338
1275 cf::override; 1339 cf::override;
1276 }, 1340 },
1277); 1341);
1278 1342
1343# "readahead" all extensions
1344sub cache_extensions {
1345 my $grp = IO::AIO::aio_group;
1346
1347 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1348 for (grep /\.ext$/, @{$_[0]}) {
1349 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1350 }
1351 };
1352
1353 $grp
1354}
1355
1279sub load_extensions { 1356sub load_extensions {
1280 cf::sync_job { 1357 cf::sync_job {
1281 my %todo; 1358 my %todo;
1282 1359
1283 for my $path (<$LIBDIR/*.ext>) { 1360 for my $path (<$LIBDIR/*.ext>) {
1302 1379
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1380 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1381 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1382
1306 $ext{source} = 1383 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1384 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1385 . "#line 1 \"$path\"\n{\n"
1309 . $source 1386 . $source
1310 . "\n};\n1"; 1387 . "\n};\n1";
1311 1388
1312 $todo{$base} = \%ext; 1389 $todo{$base} = \%ext;
1352 1429
1353=back 1430=back
1354 1431
1355=head2 CORE EXTENSIONS 1432=head2 CORE EXTENSIONS
1356 1433
1357Functions and methods that extend core crossfire objects. 1434Functions and methods that extend core deliantra objects.
1358 1435
1359=cut 1436=cut
1360 1437
1361package cf::player; 1438package cf::player;
1362 1439
1405 1482
1406sub exists($) { 1483sub exists($) {
1407 my ($login) = @_; 1484 my ($login) = @_;
1408 1485
1409 $cf::PLAYER{$login} 1486 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1487 or !aio_stat path $login
1411} 1488}
1412 1489
1413sub find($) { 1490sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1491 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1492 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1504 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1505 or return;
1429 1506
1430 my $pl = cf::player::load_pl $f 1507 my $pl = cf::player::load_pl $f
1431 or return; 1508 or return;
1509
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1510 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1511 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1512 $cf::PLAYER{$login} = $pl
1435 } 1513 }
1436 } 1514 }
1446 1524
1447 return if $pl->{deny_save}; 1525 return if $pl->{deny_save};
1448 1526
1449 aio_mkdir playerdir $pl, 0770; 1527 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1528 $pl->{last_save} = $cf::RUNTIME;
1529
1530 cf::get_slot 0.01;
1451 1531
1452 $pl->save_pl ($path); 1532 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1533 cf::cede_to_tick;
1454} 1534}
1455 1535
1487 my ($pl) = @_; 1567 my ($pl) = @_;
1488 1568
1489 my $name = $pl->ob->name; 1569 my $name = $pl->ob->name;
1490 1570
1491 $pl->{deny_save} = 1; 1571 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1572 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1573
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1574 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1575 $pl->deactivate;
1576 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1577 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1578 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1579 $pl->ns->destroy if $pl->ns;
1498 1580
1499 my $path = playerdir $pl; 1581 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1582 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1621
1540 for my $login (@$dirs) { 1622 for my $login (@$dirs) {
1541 my $path = path $login; 1623 my $path = path $login;
1542 1624
1543 # a .pst is a dead give-away for a valid player 1625 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1626 # if no pst file found, open and chekc for blocked users
1627 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1628 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1629 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1630 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1631 }
1549 1632
1580 } 1663 }
1581 1664
1582 \@paths 1665 \@paths
1583} 1666}
1584 1667
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1668=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1669
1587Expand crossfire pod fragments into protocol xml. 1670Expand 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 1671
1678=item $player->ext_reply ($msgid, @msg) 1672=item $player->ext_reply ($msgid, @msg)
1679 1673
1680Sends an ext reply to the player. 1674Sends an ext reply to the player.
1681 1675
1748our $MAX_RESET = 3600; 1742our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1743our $DEFAULT_RESET = 3000;
1750 1744
1751sub generate_random_map { 1745sub generate_random_map {
1752 my ($self, $rmp) = @_; 1746 my ($self, $rmp) = @_;
1747
1748 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1749
1753 # mit "rum" bekleckern, nicht 1750 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1751 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1752 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1753 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1754 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1876
1880# the temporary/swap location 1877# the temporary/swap location
1881sub save_path { 1878sub save_path {
1882 my ($self) = @_; 1879 my ($self) = @_;
1883 1880
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1881 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1882 "$TMPDIR/$path.map"
1886} 1883}
1887 1884
1888# the unique path, undef == no special unique path 1885# the unique path, undef == no special unique path
1889sub uniq_path { 1886sub uniq_path {
1890 my ($self) = @_; 1887 my ($self) = @_;
1891 1888
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1889 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1890 "$UNIQUEDIR/$path"
1894} 1891}
1895 1892
1896# and all this just because we cannot iterate over 1893# and all this just because we cannot iterate over
1897# all maps in C++... 1894# all maps in C++...
1995 1992
1996 cf::lock_wait "map_data:$path";#d#remove 1993 cf::lock_wait "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1994 cf::lock_wait "map_find:$path";
1998 1995
1999 $cf::MAP{$path} || do { 1996 $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 1997 my $guard1 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1998 my $guard2 = cf::lock_acquire "map_find:$path";
2002 1999
2003 my $map = new_from_path cf::map $path 2000 my $map = new_from_path cf::map $path
2004 or return; 2001 or return;
2005 2002
2006 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
2009 or return; 2006 or return;
2010 2007
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
2014 undef $guard1; 2012 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 2013 $map->reset;
2017 return find $path; 2014 return find $path;
2018 } 2015 }
2019 2016
2020 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2045 $f->skip_block;
2049 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
2050 or return; 2047 or return;
2051 2048
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
2053 if delete $self->{load_original}; 2050 if delete $self->{load_original};
2054 2051
2055 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2053 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
2083 } 2080 }
2084 2081
2085 $self->{last_save} = $cf::RUNTIME; 2082 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2083 $self->last_access ($cf::RUNTIME);
2087 2084
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2085 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2086 }
2090 2087
2091 $self->post_load; 2088 $self->post_load;
2092} 2089}
2093 2090
2151 my ($path, $origin, $load) = @_; 2148 my ($path, $origin, $load) = @_;
2152 2149
2153 $path = normalise $path, $origin && $origin->{path}; 2150 $path = normalise $path, $origin && $origin->{path};
2154 2151
2155 if (my $map = $cf::MAP{$path}) { 2152 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2153 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2154 }
2158 2155
2159 $MAP_PREFETCH{$path} |= $load; 2156 $MAP_PREFETCH{$path} |= $load;
2160 2157
2161 $MAP_PREFETCHER ||= cf::async { 2158 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2195 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2196 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2197 $_->contr->save for $self->players;
2201 }; 2198 };
2202 2199
2200 cf::get_slot 0.02;
2201
2203 if ($uniq) { 2202 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2203 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2204 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2205 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2206 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2215 $self->save; 2214 $self->save;
2216 2215
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2216 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2217
2219 return if $self->players; 2218 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2219 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2220 return if $self->{deny_save};
2222 2221
2223 $self->in_memory (cf::MAP_SWAPPED); 2222 $self->in_memory (cf::MAP_SWAPPED);
2224 2223
2225 $self->deactivate; 2224 $self->deactivate;
2343 2342
2344sub unique_maps() { 2343sub unique_maps() {
2345 [ 2344 [
2346 map { 2345 map {
2347 utf8::decode $_; 2346 utf8::decode $_;
2348 /\.map$/ 2347 s/\.map$//; # TODO future compatibility hack
2348 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2349 ? ()
2349 ? normalise $_ 2350 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2351 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2352 ]
2353} 2353}
2354 2354
2355package cf;
2356
2357=back 2355=back
2358 2356
2359=head3 cf::object 2357=head3 cf::object
2360 2358
2361=cut 2359=cut
2364 2362
2365=over 4 2363=over 4
2366 2364
2367=item $ob->inv_recursive 2365=item $ob->inv_recursive
2368 2366
2369Returns the inventory of the object _and_ their inventories, recursively. 2367Returns the inventory of the object I<and> their inventories, recursively,
2368but I<not> the object itself.
2370 2369
2371=cut 2370=cut
2372 2371
2373sub inv_recursive_; 2372sub inv_recursive_;
2374sub inv_recursive_ { 2373sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2378 inv_recursive_ inv $_[0]
2380} 2379}
2381 2380
2382=item $ref = $ob->ref 2381=item $ref = $ob->ref
2383 2382
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2383Creates and returns a persistent reference to an object that can be stored as a string.
2385 2384
2386=item $ob = cf::object::deref ($refstring) 2385=item $ob = cf::object::deref ($refstring)
2387 2386
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2387returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2388even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2420can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2421dialogue with the given NPC character.
2423 2422
2424=cut 2423=cut
2425 2424
2425our $SAY_CHANNEL = {
2426 id => "say",
2427 title => "Map",
2428 reply => "say ",
2429 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2430};
2431
2432our $CHAT_CHANNEL = {
2433 id => "chat",
2434 title => "Chat",
2435 reply => "chat ",
2436 tooltip => "Player chat and shouts, global to the server.",
2437};
2438
2426# rough implementation of a future "reply" method that works 2439# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2440# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2441#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2442sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2443 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2454 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2455 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2456
2444 } else { 2457 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2458 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2459 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2460 }
2448 } 2461 }
2449} 2462}
2450 2463
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2464=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2489
2477=item $player_object->enter_link 2490=item $player_object->enter_link
2478 2491
2479Freezes the player and moves him/her to a special map (C<{link}>). 2492Freezes the player and moves him/her to a special map (C<{link}>).
2480 2493
2481The player should be reasonably safe there for short amounts of time. You 2494The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2495for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2496though, as the palyer cannot control the character while it is on the link
2497map.
2483 2498
2484Will never block. 2499Will never block.
2485 2500
2486=item $player_object->leave_link ($map, $x, $y) 2501=item $player_object->leave_link ($map, $x, $y)
2487 2502
2545 2560
2546 $map->load; 2561 $map->load;
2547 $map->load_neighbours; 2562 $map->load_neighbours;
2548 2563
2549 return unless $self->contr->active; 2564 return unless $self->contr->active;
2565 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2550 $self->activate_recursive; 2566 $self->activate_recursive;
2551 2567
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2568 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2569 $self->enter_map ($map, $x, $y);
2554} 2570}
2558Moves the player to the given map-path and coordinates by first freezing 2574Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2575her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2576that 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 2577the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2578be called at the end of this process.
2579
2580Note that $check will be called with a potentially non-loaded map, so if
2581it needs a loaded map it has to call C<< ->load >>.
2563 2582
2564=cut 2583=cut
2565 2584
2566our $GOTOGEN; 2585our $GOTOGEN;
2567 2586
2646} 2665}
2647 2666
2648sub prepare_random_map { 2667sub prepare_random_map {
2649 my ($exit) = @_; 2668 my ($exit) = @_;
2650 2669
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2670 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2671 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2672 # that depends on the exit object
2656 2673
2657 my $rmp = parse_random_map_params $exit->msg; 2674 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2676 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2677 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2678 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2679 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2680 $rmp->{origin_y} = $exit->y;
2681
2682 $exit->map->touch;
2664 } 2683 }
2665 2684
2666 $rmp->{random_seed} ||= $exit->random_seed; 2685 $rmp->{random_seed} ||= $exit->random_seed;
2667 2686
2668 my $data = cf::encode_json $rmp; 2687 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2688 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2689 my $meta = "$RANDOMDIR/$md5.meta";
2671 2690
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2691 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2692 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2693 undef $fh;
2675 aio_rename "$meta~", $meta; 2694 aio_rename "$meta~", $meta;
2676 2695
2696 my $slaying = "?random/$md5";
2697
2698 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2699 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2700 $exit->msg (undef);
2701 }
2679 } 2702 }
2680} 2703}
2681 2704
2682sub cf::object::player::enter_exit { 2705sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2706 my ($self, $exit) = @_;
2684 2707
2685 return unless $self->type == cf::PLAYER; 2708 return unless $self->type == cf::PLAYER;
2686 2709
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; 2710 $self->enter_link;
2699 2711
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 { 2712 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2713 $Coro::current->{desc} = "enter_exit";
2706 2714
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2715 unless (eval {
2716 $self->deactivate_recursive; # just to be sure
2717
2718 # random map handling
2719 {
2720 my $guard = cf::lock_acquire "exit_prepare:$exit";
2721
2722 prepare_random_map $exit
2723 if $exit->slaying eq "/!";
2724 }
2725
2726 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2727 my $x = $exit->stats->hp;
2728 my $y = $exit->stats->sp;
2729
2709 $self->goto ($slaying, $hp, $sp); 2730 $self->goto ($map, $x, $y);
2710 2731
2732 # if exit is damned, update players death & WoR home-position
2733 $self->contr->savebed ($map, $x, $y)
2734 if $exit->flag (cf::FLAG_DAMNED);
2735
2711 1; 2736 1
2712 }) { 2737 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2738 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2739 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2740 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2741 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2742
2718 warn "ERROR in enter_exit: $@"; 2743 warn "ERROR in enter_exit: $@";
2784 id => "infobox", 2809 id => "infobox",
2785 title => "Body Parts", 2810 title => "Body Parts",
2786 reply => undef, 2811 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2812 tooltip => "Shows which body parts you posess and are available",
2788 }, 2813 },
2814 "c/skills" => {
2815 id => "infobox",
2816 title => "Skills",
2817 reply => undef,
2818 tooltip => "Shows your experience per skill and item power",
2819 },
2789 "c/uptime" => { 2820 "c/uptime" => {
2790 id => "infobox", 2821 id => "infobox",
2791 title => "Uptime", 2822 title => "Uptime",
2792 reply => undef, 2823 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2824 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2827 id => "infobox",
2797 title => "Map Info", 2828 title => "Map Info",
2798 reply => undef, 2829 reply => undef,
2799 tooltip => "Information related to the maps", 2830 tooltip => "Information related to the maps",
2800 }, 2831 },
2832 "c/party" => {
2833 id => "party",
2834 title => "Party",
2835 reply => "gsay ",
2836 tooltip => "Messages and chat related to your party",
2837 },
2801); 2838);
2802 2839
2803sub cf::client::send_msg { 2840sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2841 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2842
2806 $msg = $self->pl->expand_cfpod ($msg); 2843 $msg = $self->pl->expand_cfpod ($msg)
2844 unless $color & cf::NDI_VERBATIM;
2807 2845
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2846 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2847
2810 # check predefined channels, for the benefit of C 2848 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2849 if ($CHANNEL{$channel}) {
2832 if ($self->can_msg) { 2870 if ($self->can_msg) {
2833 # default colour, mask it out 2871 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2872 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2873 if $color & cf::NDI_DEF;
2836 2874
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2875 my $pkt = "msg "
2876 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2877 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2878 );
2879
2880 # try lzf for large packets
2881 $pkt = "lzf " . Compress::LZF::compress $pkt
2882 if 1024 <= length $pkt and $self->{can_lzf};
2883
2884 # split very large packets
2885 if (8192 < length $pkt and $self->{can_lzf}) {
2886 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2887 $pkt = "frag";
2888 }
2889
2890 $self->send_packet ($pkt);
2839 } else { 2891 } else {
2840 if ($color >= 0) { 2892 if ($color >= 0) {
2841 # replace some tags by gcfclient-compatible ones 2893 # replace some tags by gcfclient-compatible ones
2842 for ($msg) { 2894 for ($msg) {
2843 1 while 2895 1 while
3042 3094
3043The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3044 3096
3045 cf::object 3097 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3048 3100
3049 cf::object::player 3101 cf::object::player
3050 player 3102 player
3051 3103
3052 cf::player 3104 cf::player
3057 3109
3058=cut 3110=cut
3059 3111
3060for ( 3112for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3113 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3114 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3115 decrease split destroy change_exp)],
3064 ["cf::object::player" => qw(player)], 3116 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3117 ["cf::player" => qw(peaceful)],
3066 ["cf::map" => qw(trigger)], 3118 ["cf::map" => qw(trigger)],
3067) { 3119) {
3068 no strict 'refs'; 3120 no strict 'refs';
3276 while (my ($k, $v) = each %$want) { 3328 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3329 $ns->fx_want ($k, $v);
3278 } 3330 }
3279}; 3331};
3280 3332
3333sub load_resource_file($) {
3334 my $guard = lock_acquire "load_resource_file";
3335
3336 my $status = load_resource_file_ $_[0];
3337 get_slot 0.1, 100;
3338 cf::arch::commit_load;
3339
3340 $status
3341}
3342
3281sub reload_regions { 3343sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3344 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3345 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3346 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3347
3298} 3360}
3299 3361
3300sub reload_archetypes { 3362sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3364 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} 3365}
3309 3366
3310sub reload_treasures { 3367sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
3313} 3370}
3314 3371
3315sub reload_resources { 3372sub reload_resources {
3316 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
3317 3374
3375 reload_facedata;
3376 reload_archetypes;
3318 reload_regions; 3377 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3378 reload_treasures;
3323 3379
3324 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3381}
3330 3382
3331sub reload_config { 3383sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3385 or return;
3347 }; 3399 };
3348 warn $@ if $@; 3400 warn $@ if $@;
3349 } 3401 }
3350} 3402}
3351 3403
3404sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!";
3407 flock $fh, &Fcntl::LOCK_EX
3408 or die "$PIDFILE: flock: $!";
3409 $fh
3410}
3411
3412# make sure only one server instance is running at any one time
3413sub atomic {
3414 my $fh = pidfile;
3415
3416 my $pid = <$fh>;
3417 kill 9, $pid if $pid > 0;
3418
3419 seek $fh, 0, 0;
3420 print $fh $$;
3421}
3422
3352sub main { 3423sub main {
3424 cf::init_globals; # initialise logging
3425
3426 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3427 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3428 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3429 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3430
3431 cf::init_experience;
3432 cf::init_anim;
3433 cf::init_attackmess;
3434 cf::init_dynamic;
3435 cf::init_block;
3436
3437 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3438
3353 # we must not ever block the main coroutine 3439 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3440 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3441 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3442 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3443 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3444 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3445 })->prio (Coro::PRIO_MAX);
3360 }; 3446 };
3361 3447
3448 evthread_start IO::AIO::poll_fileno;
3449
3450 cf::sync_job {
3451 reload_resources;
3362 reload_config; 3452 reload_config;
3363 db_init; 3453 db_init;
3454
3455 cf::load_settings;
3456 cf::load_materials;
3457 cf::init_uuid;
3458 cf::init_signals;
3459 cf::init_commands;
3460 cf::init_skills;
3461
3462 cf::init_beforeplay;
3463
3464 atomic;
3465
3364 load_extensions; 3466 load_extensions;
3365 3467
3366 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3468 utime time, time, $RUNTIMEFILE;
3367 evthread_start; 3469
3470 # no (long-running) fork's whatsoever before this point(!)
3471 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3472
3473 (pop @POST_INIT)->(0) while @POST_INIT;
3474 };
3475
3368 EV::loop; 3476 EV::loop;
3369} 3477}
3370 3478
3371############################################################################# 3479#############################################################################
3372# initialisation and cleanup 3480# initialisation and cleanup
3379 cf::cleanup "SIG$signal"; 3487 cf::cleanup "SIG$signal";
3380 }; 3488 };
3381 } 3489 }
3382} 3490}
3383 3491
3384sub write_runtime { 3492sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3493 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3494 # the fsync below can take a very very long time.
3389 3495
3390 IO::AIO::aio_utime $runtime, undef, undef; 3496 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3497
3392 my $guard = cf::lock_acquire "write_runtime"; 3498 my $guard = cf::lock_acquire "write_runtime";
3393 3499
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3501 or return;
3396 3502
3397 my $value = $cf::RUNTIME + 90 + 10; 3503 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3504 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3505 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3515 aio_utime $fh, undef, undef;
3410 3516
3411 close $fh 3517 close $fh
3412 or return; 3518 or return;
3413 3519
3414 aio_rename "$runtime~", $runtime 3520 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3521 and return;
3416 3522
3417 warn "runtime file written.\n"; 3523 warn "runtime file written.\n";
3418 3524
3419 1 3525 1
3526}
3527
3528our $uuid_lock;
3529our $uuid_skip;
3530
3531sub write_uuid_sync($) {
3532 $uuid_skip ||= $_[0];
3533
3534 return if $uuid_lock;
3535 local $uuid_lock = 1;
3536
3537 my $uuid = "$LOCALDIR/uuid";
3538
3539 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3540 or return;
3541
3542 my $value = uuid_seq uuid_cur;
3543
3544 unless ($value) {
3545 warn "cowardly refusing to write zero uuid value!\n";
3546 return;
3547 }
3548
3549 my $value = uuid_str $value + $uuid_skip;
3550 $uuid_skip = 0;
3551
3552 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3553 and return;
3554
3555 # always fsync - this file is important
3556 aio_fsync $fh
3557 and return;
3558
3559 close $fh
3560 or return;
3561
3562 aio_rename "$uuid~", $uuid
3563 and return;
3564
3565 warn "uuid file written ($value).\n";
3566
3567 1
3568
3569}
3570
3571sub write_uuid($$) {
3572 my ($skip, $sync) = @_;
3573
3574 $sync ? write_uuid_sync $skip
3575 : async { write_uuid_sync $skip };
3420} 3576}
3421 3577
3422sub emergency_save() { 3578sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3579 my $freeze_guard = cf::freeze_mainloop;
3424 3580
3425 warn "enter emergency perl save\n"; 3581 warn "emergency_perl_save: enter\n";
3426 3582
3427 cf::sync_job { 3583 cf::sync_job {
3584 # this is a trade-off: we want to be very quick here, so
3585 # save all maps without fsync, and later call a global sync
3586 # (which in turn might be very very slow)
3587 local $USE_FSYNC = 0;
3588
3428 # use a peculiar iteration method to avoid tripping on perl 3589 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3590 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3591 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3592 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3593 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3594 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3595 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3596 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3597 $pl->save;
3437 } 3598 }
3438 warn "end emergency player save\n"; 3599 warn "emergency_perl_save: end player save\n";
3439 3600
3440 warn "begin emergency map save\n"; 3601 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3602 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3603 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3604 $map->valid or next;
3444 $map->save; 3605 $map->save;
3445 } 3606 }
3446 warn "end emergency map save\n"; 3607 warn "emergency_perl_save: end map save\n";
3447 3608
3448 warn "begin emergency database checkpoint\n"; 3609 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3610 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3611 warn "emergency_perl_save: end database checkpoint\n";
3612
3613 warn "emergency_perl_save: begin write uuid\n";
3614 write_uuid_sync 1;
3615 warn "emergency_perl_save: end write uuid\n";
3451 }; 3616 };
3452 3617
3618 warn "emergency_perl_save: starting sync()\n";
3619 IO::AIO::aio_sync sub {
3620 warn "emergency_perl_save: finished sync()\n";
3621 };
3622
3453 warn "leave emergency perl save\n"; 3623 warn "emergency_perl_save: leave\n";
3454} 3624}
3455 3625
3456sub post_cleanup { 3626sub post_cleanup {
3457 my ($make_core) = @_; 3627 my ($make_core) = @_;
3458 3628
3459 warn Carp::longmess "post_cleanup backtrace" 3629 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3630 if $make_core;
3631
3632 my $fh = pidfile;
3633 unlink $PIDFILE if <$fh> == $$;
3634}
3635
3636# a safer delete_package, copied from Symbol
3637sub clear_package($) {
3638 my $pkg = shift;
3639
3640 # expand to full symbol table name if needed
3641 unless ($pkg =~ /^main::.*::$/) {
3642 $pkg = "main$pkg" if $pkg =~ /^::/;
3643 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3644 $pkg .= '::' unless $pkg =~ /::$/;
3645 }
3646
3647 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3648 my $stem_symtab = *{$stem}{HASH};
3649
3650 defined $stem_symtab and exists $stem_symtab->{$leaf}
3651 or return;
3652
3653 # clear all symbols
3654 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3655 for my $name (keys %$leaf_symtab) {
3656 _gv_clear *{"$pkg$name"};
3657# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3658 }
3659 warn "cleared package $pkg\n";#d#
3461} 3660}
3462 3661
3463sub do_reload_perl() { 3662sub do_reload_perl() {
3464 # can/must only be called in main 3663 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3664 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3665 warn "can only reload from main coroutine";
3467 return; 3666 return;
3468 } 3667 }
3469 3668
3669 return if $RELOAD++;
3670
3671 my $t1 = EV::time;
3672
3673 while ($RELOAD) {
3470 warn "reloading..."; 3674 warn "reloading...";
3471 3675
3472 warn "entering sync_job"; 3676 warn "entering sync_job";
3473 3677
3474 cf::sync_job { 3678 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3679 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3680 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3681 cf::write_runtime_sync; # external watchdog should not bark
3478 3682
3479 warn "syncing database to disk"; 3683 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3684 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3685
3482 # if anything goes wrong in here, we should simply crash as we already saved 3686 # if anything goes wrong in here, we should simply crash as we already saved
3483 3687
3484 warn "flushing outstanding aio requests"; 3688 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; 3689 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3690 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 } 3691 }
3516 3692
3517 warn "... nuking $pkg"; 3693 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3694 $_->cancel for values %EXT_CORO;
3519 } 3695 %EXT_CORO = ();
3520 3696
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3697 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3698 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3699
3700 warn "removing ext/exti commands";
3701 %EXTCMD = ();
3702 %EXTICMD = ();
3703
3704 warn "unloading/nuking all extensions";
3705 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3706 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3707
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3708 if (my $cb = $pkg->can ("unload")) {
3709 eval {
3532 $cb->(); 3710 $cb->($pkg);
3711 1
3712 } or warn "$pkg unloaded, but with errors: $@";
3713 }
3714
3715 warn "... clearing $pkg";
3716 clear_package $pkg;
3533 } 3717 }
3534 3718
3535 Symbol::delete_package $k; 3719 warn "unloading all perl modules loaded from $LIBDIR";
3720 while (my ($k, $v) = each %INC) {
3721 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3722
3723 warn "... unloading $k";
3724 delete $INC{$k};
3725
3726 $k =~ s/\.pm$//;
3727 $k =~ s/\//::/g;
3728
3729 if (my $cb = $k->can ("unload_module")) {
3730 $cb->();
3731 }
3732
3733 clear_package $k;
3536 } 3734 }
3537 3735
3538 warn "getting rid of safe::, as good as possible"; 3736 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3737 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3738 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3739
3542 warn "unloading cf.pm \"a bit\""; 3740 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3741 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3742 delete $INC{"cf/pod.pm"};
3545 3743
3546 # don't, removes xs symbols, too, 3744 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3745 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3746 #clear_package __PACKAGE__;
3549 3747
3550 warn "unload completed, starting to reload now"; 3748 warn "unload completed, starting to reload now";
3551 3749
3552 warn "reloading cf.pm"; 3750 warn "reloading cf.pm";
3553 require cf; 3751 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3752 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3753
3556 warn "loading config and database again"; 3754 warn "loading config and database again";
3557 cf::reload_config; 3755 cf::reload_config;
3558 3756
3559 warn "loading extensions"; 3757 warn "loading extensions";
3560 cf::load_extensions; 3758 cf::load_extensions;
3561 3759
3760 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3761 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3762 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3763 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3764 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3765 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3766 reattach $_ for values %PLAYER;
3767 }
3568 3768
3769 warn "running post_init jobs";
3770 (pop @POST_INIT)->(1) while @POST_INIT;
3771
3569 warn "leaving sync_job"; 3772 warn "leaving sync_job";
3570 3773
3571 1 3774 1
3572 } or do { 3775 } or do {
3573 warn $@; 3776 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3777 cf::cleanup "error while reloading, exiting.";
3575 }; 3778 };
3576 3779
3577 warn "reloaded"; 3780 warn "reloaded";
3781 --$RELOAD;
3782 }
3783
3784 $t1 = EV::time - $t1;
3785 warn "reload completed in ${t1}s\n";
3578}; 3786};
3579 3787
3580our $RELOAD_WATCHER; # used only during reload 3788our $RELOAD_WATCHER; # used only during reload
3581 3789
3582sub reload_perl() { 3790sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3791 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3792 # coro crashes during coro_state_free->destroy here.
3585 3793
3794 $RELOAD_WATCHER ||= cf::async {
3795 Coro::AIO::aio_wait cache_extensions;
3796
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3797 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3798 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3799 undef $RELOAD_WATCHER;
3800 };
3589 }; 3801 };
3590} 3802}
3591 3803
3592register_command "reload" => sub { 3804register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3805 my ($who, $arg) = @_;
3607 3819
3608our @WAIT_FOR_TICK; 3820our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3821our @WAIT_FOR_TICK_BEGIN;
3610 3822
3611sub wait_for_tick { 3823sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3824 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3825
3615 my $signal = new Coro::Signal; 3826 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3827 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3828 $signal->wait;
3618} 3829}
3619 3830
3620sub wait_for_tick_begin { 3831sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3832 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3833
3624 my $signal = new Coro::Signal; 3834 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3835 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3836 $signal->wait;
3627} 3837}
3637 3847
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3848 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3849 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3850 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3851 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3852 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3853 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3854 };
3645 } 3855 }
3646 3856
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3857 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3876{
3667 # configure BDB 3877 # configure BDB
3668 3878
3669 BDB::min_parallel 8; 3879 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3880 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3881 $AnyEvent::BDB::WATCHER->priority (1);
3672 3882
3673 unless ($DB_ENV) { 3883 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3884 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3885 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3886 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3887 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3888 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3889 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3890
3680 cf::sync_job { 3891 cf::sync_job {
3681 eval { 3892 eval {
3707{ 3918{
3708 # configure IO::AIO 3919 # configure IO::AIO
3709 3920
3710 IO::AIO::min_parallel 8; 3921 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3922 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3923 undef $AnyEvent::AIO::WATCHER;
3713} 3924}
3714 3925
3715my $_log_backtrace; 3926my $_log_backtrace;
3716 3927
3717sub _log_backtrace { 3928sub _log_backtrace {
3720 $msg =~ s/\n//; 3931 $msg =~ s/\n//;
3721 3932
3722 # limit the # of concurrent backtraces 3933 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3934 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3935 ++$_log_backtrace;
3936 my $perl_bt = Carp::longmess $msg;
3725 async { 3937 async {
3726 $Coro::current->{desc} = "abt $msg"; 3938 $Coro::current->{desc} = "abt $msg";
3727 3939
3728 my @bt = fork_call { 3940 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3941 @addr = map { sprintf "%x", $_ } @addr;
3740 } 3952 }
3741 3953
3742 @funcs 3954 @funcs
3743 }; 3955 };
3744 3956
3745 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $perl_bt\n";
3958 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3959 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3960 --$_log_backtrace;
3748 }; 3961 };
3749 } else { 3962 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3963 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines