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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines