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.416 by root, Fri Apr 11 13:59:06 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.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5; 56use Digest::MD5;
52use Fcntl; 57use Fcntl;
53use YAML (); 58use YAML ();
54use IO::AIO 2.51 (); 59use IO::AIO ();
55use Time::HiRes; 60use Time::HiRes;
56use Compress::LZF; 61use Compress::LZF;
57use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
58 65
59# configure various modules to our taste 66# configure various modules to our taste
60# 67#
61$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
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
722 729
723############################################################################# 730#############################################################################
724 731
725=head2 ATTACHABLE OBJECTS 732=head2 ATTACHABLE OBJECTS
726 733
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 735attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 736to it. All such attachable objects support the following methods.
730 737
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 789=item cf::CLASS::attachment $name, ...
783 790
784Register an attachment by C<$name> through which attachable objects of the 791Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 792given CLASS can refer to this attachment.
786 793
787Some classes such as crossfire maps and objects can specify attachments 794Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 796
790These calls expect any number of the following handler/hook descriptions: 797These calls expect any number of the following handler/hook descriptions:
791 798
792=over 4 799=over 4
1083 1090
1084sub reattach { 1091sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1092 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1093 my ($obj) = @_;
1087 1094
1095 # no longer needed after getting rid of delete_package?
1088 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
1089 1097
1090 my $registry = $obj->registry; 1098 my $registry = $obj->registry;
1091 1099
1092 @$registry = (); 1100 @$registry = ();
1093 1101
1139 utf8::decode (my $decname = $filename); 1147 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1148 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1149 $decname, length $$rdata, scalar @$objs;
1142 1150
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1151 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1152 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1153 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1154 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1155 aio_close $fh;
1148 1156
1149 if (@$objs) { 1157 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1159 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1160 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1161 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1162 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1163 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1164 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1165 }
1158 } else { 1166 } else {
1159 aio_unlink "$filename.pst"; 1167 aio_unlink "$filename.pst";
1160 } 1168 }
1161 1169
1162 aio_rename "$filename~", $filename; 1170 aio_rename "$filename~", $filename;
1171
1172 $filename =~ s%/[^/]+$%%;
1173 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1174 } else {
1164 warn "FATAL: $filename~: $!\n"; 1175 warn "unable to save objects: $filename~: $!\n";
1165 } 1176 }
1166 } else { 1177 } else {
1167 aio_unlink $filename; 1178 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1169 } 1180 }
1260 my ($name, $cb) = @_; 1271 my ($name, $cb) = @_;
1261 1272
1262 $EXTICMD{$name} = $cb; 1273 $EXTICMD{$name} = $cb;
1263} 1274}
1264 1275
1276use File::Glob ();
1277
1265cf::player->attach ( 1278cf::player->attach (
1266 on_command => sub { 1279 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1280 my ($pl, $name, $params) = @_;
1268 1281
1269 my $cb = $COMMAND{$name} 1282 my $cb = $COMMAND{$name}
1301 1314
1302 cf::override; 1315 cf::override;
1303 }, 1316 },
1304); 1317);
1305 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
1306sub load_extensions { 1332sub load_extensions {
1307 cf::sync_job { 1333 cf::sync_job {
1308 my %todo; 1334 my %todo;
1309 1335
1310 for my $path (<$LIBDIR/*.ext>) { 1336 for my $path (<$LIBDIR/*.ext>) {
1329 1355
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1356 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1357 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1358
1333 $ext{source} = 1359 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1360 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1361 . "#line 1 \"$path\"\n{\n"
1336 . $source 1362 . $source
1337 . "\n};\n1"; 1363 . "\n};\n1";
1338 1364
1339 $todo{$base} = \%ext; 1365 $todo{$base} = \%ext;
1379 1405
1380=back 1406=back
1381 1407
1382=head2 CORE EXTENSIONS 1408=head2 CORE EXTENSIONS
1383 1409
1384Functions and methods that extend core crossfire objects. 1410Functions and methods that extend core deliantra objects.
1385 1411
1386=cut 1412=cut
1387 1413
1388package cf::player; 1414package cf::player;
1389 1415
1432 1458
1433sub exists($) { 1459sub exists($) {
1434 my ($login) = @_; 1460 my ($login) = @_;
1435 1461
1436 $cf::PLAYER{$login} 1462 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1463 or !aio_stat path $login
1438} 1464}
1439 1465
1440sub find($) { 1466sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1467 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1468 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1480 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1481 or return;
1456 1482
1457 my $pl = cf::player::load_pl $f 1483 my $pl = cf::player::load_pl $f
1458 or return; 1484 or return;
1485
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1486 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1487 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1488 $cf::PLAYER{$login} = $pl
1462 } 1489 }
1463 } 1490 }
1473 1500
1474 return if $pl->{deny_save}; 1501 return if $pl->{deny_save};
1475 1502
1476 aio_mkdir playerdir $pl, 0770; 1503 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1504 $pl->{last_save} = $cf::RUNTIME;
1505
1506 cf::get_slot 0.01;
1478 1507
1479 $pl->save_pl ($path); 1508 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1509 cf::cede_to_tick;
1481} 1510}
1482 1511
1514 my ($pl) = @_; 1543 my ($pl) = @_;
1515 1544
1516 my $name = $pl->ob->name; 1545 my $name = $pl->ob->name;
1517 1546
1518 $pl->{deny_save} = 1; 1547 $pl->{deny_save} = 1;
1519 $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
1520 1549
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1550 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1551 $pl->deactivate;
1552 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1553 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1554 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1555 $pl->ns->destroy if $pl->ns;
1525 1556
1526 my $path = playerdir $pl; 1557 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1558 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1597
1567 for my $login (@$dirs) { 1598 for my $login (@$dirs) {
1568 my $path = path $login; 1599 my $path = path $login;
1569 1600
1570 # a .pst is a dead give-away for a valid player 1601 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1602 # if no pst file found, open and chekc for blocked users
1603 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1604 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1605 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1606 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1607 }
1576 1608
1607 } 1639 }
1608 1640
1609 \@paths 1641 \@paths
1610} 1642}
1611 1643
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1644=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1645
1614Expand crossfire pod fragments into protocol xml. 1646Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1647
1705=item $player->ext_reply ($msgid, @msg) 1648=item $player->ext_reply ($msgid, @msg)
1706 1649
1707Sends an ext reply to the player. 1650Sends an ext reply to the player.
1708 1651
1775our $MAX_RESET = 3600; 1718our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1719our $DEFAULT_RESET = 3000;
1777 1720
1778sub generate_random_map { 1721sub generate_random_map {
1779 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
1780 # mit "rum" bekleckern, nicht 1726 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1727 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1728 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1729 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1730 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1906 1852
1907# the temporary/swap location 1853# the temporary/swap location
1908sub save_path { 1854sub save_path {
1909 my ($self) = @_; 1855 my ($self) = @_;
1910 1856
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1857 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1858 "$TMPDIR/$path.map"
1913} 1859}
1914 1860
1915# the unique path, undef == no special unique path 1861# the unique path, undef == no special unique path
1916sub uniq_path { 1862sub uniq_path {
1917 my ($self) = @_; 1863 my ($self) = @_;
1918 1864
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1865 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1866 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1867}
1931 1868
1932sub decay_objects { 1869sub decay_objects {
1933 my ($self) = @_; 1870 my ($self) = @_;
1934 1871
2018sub find { 1955sub find {
2019 my ($path, $origin) = @_; 1956 my ($path, $origin) = @_;
2020 1957
2021 $path = normalise $path, $origin && $origin->path; 1958 $path = normalise $path, $origin && $origin->path;
2022 1959
2023 cf::lock_wait "map_data:$path";#d#remove 1960 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1961 my $guard2 = cf::lock_acquire "map_find:$path";
2025 1962
2026 $cf::MAP{$path} || do { 1963 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 1964 my $map = new_from_path cf::map $path
2031 or return; 1965 or return;
2032 1966
2033 $map->{last_save} = $cf::RUNTIME; 1967 $map->{last_save} = $cf::RUNTIME;
2034 1968
2036 or return; 1970 or return;
2037 1971
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1972 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1973 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1974 #$cf::WAIT_FOR_TICK->wait;
1975 undef $guard2;
2041 undef $guard1; 1976 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1977 $map->reset;
2044 return find $path; 1978 return find $path;
2045 } 1979 }
2046 1980
2047 $cf::MAP{$path} = $map 1981 $cf::MAP{$path} = $map
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2008 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2009 $f->skip_block;
2076 $self->_load_objects ($f) 2010 $self->_load_objects ($f)
2077 or return; 2011 or return;
2078 2012
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2013 $self->post_load_original
2080 if delete $self->{load_original}; 2014 if delete $self->{load_original};
2081 2015
2082 if (my $uniq = $self->uniq_path) { 2016 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2017 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2018 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2036 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2037 $self->decay_objects;
2104 $self->fix_auto_apply; 2038 $self->fix_auto_apply;
2105 $self->update_buttons; 2039 $self->update_buttons;
2106 cf::cede_to_tick; 2040 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2041 $self->activate;
2110 } 2042 }
2111 2043
2112 $self->{last_save} = $cf::RUNTIME; 2044 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2045 $self->last_access ($cf::RUNTIME);
2114 2046
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2047 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2048 }
2117 2049
2118 $self->post_load; 2050 $self->post_load;
2119} 2051}
2120 2052
2178 my ($path, $origin, $load) = @_; 2110 my ($path, $origin, $load) = @_;
2179 2111
2180 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
2181 2113
2182 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2116 }
2185 2117
2186 $MAP_PREFETCH{$path} |= $load; 2118 $MAP_PREFETCH{$path} |= $load;
2187 2119
2188 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2225 cf::async { 2157 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2158 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
2228 }; 2160 };
2229 2161
2162 cf::get_slot 0.02;
2163
2230 if ($uniq) { 2164 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2165 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2166 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2167 } else {
2234 $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);
2242 $self->save; 2176 $self->save;
2243 2177
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2178 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2179
2246 return if $self->players; 2180 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2181 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2182 return if $self->{deny_save};
2249 2183
2250 $self->in_memory (cf::MAP_SWAPPED); 2184 $self->in_memory (cf::MAP_SWAPPED);
2251 2185
2252 $self->deactivate; 2186 $self->deactivate;
2370 2304
2371sub unique_maps() { 2305sub unique_maps() {
2372 [ 2306 [
2373 map { 2307 map {
2374 utf8::decode $_; 2308 utf8::decode $_;
2375 /\.map$/ 2309 s/\.map$//; # TODO future compatibility hack
2310 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2311 ? ()
2376 ? normalise $_ 2312 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2313 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2314 ]
2380} 2315}
2381 2316
2382=back 2317=back
2389 2324
2390=over 4 2325=over 4
2391 2326
2392=item $ob->inv_recursive 2327=item $ob->inv_recursive
2393 2328
2394Returns 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.
2395 2331
2396=cut 2332=cut
2397 2333
2398sub inv_recursive_; 2334sub inv_recursive_;
2399sub inv_recursive_ { 2335sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2340 inv_recursive_ inv $_[0]
2405} 2341}
2406 2342
2407=item $ref = $ob->ref 2343=item $ref = $ob->ref
2408 2344
2409creates 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.
2410 2346
2411=item $ob = cf::object::deref ($refstring) 2347=item $ob = cf::object::deref ($refstring)
2412 2348
2413returns 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,
2414even if the object actually exists. May block. 2350even if the object actually exists. May block.
2446can 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
2447dialogue with the given NPC character. 2383dialogue with the given NPC character.
2448 2384
2449=cut 2385=cut
2450 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
2451# rough implementation of a future "reply" method that works 2401# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2402# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2404sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2405 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2416 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2418
2469 } else { 2419 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2420 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2421 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2422 }
2473 } 2423 }
2474} 2424}
2475 2425
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2426=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2451
2502=item $player_object->enter_link 2452=item $player_object->enter_link
2503 2453
2504Freezes 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}>).
2505 2455
2506The 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.
2507I<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.
2508 2460
2509Will never block. 2461Will never block.
2510 2462
2511=item $player_object->leave_link ($map, $x, $y) 2463=item $player_object->leave_link ($map, $x, $y)
2512 2464
2570 2522
2571 $map->load; 2523 $map->load;
2572 $map->load_neighbours; 2524 $map->load_neighbours;
2573 2525
2574 return unless $self->contr->active; 2526 return unless $self->contr->active;
2527 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2528 $self->activate_recursive;
2576 2529
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2530 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2531 $self->enter_map ($map, $x, $y);
2579} 2532}
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2537her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be 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 >>.
2588 2544
2589=cut 2545=cut
2590 2546
2591our $GOTOGEN; 2547our $GOTOGEN;
2592 2548
2671} 2627}
2672 2628
2673sub prepare_random_map { 2629sub prepare_random_map {
2674 my ($exit) = @_; 2630 my ($exit) = @_;
2675 2631
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2632 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2633 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2634 # that depends on the exit object
2681 2635
2682 my $rmp = parse_random_map_params $exit->msg; 2636 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2638 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2639 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2640 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2641 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2642 $rmp->{origin_y} = $exit->y;
2643
2644 $exit->map->touch;
2689 } 2645 }
2690 2646
2691 $rmp->{random_seed} ||= $exit->random_seed; 2647 $rmp->{random_seed} ||= $exit->random_seed;
2692 2648
2693 my $data = cf::encode_json $rmp; 2649 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2650 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2651 my $meta = "$RANDOMDIR/$md5.meta";
2696 2652
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2653 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2654 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2655 undef $fh;
2700 aio_rename "$meta~", $meta; 2656 aio_rename "$meta~", $meta;
2701 2657
2658 my $slaying = "?random/$md5";
2659
2660 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2661 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2662 $exit->msg (undef);
2663 }
2704 } 2664 }
2705} 2665}
2706 2666
2707sub cf::object::player::enter_exit { 2667sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2668 my ($self, $exit) = @_;
2709 2669
2710 return unless $self->type == cf::PLAYER; 2670 return unless $self->type == cf::PLAYER;
2711 2671
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2672 $self->enter_link;
2724 2673
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2674 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2675 $Coro::current->{desc} = "enter_exit";
2731 2676
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2692 $self->goto ($map, $x, $y);
2735 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
2736 1; 2698 1
2737 }) { 2699 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2700 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2702 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2703 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2704
2743 warn "ERROR in enter_exit: $@"; 2705 warn "ERROR in enter_exit: $@";
2809 id => "infobox", 2771 id => "infobox",
2810 title => "Body Parts", 2772 title => "Body Parts",
2811 reply => undef, 2773 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2774 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 2800 "c/uptime" => {
2815 id => "infobox", 2801 id => "infobox",
2816 title => "Uptime", 2802 title => "Uptime",
2817 reply => undef, 2803 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2804 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2807 id => "infobox",
2822 title => "Map Info", 2808 title => "Map Info",
2823 reply => undef, 2809 reply => undef,
2824 tooltip => "Information related to the maps", 2810 tooltip => "Information related to the maps",
2825 }, 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,
2826); 2826);
2827 2827
2828sub cf::client::send_msg { 2828sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2829 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2830
2831 $msg = $self->pl->expand_cfpod ($msg); 2831 $msg = $self->pl->expand_cfpod ($msg)
2832 unless $color & cf::NDI_VERBATIM;
2832 2833
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2834 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2835
2835 # check predefined channels, for the benefit of C 2836 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2837 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 2838 $channel = $CHANNEL{$channel};
2838 2839
2839 $self->ext_msg (channel_info => $channel) 2840 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 2841 $channel = $channel->{id};
2843 2842
2844 } elsif (ref $channel) { 2843 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 2844 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 2845 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 2846 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 2847 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 2848 }
2851 2849
2852 $channel = $channel->{id}; 2850 $channel = $channel->{id};
2853 } 2851 }
2854 2852
2855 return unless @extra || length $msg; 2853 return unless @extra || length $msg;
2856 2854
2857 if ($self->can_msg) {
2858 # default colour, mask it out 2855 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2856 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2857 if $color & cf::NDI_DEF;
2861 2858
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2859 my $pkt = "msg "
2860 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2861 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 2862 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 2863
2876 $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};
2877 2867
2878 utf8::encode $msg; 2868 # split very large packets
2879 2869 if (8192 < length $pkt and $self->{can_lzf}) {
2880 if (0 && $msg =~ /\[/) { 2870 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2881 # COMMAND/INFO 2871 $pkt = "frag";
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 } 2872 }
2873
2874 $self->send_packet ($pkt);
2889} 2875}
2890 2876
2891=item $client->ext_msg ($type, @msg) 2877=item $client->ext_msg ($type, @msg)
2892 2878
2893Sends an ext event to the client. 2879Sends an ext event to the client.
3067 3053
3068The following functions and methods are available within a safe environment: 3054The following functions and methods are available within a safe environment:
3069 3055
3070 cf::object 3056 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3058 insert remove name archname title slaying race decrease split
3059 value
3073 3060
3074 cf::object::player 3061 cf::object::player
3075 player 3062 player
3076 3063
3077 cf::player 3064 cf::player
3082 3069
3083=cut 3070=cut
3084 3071
3085for ( 3072for (
3086 ["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
3087 insert remove inv name archname title slaying race 3074 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3075 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3076 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3077 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3078 ["cf::map" => qw(trigger)],
3092) { 3079) {
3093 no strict 'refs'; 3080 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3081 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3082 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3112 my ($code, %vars) = @_; 3099 my ($code, %vars) = @_;
3113 3100
3114 my $qcode = $code; 3101 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3102 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3103 $qcode =~ s/\n/\\n/g;
3104
3105 %vars = (_dummy => 0) unless %vars;
3117 3106
3118 local $_; 3107 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars; 3108 local @safe::cf::_safe_eval_args = values %vars;
3120 3109
3121 my $eval = 3110 my $eval =
3301 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3303 } 3292 }
3304}; 3293};
3305 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
3306sub reload_regions { 3305sub reload_regions {
3307 # 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
3308 # for this (global event?) 3307 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3309
3323} 3322}
3324 3323
3325sub reload_archetypes { 3324sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3327}
3334 3328
3335sub reload_treasures { 3329sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3338} 3332}
3339 3333
3340sub reload_resources { 3334sub reload_resources {
3341 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3342 3336
3337 reload_facedata;
3338 reload_archetypes;
3343 reload_regions; 3339 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3340 reload_treasures;
3348 3341
3349 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3343}
3355 3344
3356sub reload_config { 3345sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3347 or return;
3372 }; 3361 };
3373 warn $@ if $@; 3362 warn $@ if $@;
3374 } 3363 }
3375} 3364}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3380 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#
3381 (async { 3403 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3385 }; 3407 };
3386 3408
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 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
3393 EV::loop; 3437 EV::loop;
3394} 3438}
3395 3439
3396############################################################################# 3440#############################################################################
3397# initialisation and cleanup 3441# initialisation and cleanup
3404 cf::cleanup "SIG$signal"; 3448 cf::cleanup "SIG$signal";
3405 }; 3449 };
3406 } 3450 }
3407} 3451}
3408 3452
3409sub write_runtime { 3453sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3414 3456
3415 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3458
3417 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3418 3460
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3462 or return;
3421 3463
3422 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3435 3477
3436 close $fh 3478 close $fh
3437 or return; 3479 or return;
3438 3480
3439 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3482 and return;
3441 3483
3442 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3443 3485
3444 1 3486 1
3456 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3457 3499
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3501 or return;
3460 3502
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 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;
3462 $uuid_skip = 0; 3511 $uuid_skip = 0;
3463 3512
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3514 and return;
3466 3515
3488} 3537}
3489 3538
3490sub emergency_save() { 3539sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3492 3541
3493 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3494 3543
3495 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
3496 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3556 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3558 $pl->save;
3505 } 3559 }
3506 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3507 3561
3508 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3565 $map->valid or next;
3512 $map->save; 3566 $map->save;
3513 } 3567 }
3514 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3515 3569
3516 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3519 3573
3520 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3575 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3523 }; 3577 };
3524 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
3525 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3526} 3585}
3527 3586
3528sub post_cleanup { 3587sub post_cleanup {
3529 my ($make_core) = @_; 3588 my ($make_core) = @_;
3530 3589
3531 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3532 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#
3533} 3621}
3534 3622
3535sub do_reload_perl() { 3623sub do_reload_perl() {
3536 # can/must only be called in main 3624 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3539 return; 3627 return;
3540 } 3628 }
3541 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3542 warn "reloading..."; 3635 warn "reloading...";
3543 3636
3544 warn "entering sync_job"; 3637 warn "entering sync_job";
3545 3638
3546 cf::sync_job { 3639 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3641 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3550 3643
3551 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3646
3554 # 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
3555 3648
3556 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3652 }
3588 3653
3589 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3591 } 3656 %EXT_CORO = ();
3592 3657
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3668
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3604 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3605 } 3678 }
3606 3679
3607 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;
3608 } 3695 }
3609 3696
3610 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3612 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);
3613 3700
3614 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3704
3618 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3706 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3621 3708
3622 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3623 3710
3624 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3625 require cf; 3712 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3714
3628 warn "loading config and database again"; 3715 warn "loading config and database again";
3629 cf::reload_config; 3716 cf::reload_config;
3630 3717
3631 warn "loading extensions"; 3718 warn "loading extensions";
3632 cf::load_extensions; 3719 cf::load_extensions;
3633 3720
3721 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3640 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3641 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3642 3734
3643 1 3735 1
3644 } or do { 3736 } or do {
3645 warn $@; 3737 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3647 }; 3739 };
3648 3740
3649 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3650}; 3747};
3651 3748
3652our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3653 3750
3654sub reload_perl() { 3751sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3657 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3759 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3661 }; 3762 };
3662} 3763}
3663 3764
3664register_command "reload" => sub { 3765register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
3679 3780
3680our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3682 3783
3683sub wait_for_tick { 3784sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3786
3687 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3789 $signal->wait;
3690} 3790}
3691 3791
3692sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3794
3696 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3797 $signal->wait;
3699} 3798}
3709 3808
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3809 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $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.;
3712 Coro::async_pool { 3811 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3812 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3813 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3814 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3815 };
3717 } 3816 }
3718 3817
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3818 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3738{ 3837{
3739 # configure BDB 3838 # configure BDB
3740 3839
3741 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3744 3843
3745 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | 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;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3851
3752 cf::sync_job { 3852 cf::sync_job {
3753 eval { 3853 eval {
3779{ 3879{
3780 # configure IO::AIO 3880 # configure IO::AIO
3781 3881
3782 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3785} 3885}
3786 3886
3787my $_log_backtrace; 3887my $_log_backtrace;
3788 3888
3789sub _log_backtrace { 3889sub _log_backtrace {
3792 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3793 3893
3794 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3797 async { 3898 async {
3798 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3799 3900
3800 my @bt = fork_call { 3901 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
3812 } 3913 }
3813 3914
3814 @funcs 3915 @funcs
3815 }; 3916 };
3816 3917
3817 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3921 --$_log_backtrace;
3820 }; 3922 };
3821 } else { 3923 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 3925 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 3926 }
3825} 3927}
3826 3928
3827# load additional modules 3929# load additional modules
3828use cf::pod; 3930eval "use cf::$_" for @EXTRA_MODULES;
3829 3931
3830END { cf::emergency_save } 3932END { cf::emergency_save }
3831 3933
38321 39341
3833 3935

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines