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.413 by root, Sun Apr 6 16:13:20 2008 UTC vs.
Revision 1.466 by root, Thu Jan 8 03:03:24 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.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::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
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 76
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 78
69our %COMMAND = (); 79our %COMMAND = ();
70our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
73our %EXTCMD = (); 83our %EXTCMD = ();
74our %EXTICMD = (); 84our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
77 87
78our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 89our @EVENT;
80 90
81our $CONFDIR = confdir; 91our $CONFDIR = confdir;
82our $DATADIR = datadir; 92our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
92our %RESOURCE; 105our %RESOURCE;
93 106
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 109our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default off
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
106our %CFG; 119our %CFG;
107 120
108our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 122our $RUNTIME;
110our $NOW; 123our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 134our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
123 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
124binmode STDOUT; 141binmode STDOUT;
125binmode STDERR; 142binmode STDERR;
126 143
127# read virtual server time, if available 144# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
132} 149}
133 150
134mkdir $_ 151mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 152 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
242for my $pkg (qw( 259for my $pkg (qw(
243 cf::global cf::attachable 260 cf::global cf::attachable
244 cf::object cf::object::player 261 cf::object cf::object::player
245 cf::client cf::player 262 cf::client cf::player
246 cf::arch cf::living 263 cf::arch cf::living
264 cf::map cf::mapspace
247 cf::map cf::party cf::region 265 cf::party cf::region
248)) { 266)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 267 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 268}
252 269
253$EV::DIED = sub { 270$EV::DIED = sub {
254 warn "error in event callback: @_"; 271 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 313our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 314
298sub encode_json($) { $json_coder->encode ($_[0]) } 315sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 316sub decode_json($) { $json_coder->decode ($_[0]) }
300 317
318=item cf::post_init { BLOCK }
319
320Execute the given codeblock, I<after> all extensions have been (re-)loaded,
321but I<before> the server starts ticking again.
322
323The cdoeblock will have a single boolean argument to indicate whether this
324is a reload or not.
325
326=cut
327
328sub post_init(&) {
329 push @POST_INIT, shift;
330}
331
301=item cf::lock_wait $string 332=item cf::lock_wait $string
302 333
303Wait until the given lock is available. See cf::lock_acquire. 334Wait until the given lock is available. See cf::lock_acquire.
304 335
305=item my $lock = cf::lock_acquire $string 336=item my $lock = cf::lock_acquire $string
306 337
307Wait until the given lock is available and then acquires it and returns 338Wait 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, 339a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 340for example when the coroutine gets canceled), the lock is automatically
310returned. 341returned.
311 342
312Locks are *not* recursive, locking from the same coro twice results in a 343Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 344deadlocked coro.
319 350
320Return true if the lock is currently active, i.e. somebody has locked it. 351Return true if the lock is currently active, i.e. somebody has locked it.
321 352
322=cut 353=cut
323 354
324our %LOCK; 355our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 356
327sub lock_wait($) { 357sub lock_wait($) {
328 my ($key) = @_; 358 $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} 359}
341 360
342sub lock_acquire($) { 361sub lock_acquire($) {
343 my ($key) = @_; 362 $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} 363}
357 364
358sub lock_active($) { 365sub lock_active($) {
359 my ($key) = @_; 366 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 367}
363 368
364sub freeze_mainloop { 369sub freeze_mainloop {
365 tick_inhibit_inc; 370 tick_inhibit_inc;
366 371
367 Coro::guard \&tick_inhibit_dec; 372 &Guard::guard (\&tick_inhibit_dec);
368} 373}
369 374
370=item cf::periodic $interval, $cb 375=item cf::periodic $interval, $cb
371 376
372Like EV::periodic, but randomly selects a starting point so that the actions 377Like EV::periodic, but randomly selects a starting point so that the actions
427 } 432 }
428 } 433 }
429}; 434};
430 435
431sub get_slot($;$$) { 436sub get_slot($;$$) {
437 return if tick_inhibit || $Coro::current == $Coro::main;
438
432 my ($time, $pri, $name) = @_; 439 my ($time, $pri, $name) = @_;
433 440
434 $time = $TICK * .6 if $time > $TICK * .6; 441 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 442 my $sig = new Coro::Signal;
436 443
547 reset_signals; 554 reset_signals;
548 &$cb 555 &$cb
549 }, @args; 556 }, @args;
550 557
551 wantarray ? @res : $res[-1] 558 wantarray ? @res : $res[-1]
559}
560
561=item $coin = coin_from_name $name
562
563=cut
564
565our %coin_alias = (
566 "silver" => "silvercoin",
567 "silvercoin" => "silvercoin",
568 "silvercoins" => "silvercoin",
569 "gold" => "goldcoin",
570 "goldcoin" => "goldcoin",
571 "goldcoins" => "goldcoin",
572 "platinum" => "platinacoin",
573 "platinumcoin" => "platinacoin",
574 "platinumcoins" => "platinacoin",
575 "platina" => "platinacoin",
576 "platinacoin" => "platinacoin",
577 "platinacoins" => "platinacoin",
578 "royalty" => "royalty",
579 "royalties" => "royalty",
580);
581
582sub coin_from_name($) {
583 $coin_alias{$_[0]}
584 ? cf::arch::find $coin_alias{$_[0]}
585 : undef
552} 586}
553 587
554=item $value = cf::db_get $family => $key 588=item $value = cf::db_get $family => $key
555 589
556Returns a single value from the environment database. 590Returns a single value from the environment database.
695 729
696############################################################################# 730#############################################################################
697 731
698=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
699 733
700Many objects in crossfire are so-called attachable objects. That means you can 734Many objects in deliantra are so-called attachable objects. That means you can
701attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
702to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
703 737
704In the following description, CLASS can be any of C<global>, C<object> 738In 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 739C<player>, C<client> or C<map> (i.e. the attachable objects in
755=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
756 790
757Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
758given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
759 793
760Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
761that are attached at load/instantiate time, thus the need for a name. 795that are attached at load/instantiate time, thus the need for a name.
762 796
763These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
764 798
765=over 4 799=over 4
1056 1090
1057sub reattach { 1091sub reattach {
1058 # basically do the same as instantiate, without calling instantiate 1092 # basically do the same as instantiate, without calling instantiate
1059 my ($obj) = @_; 1093 my ($obj) = @_;
1060 1094
1095 # no longer needed after getting rid of delete_package?
1061 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1096 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1062 1097
1063 my $registry = $obj->registry; 1098 my $registry = $obj->registry;
1064 1099
1065 @$registry = (); 1100 @$registry = ();
1066 1101
1112 utf8::decode (my $decname = $filename); 1147 utf8::decode (my $decname = $filename);
1113 warn sprintf "saving %s (%d,%d)\n", 1148 warn sprintf "saving %s (%d,%d)\n",
1114 $decname, length $$rdata, scalar @$objs; 1149 $decname, length $$rdata, scalar @$objs;
1115 1150
1116 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1117 chmod SAVE_MODE, $fh; 1152 aio_chmod $fh, SAVE_MODE;
1118 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1119 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1120 close $fh; 1155 aio_close $fh;
1121 1156
1122 if (@$objs) { 1157 if (@$objs) {
1123 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1158 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1124 chmod SAVE_MODE, $fh; 1159 aio_chmod $fh, SAVE_MODE;
1125 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1126 aio_write $fh, 0, (length $data), $data, 0; 1161 aio_write $fh, 0, (length $data), $data, 0;
1127 aio_fsync $fh if $cf::USE_FSYNC; 1162 aio_fsync $fh if $cf::USE_FSYNC;
1128 close $fh; 1163 aio_close $fh;
1129 aio_rename "$filename.pst~", "$filename.pst"; 1164 aio_rename "$filename.pst~", "$filename.pst";
1130 } 1165 }
1131 } else { 1166 } else {
1132 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1133 } 1168 }
1134 1169
1135 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1136 } else { 1174 } else {
1137 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1138 } 1176 }
1139 } else { 1177 } else {
1140 aio_unlink $filename; 1178 aio_unlink $filename;
1141 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1142 } 1180 }
1233 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1234 1272
1235 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1236} 1274}
1237 1275
1276use File::Glob ();
1277
1238cf::player->attach ( 1278cf::player->attach (
1239 on_command => sub { 1279 on_command => sub {
1240 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1241 1281
1242 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
1274 1314
1275 cf::override; 1315 cf::override;
1276 }, 1316 },
1277); 1317);
1278 1318
1319# "readahead" all extensions
1320sub cache_extensions {
1321 my $grp = IO::AIO::aio_group;
1322
1323 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1324 for (grep /\.ext$/, @{$_[0]}) {
1325 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1326 }
1327 };
1328
1329 $grp
1330}
1331
1279sub load_extensions { 1332sub load_extensions {
1280 cf::sync_job { 1333 cf::sync_job {
1281 my %todo; 1334 my %todo;
1282 1335
1283 for my $path (<$LIBDIR/*.ext>) { 1336 for my $path (<$LIBDIR/*.ext>) {
1302 1355
1303 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1304 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1305 1358
1306 $ext{source} = 1359 $ext{source} =
1307 "package $pkg; use strict; use utf8;\n" 1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1308 . "#line 1 \"$path\"\n{\n" 1361 . "#line 1 \"$path\"\n{\n"
1309 . $source 1362 . $source
1310 . "\n};\n1"; 1363 . "\n};\n1";
1311 1364
1312 $todo{$base} = \%ext; 1365 $todo{$base} = \%ext;
1352 1405
1353=back 1406=back
1354 1407
1355=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1356 1409
1357Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1358 1411
1359=cut 1412=cut
1360 1413
1361package cf::player; 1414package cf::player;
1362 1415
1405 1458
1406sub exists($) { 1459sub exists($) {
1407 my ($login) = @_; 1460 my ($login) = @_;
1408 1461
1409 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1410 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1411} 1464}
1412 1465
1413sub find($) { 1466sub find($) {
1414 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1415 my $login = $_[0]; 1468 my $login = $_[0];
1427 my $f = new_from_file cf::object::thawer path $login 1480 my $f = new_from_file cf::object::thawer path $login
1428 or return; 1481 or return;
1429 1482
1430 my $pl = cf::player::load_pl $f 1483 my $pl = cf::player::load_pl $f
1431 or return; 1484 or return;
1485
1432 local $cf::PLAYER_LOADING{$login} = $pl; 1486 local $cf::PLAYER_LOADING{$login} = $pl;
1433 $f->resolve_delayed_derefs; 1487 $f->resolve_delayed_derefs;
1434 $cf::PLAYER{$login} = $pl 1488 $cf::PLAYER{$login} = $pl
1435 } 1489 }
1436 } 1490 }
1446 1500
1447 return if $pl->{deny_save}; 1501 return if $pl->{deny_save};
1448 1502
1449 aio_mkdir playerdir $pl, 0770; 1503 aio_mkdir playerdir $pl, 0770;
1450 $pl->{last_save} = $cf::RUNTIME; 1504 $pl->{last_save} = $cf::RUNTIME;
1505
1506 cf::get_slot 0.01;
1451 1507
1452 $pl->save_pl ($path); 1508 $pl->save_pl ($path);
1453 cf::cede_to_tick; 1509 cf::cede_to_tick;
1454} 1510}
1455 1511
1487 my ($pl) = @_; 1543 my ($pl) = @_;
1488 1544
1489 my $name = $pl->ob->name; 1545 my $name = $pl->ob->name;
1490 1546
1491 $pl->{deny_save} = 1; 1547 $pl->{deny_save} = 1;
1492 $pl->password ("*"); # this should lock out the player until we nuked the dir 1548 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1493 1549
1494 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1495 $pl->deactivate; 1551 $pl->deactivate;
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1496 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1554 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1497 $pl->ns->destroy if $pl->ns; 1555 $pl->ns->destroy if $pl->ns;
1498 1556
1499 my $path = playerdir $pl; 1557 my $path = playerdir $pl;
1500 my $temp = "$path~$cf::RUNTIME~deleting~"; 1558 my $temp = "$path~$cf::RUNTIME~deleting~";
1539 1597
1540 for my $login (@$dirs) { 1598 for my $login (@$dirs) {
1541 my $path = path $login; 1599 my $path = path $login;
1542 1600
1543 # a .pst is a dead give-away for a valid player 1601 # a .pst is a dead give-away for a valid player
1544 unless (-e "$path.pst") { 1602 # if no pst file found, open and chekc for blocked users
1603 if (aio_stat "$path.pst") {
1545 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1604 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1546 aio_read $fh, 0, 512, my $buf, 0 or next; 1605 aio_read $fh, 0, 512, my $buf, 0 or next;
1547 $buf !~ /^password -------------$/m or next; # official not-valid tag 1606 $buf !~ /^password -------------$/m or next; # official not-valid tag
1548 } 1607 }
1549 1608
1580 } 1639 }
1581 1640
1582 \@paths 1641 \@paths
1583} 1642}
1584 1643
1585=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1586 1645
1587Expand crossfire pod fragments into protocol xml. 1646Expand 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 1647
1678=item $player->ext_reply ($msgid, @msg) 1648=item $player->ext_reply ($msgid, @msg)
1679 1649
1680Sends an ext reply to the player. 1650Sends an ext reply to the player.
1681 1651
1748our $MAX_RESET = 3600; 1718our $MAX_RESET = 3600;
1749our $DEFAULT_RESET = 3000; 1719our $DEFAULT_RESET = 3000;
1750 1720
1751sub generate_random_map { 1721sub generate_random_map {
1752 my ($self, $rmp) = @_; 1722 my ($self, $rmp) = @_;
1723
1724 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1725
1753 # mit "rum" bekleckern, nicht 1726 # mit "rum" bekleckern, nicht
1754 $self->_create_random_map ( 1727 $self->_create_random_map (
1755 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1756 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1757 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1879 1852
1880# the temporary/swap location 1853# the temporary/swap location
1881sub save_path { 1854sub save_path {
1882 my ($self) = @_; 1855 my ($self) = @_;
1883 1856
1884 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1857 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1885 "$TMPDIR/$path.map" 1858 "$TMPDIR/$path.map"
1886} 1859}
1887 1860
1888# the unique path, undef == no special unique path 1861# the unique path, undef == no special unique path
1889sub uniq_path { 1862sub uniq_path {
1890 my ($self) = @_; 1863 my ($self) = @_;
1891 1864
1892 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1893 "$UNIQUEDIR/$path" 1866 "$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} 1867}
1904 1868
1905sub decay_objects { 1869sub decay_objects {
1906 my ($self) = @_; 1870 my ($self) = @_;
1907 1871
1991sub find { 1955sub find {
1992 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
1993 1957
1994 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
1995 1959
1996 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1997 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
1998 1962
1999 $cf::MAP{$path} || do { 1963 $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 1964 my $map = new_from_path cf::map $path
2004 or return; 1965 or return;
2005 1966
2006 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
2007 1968
2009 or return; 1970 or return;
2010 1971
2011 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1972 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2012 # doing this can freeze the server in a sync job, obviously 1973 # doing this can freeze the server in a sync job, obviously
2013 #$cf::WAIT_FOR_TICK->wait; 1974 #$cf::WAIT_FOR_TICK->wait;
1975 undef $guard2;
2014 undef $guard1; 1976 undef $guard1;
2015 undef $guard2;
2016 $map->reset; 1977 $map->reset;
2017 return find $path; 1978 return find $path;
2018 } 1979 }
2019 1980
2020 $cf::MAP{$path} = $map 1981 $cf::MAP{$path} = $map
2047 my $f = new_from_file cf::object::thawer $self->{load_path}; 2008 my $f = new_from_file cf::object::thawer $self->{load_path};
2048 $f->skip_block; 2009 $f->skip_block;
2049 $self->_load_objects ($f) 2010 $self->_load_objects ($f)
2050 or return; 2011 or return;
2051 2012
2052 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2013 $self->post_load_original
2053 if delete $self->{load_original}; 2014 if delete $self->{load_original};
2054 2015
2055 if (my $uniq = $self->uniq_path) { 2016 if (my $uniq = $self->uniq_path) {
2056 utf8::encode $uniq; 2017 utf8::encode $uniq;
2057 unless (aio_stat $uniq) { 2018 unless (aio_stat $uniq) {
2075 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2076 $self->decay_objects; 2037 $self->decay_objects;
2077 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2078 $self->update_buttons; 2039 $self->update_buttons;
2079 cf::cede_to_tick; 2040 cf::cede_to_tick;
2080 $self->set_darkness_map;
2081 cf::cede_to_tick;
2082 $self->activate; 2041 $self->activate;
2083 } 2042 }
2084 2043
2085 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2086 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2087 2046
2088 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2089 } 2048 }
2090 2049
2091 $self->post_load; 2050 $self->post_load;
2092} 2051}
2093 2052
2151 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2152 2111
2153 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2154 2113
2155 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2156 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2157 } 2116 }
2158 2117
2159 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2160 2119
2161 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2198 cf::async { 2157 cf::async {
2199 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2200 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2201 }; 2160 };
2202 2161
2162 cf::get_slot 0.02;
2163
2203 if ($uniq) { 2164 if ($uniq) {
2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2205 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2206 } else { 2167 } else {
2207 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2168 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2215 $self->save; 2176 $self->save;
2216 2177
2217 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2218 2179
2219 return if $self->players; 2180 return if $self->players;
2220 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2221 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2222 2183
2223 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2224 2185
2225 $self->deactivate; 2186 $self->deactivate;
2343 2304
2344sub unique_maps() { 2305sub unique_maps() {
2345 [ 2306 [
2346 map { 2307 map {
2347 utf8::decode $_; 2308 utf8::decode $_;
2348 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2349 ? normalise $_ 2312 : normalise $_
2350 : ()
2351 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2352 ] 2314 ]
2353} 2315}
2354 2316
2355package cf;
2356
2357=back 2317=back
2358 2318
2359=head3 cf::object 2319=head3 cf::object
2360 2320
2361=cut 2321=cut
2364 2324
2365=over 4 2325=over 4
2366 2326
2367=item $ob->inv_recursive 2327=item $ob->inv_recursive
2368 2328
2369Returns the inventory of the object _and_ their inventories, recursively. 2329Returns the inventory of the object I<and> their inventories, recursively,
2330but I<not> the object itself.
2370 2331
2371=cut 2332=cut
2372 2333
2373sub inv_recursive_; 2334sub inv_recursive_;
2374sub inv_recursive_ { 2335sub inv_recursive_ {
2379 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2380} 2341}
2381 2342
2382=item $ref = $ob->ref 2343=item $ref = $ob->ref
2383 2344
2384creates and returns a persistent reference to an objetc that can be stored as a string. 2345Creates and returns a persistent reference to an object that can be stored as a string.
2385 2346
2386=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2387 2348
2388returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2349returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2389even if the object actually exists. May block. 2350even if the object actually exists. May block.
2421can be C<undef>. Does the right thing when the player is currently in a 2382can be C<undef>. Does the right thing when the player is currently in a
2422dialogue with the given NPC character. 2383dialogue with the given NPC character.
2423 2384
2424=cut 2385=cut
2425 2386
2387our $SAY_CHANNEL = {
2388 id => "say",
2389 title => "Map",
2390 reply => "say ",
2391 tooltip => "Things said to and replied from npcs near you and other players on the same map only.",
2392};
2393
2394our $CHAT_CHANNEL = {
2395 id => "chat",
2396 title => "Chat",
2397 reply => "chat ",
2398 tooltip => "Player chat and shouts, global to the server.",
2399};
2400
2426# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2427# with dialog boxes. 2402# with dialog boxes.
2428#TODO: the first argument must go, split into a $npc->reply_to ( method 2403#TODO: the first argument must go, split into a $npc->reply_to ( method
2429sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2430 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
2441 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2417 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2443 2418
2444 } else { 2419 } else {
2445 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2446 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2447 } 2422 }
2448 } 2423 }
2449} 2424}
2450 2425
2451=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2476 2451
2477=item $player_object->enter_link 2452=item $player_object->enter_link
2478 2453
2479Freezes the player and moves him/her to a special map (C<{link}>). 2454Freezes the player and moves him/her to a special map (C<{link}>).
2480 2455
2481The player should be reasonably safe there for short amounts of time. You 2456The player should be reasonably safe there for short amounts of time (e.g.
2482I<MUST> call C<leave_link> as soon as possible, though. 2457for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2458though, as the palyer cannot control the character while it is on the link
2459map.
2483 2460
2484Will never block. 2461Will never block.
2485 2462
2486=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2487 2464
2545 2522
2546 $map->load; 2523 $map->load;
2547 $map->load_neighbours; 2524 $map->load_neighbours;
2548 2525
2549 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2550 $self->activate_recursive; 2528 $self->activate_recursive;
2551 2529
2552 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2553 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2554} 2532}
2558Moves the player to the given map-path and coordinates by first freezing 2536Moves the player to the given map-path and coordinates by first freezing
2559her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2560that has to return the map if sucecssful, and then unfreezes the player on 2538that 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 2539the new (success) or old (failed) map position. In either case, $done will
2562be called at the end of this process. 2540be called at the end of this process.
2541
2542Note that $check will be called with a potentially non-loaded map, so if
2543it needs a loaded map it has to call C<< ->load >>.
2563 2544
2564=cut 2545=cut
2565 2546
2566our $GOTOGEN; 2547our $GOTOGEN;
2567 2548
2646} 2627}
2647 2628
2648sub prepare_random_map { 2629sub prepare_random_map {
2649 my ($exit) = @_; 2630 my ($exit) = @_;
2650 2631
2651 my $guard = cf::lock_acquire "exit_prepare:$exit";
2652
2653 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2654 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2655 # that depends on the exit object 2634 # that depends on the exit object
2656 2635
2657 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2659 if ($exit->map) { 2638 if ($exit->map) {
2660 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2661 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2662 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2663 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2664 } 2645 }
2665 2646
2666 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2667 2648
2668 my $data = cf::encode_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2669 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2670 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2671 2652
2672 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2673 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2674 undef $fh; 2655 undef $fh;
2675 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2676 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2677 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2678 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2679 } 2664 }
2680} 2665}
2681 2666
2682sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2683 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2684 2669
2685 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2686 2671
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; 2672 $self->enter_link;
2699 2673
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 { 2674 (async {
2705 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2706 2676
2707 $self->deactivate_recursive; # just to be sure
2708 unless (eval { 2677 unless (eval {
2678 $self->deactivate_recursive; # just to be sure
2679
2680 # random map handling
2681 {
2682 my $guard = cf::lock_acquire "exit_prepare:$exit";
2683
2684 prepare_random_map $exit
2685 if $exit->slaying eq "/!";
2686 }
2687
2688 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2689 my $x = $exit->stats->hp;
2690 my $y = $exit->stats->sp;
2691
2709 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2710 2693
2694 # if exit is damned, update players death & WoR home-position
2695 $self->contr->savebed ($map, $x, $y)
2696 if $exit->flag (cf::FLAG_DAMNED);
2697
2711 1; 2698 1
2712 }) { 2699 }) {
2713 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2714 . "I'll try to bring you back to the map you were before. " 2701 . "I'll try to bring you back to the map you were before. "
2715 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2716 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2717 2704
2718 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2784 id => "infobox", 2771 id => "infobox",
2785 title => "Body Parts", 2772 title => "Body Parts",
2786 reply => undef, 2773 reply => undef,
2787 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2788 }, 2775 },
2776 "c/statistics" => {
2777 id => "infobox",
2778 title => "Statistics",
2779 reply => undef,
2780 tooltip => "Shows your primary statistics",
2781 },
2782 "c/skills" => {
2783 id => "infobox",
2784 title => "Skills",
2785 reply => undef,
2786 tooltip => "Shows your experience per skill and item power",
2787 },
2788 "c/resistances" => {
2789 id => "infobox",
2790 title => "Resistances",
2791 reply => undef,
2792 tooltip => "Shows your resistances",
2793 },
2794 "c/pets" => {
2795 id => "infobox",
2796 title => "Pets",
2797 reply => undef,
2798 tooltip => "Shows information abotu your pets/a specific pet",
2799 },
2789 "c/uptime" => { 2800 "c/uptime" => {
2790 id => "infobox", 2801 id => "infobox",
2791 title => "Uptime", 2802 title => "Uptime",
2792 reply => undef, 2803 reply => undef,
2793 tooltip => "How long the server has been running since last restart", 2804 tooltip => "How long the server has been running since last restart",
2796 id => "infobox", 2807 id => "infobox",
2797 title => "Map Info", 2808 title => "Map Info",
2798 reply => undef, 2809 reply => undef,
2799 tooltip => "Information related to the maps", 2810 tooltip => "Information related to the maps",
2800 }, 2811 },
2812 "c/party" => {
2813 id => "party",
2814 title => "Party",
2815 reply => "gsay ",
2816 tooltip => "Messages and chat related to your party",
2817 },
2818 "c/death" => {
2819 id => "death",
2820 title => "Death",
2821 reply => undef,
2822 tooltip => "Reason for and more info about your most recent death",
2823 },
2824 "c/say" => $SAY_CHANNEL,
2825 "c/chat" => $CHAT_CHANNEL,
2801); 2826);
2802 2827
2803sub cf::client::send_msg { 2828sub cf::client::send_msg {
2804 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2805 2830
2806 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2807 2833
2808 $color &= cf::NDI_CLIENT_MASK; # just in case... 2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2809 2835
2810 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2811 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2812 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2813 2839
2814 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2815 if $self->can_msg;
2816
2817 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2818 2842
2819 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2820 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2821 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2822 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2823 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2824 if $self->can_msg;
2825 } 2848 }
2826 2849
2827 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2828 } 2851 }
2829 2852
2830 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2831 2854
2832 if ($self->can_msg) {
2833 # default colour, mask it out 2855 # default colour, mask it out
2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2835 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2836 2858
2837 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2859 my $pkt = "msg "
2860 . $self->{json_coder}->encode (
2838 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2839 } else { 2862 );
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 2863
2851 $color &= cf::NDI_COLOR_MASK; 2864 # try lzf for large packets
2865 $pkt = "lzf " . Compress::LZF::compress $pkt
2866 if 1024 <= length $pkt and $self->{can_lzf};
2852 2867
2853 utf8::encode $msg; 2868 # split very large packets
2854 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2855 if (0 && $msg =~ /\[/) { 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2856 # COMMAND/INFO 2871 $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 } 2872 }
2873
2874 $self->send_packet ($pkt);
2864} 2875}
2865 2876
2866=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2867 2878
2868Sends an ext event to the client. 2879Sends an ext event to the client.
3042 3053
3043The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3044 3055
3045 cf::object 3056 cf::object
3046 contr pay_amount pay_player map x y force_find force_add destroy 3057 contr pay_amount pay_player map x y force_find force_add destroy
3047 insert remove name archname title slaying race decrease_ob_nr 3058 insert remove name archname title slaying race decrease split
3059 value
3048 3060
3049 cf::object::player 3061 cf::object::player
3050 player 3062 player
3051 3063
3052 cf::player 3064 cf::player
3057 3069
3058=cut 3070=cut
3059 3071
3060for ( 3072for (
3061 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3073 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3062 insert remove inv name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3063 decrease_ob_nr destroy)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3064 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3065 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3066 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3067) { 3079) {
3068 no strict 'refs'; 3080 no strict 'refs';
3069 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3070 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3087 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3088 3100
3089 my $qcode = $code; 3101 my $qcode = $code;
3090 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3091 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3092 3106
3093 local $_; 3107 local $_;
3094 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3095 3109
3096 my $eval = 3110 my $eval =
3276 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3277 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3278 } 3292 }
3279}; 3293};
3280 3294
3295sub load_resource_file($) {
3296 my $guard = lock_acquire "load_resource_file";
3297
3298 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100;
3300 cf::arch::commit_load;
3301
3302 $status
3303}
3304
3281sub reload_regions { 3305sub reload_regions {
3282 # HACK to clear player env face cache, we need some signal framework 3306 # HACK to clear player env face cache, we need some signal framework
3283 # for this (global event?) 3307 # for this (global event?)
3284 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3285 3309
3298} 3322}
3299 3323
3300sub reload_archetypes { 3324sub reload_archetypes {
3301 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3302 or die "unable to load archetypes\n"; 3326 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} 3327}
3309 3328
3310sub reload_treasures { 3329sub reload_treasures {
3311 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3312 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3313} 3332}
3314 3333
3315sub reload_resources { 3334sub reload_resources {
3316 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3317 3336
3337 reload_facedata;
3338 reload_archetypes;
3318 reload_regions; 3339 reload_regions;
3319 reload_facedata;
3320 #reload_archetypes;#d#
3321 reload_archetypes;
3322 reload_treasures; 3340 reload_treasures;
3323 3341
3324 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3325}
3326
3327sub init {
3328 reload_resources;
3329} 3343}
3330 3344
3331sub reload_config { 3345sub reload_config {
3332 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3333 or return; 3347 or return;
3347 }; 3361 };
3348 warn $@ if $@; 3362 warn $@ if $@;
3349 } 3363 }
3350} 3364}
3351 3365
3366sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!";
3369 flock $fh, &Fcntl::LOCK_EX
3370 or die "$PIDFILE: flock: $!";
3371 $fh
3372}
3373
3374# make sure only one server instance is running at any one time
3375sub atomic {
3376 my $fh = pidfile;
3377
3378 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0;
3380
3381 seek $fh, 0, 0;
3382 print $fh $$;
3383}
3384
3352sub main { 3385sub main {
3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399
3353 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3354 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3355 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3356 (async { 3403 (async {
3357 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3358 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3359 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3360 }; 3407 };
3361 3408
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; 3409 evthread_start IO::AIO::poll_fileno;
3410
3411 cf::sync_job {
3412 reload_resources;
3413 reload_config;
3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3427 load_extensions;
3428
3429 utime time, time, $RUNTIMEFILE;
3430
3431 # no (long-running) fork's whatsoever before this point(!)
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3435 };
3436
3368 EV::loop; 3437 EV::loop;
3369} 3438}
3370 3439
3371############################################################################# 3440#############################################################################
3372# initialisation and cleanup 3441# initialisation and cleanup
3379 cf::cleanup "SIG$signal"; 3448 cf::cleanup "SIG$signal";
3380 }; 3449 };
3381 } 3450 }
3382} 3451}
3383 3452
3384sub write_runtime { 3453sub write_runtime_sync {
3385 my $runtime = "$LOCALDIR/runtime";
3386
3387 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3388 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3389 3456
3390 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3391 3458
3392 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3393 3460
3394 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3395 or return; 3462 or return;
3396 3463
3397 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3398 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3399 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
3409 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3410 3477
3411 close $fh 3478 close $fh
3412 or return; 3479 or return;
3413 3480
3414 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3415 and return; 3482 and return;
3416 3483
3417 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3418 3485
3419 1 3486 1
3487}
3488
3489our $uuid_lock;
3490our $uuid_skip;
3491
3492sub write_uuid_sync($) {
3493 $uuid_skip ||= $_[0];
3494
3495 return if $uuid_lock;
3496 local $uuid_lock = 1;
3497
3498 my $uuid = "$LOCALDIR/uuid";
3499
3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3501 or return;
3502
3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3511 $uuid_skip = 0;
3512
3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3514 and return;
3515
3516 # always fsync - this file is important
3517 aio_fsync $fh
3518 and return;
3519
3520 close $fh
3521 or return;
3522
3523 aio_rename "$uuid~", $uuid
3524 and return;
3525
3526 warn "uuid file written ($value).\n";
3527
3528 1
3529
3530}
3531
3532sub write_uuid($$) {
3533 my ($skip, $sync) = @_;
3534
3535 $sync ? write_uuid_sync $skip
3536 : async { write_uuid_sync $skip };
3420} 3537}
3421 3538
3422sub emergency_save() { 3539sub emergency_save() {
3423 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3424 3541
3425 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3426 3543
3427 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3428 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3429 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3430 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3431 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3432 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3433 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3434 $pl->valid or next; 3556 $pl->valid or next;
3435 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3436 $pl->save; 3558 $pl->save;
3437 } 3559 }
3438 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3439 3561
3440 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3441 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3442 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3443 $map->valid or next; 3565 $map->valid or next;
3444 $map->save; 3566 $map->save;
3445 } 3567 }
3446 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3447 3569
3448 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3449 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3450 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3573
3574 warn "emergency_perl_save: begin write uuid\n";
3575 write_uuid_sync 1;
3576 warn "emergency_perl_save: end write uuid\n";
3451 }; 3577 };
3452 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3453 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3454} 3585}
3455 3586
3456sub post_cleanup { 3587sub post_cleanup {
3457 my ($make_core) = @_; 3588 my ($make_core) = @_;
3458 3589
3459 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3460 if $make_core; 3591 if $make_core;
3592
3593 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$;
3595}
3596
3597# a safer delete_package, copied from Symbol
3598sub clear_package($) {
3599 my $pkg = shift;
3600
3601 # expand to full symbol table name if needed
3602 unless ($pkg =~ /^main::.*::$/) {
3603 $pkg = "main$pkg" if $pkg =~ /^::/;
3604 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3605 $pkg .= '::' unless $pkg =~ /::$/;
3606 }
3607
3608 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3609 my $stem_symtab = *{$stem}{HASH};
3610
3611 defined $stem_symtab and exists $stem_symtab->{$leaf}
3612 or return;
3613
3614 # clear all symbols
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 }
3620 warn "cleared package $pkg\n";#d#
3461} 3621}
3462 3622
3463sub do_reload_perl() { 3623sub do_reload_perl() {
3464 # can/must only be called in main 3624 # can/must only be called in main
3465 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3466 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3467 return; 3627 return;
3468 } 3628 }
3469 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3470 warn "reloading..."; 3635 warn "reloading...";
3471 3636
3472 warn "entering sync_job"; 3637 warn "entering sync_job";
3473 3638
3474 cf::sync_job { 3639 cf::sync_job {
3475 cf::write_runtime; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3476 cf::emergency_save; 3641 cf::emergency_save;
3477 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3478 3643
3479 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3480 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3481 3646
3482 # if anything goes wrong in here, we should simply crash as we already saved 3647 # if anything goes wrong in here, we should simply crash as we already saved
3483 3648
3484 warn "flushing outstanding aio requests"; 3649 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; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3490 warn "iterate..."; 3651 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 } 3652 }
3516 3653
3517 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3518 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3519 } 3656 %EXT_CORO = ();
3520 3657
3521 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3522 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3523 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3524 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3525 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3526 delete $INC{$k};
3527 3668
3528 $k =~ s/\.pm$//;
3529 $k =~ s/\//::/g;
3530
3531 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3532 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3533 } 3678 }
3534 3679
3535 Symbol::delete_package $k; 3680 warn "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683
3684 warn "... unloading $k";
3685 delete $INC{$k};
3686
3687 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g;
3689
3690 if (my $cb = $k->can ("unload_module")) {
3691 $cb->();
3692 }
3693
3694 clear_package $k;
3536 } 3695 }
3537 3696
3538 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3539 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3540 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3541 3700
3542 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3543 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3544 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3545 3704
3546 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3547 # and global variables created in xs 3706 # and global variables created in xs
3548 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3549 3708
3550 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3551 3710
3552 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3553 require cf; 3712 require cf;
3554 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3555 3714
3556 warn "loading config and database again"; 3715 warn "loading config and database again";
3557 cf::reload_config; 3716 cf::reload_config;
3558 3717
3559 warn "loading extensions"; 3718 warn "loading extensions";
3560 cf::load_extensions; 3719 cf::load_extensions;
3561 3720
3721 if ($REATTACH_ON_RELOAD) {
3562 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3563 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3564 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3565 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3566 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3567 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3568 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3569 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3570 3734
3571 1 3735 1
3572 } or do { 3736 } or do {
3573 warn $@; 3737 warn $@;
3574 cf::cleanup "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3575 }; 3739 };
3576 3740
3577 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3578}; 3747};
3579 3748
3580our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3581 3750
3582sub reload_perl() { 3751sub reload_perl() {
3583 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3584 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3585 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3586 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3587 do_reload_perl; 3759 do_reload_perl;
3588 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3589 }; 3762 };
3590} 3763}
3591 3764
3592register_command "reload" => sub { 3765register_command "reload" => sub {
3593 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3607 3780
3608our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3609our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3610 3783
3611sub wait_for_tick { 3784sub wait_for_tick {
3612 return if tick_inhibit;
3613 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3614 3786
3615 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3616 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3617 $signal->wait; 3789 $signal->wait;
3618} 3790}
3619 3791
3620sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3621 return if tick_inhibit;
3622 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3623 3794
3624 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3625 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3626 $signal->wait; 3797 $signal->wait;
3627} 3798}
3637 3808
3638 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3639 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3810 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3640 Coro::async_pool { 3811 Coro::async_pool {
3641 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3642 write_runtime 3813 write_runtime_sync
3643 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3644 }; 3815 };
3645 } 3816 }
3646 3817
3647 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3666{ 3837{
3667 # configure BDB 3838 # configure BDB
3668 3839
3669 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3670 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3671 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3672 3843
3673 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3674 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3675 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3676 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3677 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3678 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3679 3851
3680 cf::sync_job { 3852 cf::sync_job {
3681 eval { 3853 eval {
3707{ 3879{
3708 # configure IO::AIO 3880 # configure IO::AIO
3709 3881
3710 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3711 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3712 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3713} 3885}
3714 3886
3715my $_log_backtrace; 3887my $_log_backtrace;
3716 3888
3717sub _log_backtrace { 3889sub _log_backtrace {
3720 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3721 3893
3722 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3723 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3724 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3725 async { 3898 async {
3726 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3727 3900
3728 my @bt = fork_call { 3901 my @bt = fork_call {
3729 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3740 } 3913 }
3741 3914
3742 @funcs 3915 @funcs
3743 }; 3916 };
3744 3917
3745 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3746 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3747 --$_log_backtrace; 3921 --$_log_backtrace;
3748 }; 3922 };
3749 } else { 3923 } else {
3750 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3751 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3752 } 3926 }
3753} 3927}
3754 3928
3755# load additional modules 3929# load additional modules
3756use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3757 3931
3758END { cf::emergency_save } 3932END { cf::emergency_save }
3759 3933
37601 39341
3761 3935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines