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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.465 by root, Thu Jan 8 00:54:55 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 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
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
722 727
723############################################################################# 728#############################################################################
724 729
725=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
726 731
727Many 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
728attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
730 735
731In 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>
732C<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
782=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
783 788
784Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
786 791
787Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
788that 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.
789 794
790These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
791 796
792=over 4 797=over 4
1083 1088
1084sub reattach { 1089sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1091 my ($obj) = @_;
1087 1092
1093 # no longer needed after getting rid of delete_package?
1088 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
1089 1095
1090 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1091 1097
1092 @$registry = (); 1098 @$registry = ();
1093 1099
1139 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1142 1148
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1153 aio_close $fh;
1148 1154
1149 if (@$objs) { 1155 if (@$objs) {
1150 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) {
1151 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1161 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1163 }
1158 } else { 1164 } else {
1159 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1160 } 1166 }
1161 1167
1162 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1172 } else {
1164 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1165 } 1174 }
1166 } else { 1175 } else {
1167 aio_unlink $filename; 1176 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1169 } 1178 }
1260 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1261 1270
1262 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1263} 1272}
1264 1273
1274use File::Glob ();
1275
1265cf::player->attach ( 1276cf::player->attach (
1266 on_command => sub { 1277 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1268 1279
1269 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
1301 1312
1302 cf::override; 1313 cf::override;
1303 }, 1314 },
1304); 1315);
1305 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
1306sub load_extensions { 1330sub load_extensions {
1307 cf::sync_job { 1331 cf::sync_job {
1308 my %todo; 1332 my %todo;
1309 1333
1310 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
1329 1353
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1356
1333 $ext{source} = 1357 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1336 . $source 1360 . $source
1337 . "\n};\n1"; 1361 . "\n};\n1";
1338 1362
1339 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
1379 1403
1380=back 1404=back
1381 1405
1382=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1383 1407
1384Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1385 1409
1386=cut 1410=cut
1387 1411
1388package cf::player; 1412package cf::player;
1389 1413
1432 1456
1433sub exists($) { 1457sub exists($) {
1434 my ($login) = @_; 1458 my ($login) = @_;
1435 1459
1436 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1438} 1462}
1439 1463
1440sub find($) { 1464sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1466 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1479 or return;
1456 1480
1457 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1458 or return; 1482 or return;
1483
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1462 } 1487 }
1463 } 1488 }
1473 1498
1474 return if $pl->{deny_save}; 1499 return if $pl->{deny_save};
1475 1500
1476 aio_mkdir playerdir $pl, 0770; 1501 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1502 $pl->{last_save} = $cf::RUNTIME;
1503
1504 cf::get_slot 0.01;
1478 1505
1479 $pl->save_pl ($path); 1506 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1507 cf::cede_to_tick;
1481} 1508}
1482 1509
1514 my ($pl) = @_; 1541 my ($pl) = @_;
1515 1542
1516 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1517 1544
1518 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1519 $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
1520 1547
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1525 1554
1526 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1595
1567 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1568 my $path = path $login; 1597 my $path = path $login;
1569 1598
1570 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1605 }
1576 1606
1607 } 1637 }
1608 1638
1609 \@paths 1639 \@paths
1610} 1640}
1611 1641
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1643
1614Expand crossfire pod fragments into protocol xml. 1644Expand 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 1645
1705=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1706 1647
1707Sends an ext reply to the player. 1648Sends an ext reply to the player.
1708 1649
1775our $MAX_RESET = 3600; 1716our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1717our $DEFAULT_RESET = 3000;
1777 1718
1778sub generate_random_map { 1719sub generate_random_map {
1779 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
1780 # mit "rum" bekleckern, nicht 1724 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1725 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1726 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1727 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1728 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1906 1850
1907# the temporary/swap location 1851# the temporary/swap location
1908sub save_path { 1852sub save_path {
1909 my ($self) = @_; 1853 my ($self) = @_;
1910 1854
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1855 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1856 "$TMPDIR/$path.map"
1913} 1857}
1914 1858
1915# the unique path, undef == no special unique path 1859# the unique path, undef == no special unique path
1916sub uniq_path { 1860sub uniq_path {
1917 my ($self) = @_; 1861 my ($self) = @_;
1918 1862
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1864 "$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} 1865}
1931 1866
1932sub decay_objects { 1867sub decay_objects {
1933 my ($self) = @_; 1868 my ($self) = @_;
1934 1869
2018sub find { 1953sub find {
2019 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2020 1955
2021 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2022 1957
2023 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2025 1960
2026 $cf::MAP{$path} || do { 1961 $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 1962 my $map = new_from_path cf::map $path
2031 or return; 1963 or return;
2032 1964
2033 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2034 1966
2036 or return; 1968 or return;
2037 1969
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
2041 undef $guard1; 1974 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1975 $map->reset;
2044 return find $path; 1976 return find $path;
2045 } 1977 }
2046 1978
2047 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2007 $f->skip_block;
2076 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2077 or return; 2009 or return;
2078 2010
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2080 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2081 2013
2082 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2015 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2035 $self->decay_objects;
2104 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2105 $self->update_buttons; 2037 $self->update_buttons;
2106 cf::cede_to_tick; 2038 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2039 $self->activate;
2110 } 2040 }
2111 2041
2112 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2043 $self->last_access ($cf::RUNTIME);
2114 2044
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2045 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2046 }
2117 2047
2118 $self->post_load; 2048 $self->post_load;
2119} 2049}
2120 2050
2178 my ($path, $origin, $load) = @_; 2108 my ($path, $origin, $load) = @_;
2179 2109
2180 $path = normalise $path, $origin && $origin->{path}; 2110 $path = normalise $path, $origin && $origin->{path};
2181 2111
2182 if (my $map = $cf::MAP{$path}) { 2112 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2113 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2114 }
2185 2115
2186 $MAP_PREFETCH{$path} |= $load; 2116 $MAP_PREFETCH{$path} |= $load;
2187 2117
2188 $MAP_PREFETCHER ||= cf::async { 2118 $MAP_PREFETCHER ||= cf::async {
2225 cf::async { 2155 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2156 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2157 $_->contr->save for $self->players;
2228 }; 2158 };
2229 2159
2160 cf::get_slot 0.02;
2161
2230 if ($uniq) { 2162 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2164 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2165 } else {
2234 $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);
2242 $self->save; 2174 $self->save;
2243 2175
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2177
2246 return if $self->players; 2178 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2180 return if $self->{deny_save};
2249 2181
2250 $self->in_memory (cf::MAP_SWAPPED); 2182 $self->in_memory (cf::MAP_SWAPPED);
2251 2183
2252 $self->deactivate; 2184 $self->deactivate;
2370 2302
2371sub unique_maps() { 2303sub unique_maps() {
2372 [ 2304 [
2373 map { 2305 map {
2374 utf8::decode $_; 2306 utf8::decode $_;
2375 /\.map$/ 2307 s/\.map$//; # TODO future compatibility hack
2308 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2309 ? ()
2376 ? normalise $_ 2310 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2311 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2312 ]
2380} 2313}
2381 2314
2382=back 2315=back
2389 2322
2390=over 4 2323=over 4
2391 2324
2392=item $ob->inv_recursive 2325=item $ob->inv_recursive
2393 2326
2394Returns 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.
2395 2329
2396=cut 2330=cut
2397 2331
2398sub inv_recursive_; 2332sub inv_recursive_;
2399sub inv_recursive_ { 2333sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2405} 2339}
2406 2340
2407=item $ref = $ob->ref 2341=item $ref = $ob->ref
2408 2342
2409creates 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.
2410 2344
2411=item $ob = cf::object::deref ($refstring) 2345=item $ob = cf::object::deref ($refstring)
2412 2346
2413returns 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,
2414even if the object actually exists. May block. 2348even if the object actually exists. May block.
2446can 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
2447dialogue with the given NPC character. 2381dialogue with the given NPC character.
2448 2382
2449=cut 2383=cut
2450 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
2451# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2400# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2403 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2416
2469 } else { 2417 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2420 }
2473 } 2421 }
2474} 2422}
2475 2423
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2449
2502=item $player_object->enter_link 2450=item $player_object->enter_link
2503 2451
2504Freezes 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}>).
2505 2453
2506The 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.
2507I<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.
2508 2458
2509Will never block. 2459Will never block.
2510 2460
2511=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2512 2462
2570 2520
2571 $map->load; 2521 $map->load;
2572 $map->load_neighbours; 2522 $map->load_neighbours;
2573 2523
2574 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2526 $self->activate_recursive;
2576 2527
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2579} 2530}
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be 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 >>.
2588 2542
2589=cut 2543=cut
2590 2544
2591our $GOTOGEN; 2545our $GOTOGEN;
2592 2546
2671} 2625}
2672 2626
2673sub prepare_random_map { 2627sub prepare_random_map {
2674 my ($exit) = @_; 2628 my ($exit) = @_;
2675 2629
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2632 # that depends on the exit object
2681 2633
2682 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2636 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2689 } 2643 }
2690 2644
2691 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2692 2646
2693 my $data = cf::encode_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2696 2650
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2653 undef $fh;
2700 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2701 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2704 } 2662 }
2705} 2663}
2706 2664
2707sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2709 2667
2710 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2711 2669
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; 2670 $self->enter_link;
2724 2671
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 { 2672 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2673 $Coro::current->{desc} = "enter_exit";
2731 2674
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2735 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
2736 1; 2696 1
2737 }) { 2697 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2702
2743 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
2809 id => "infobox", 2769 id => "infobox",
2810 title => "Body Parts", 2770 title => "Body Parts",
2811 reply => undef, 2771 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2813 }, 2773 },
2774 "c/statistics" => {
2775 id => "infobox",
2776 title => "Statistics",
2777 reply => undef,
2778 tooltip => "Shows your primary statistics",
2779 },
2780 "c/skills" => {
2781 id => "infobox",
2782 title => "Skills",
2783 reply => undef,
2784 tooltip => "Shows your experience per skill and item power",
2785 },
2786 "c/resistances" => {
2787 id => "infobox",
2788 title => "Resistances",
2789 reply => undef,
2790 tooltip => "Shows your resistances",
2791 },
2792 "c/pets" => {
2793 id => "infobox",
2794 title => "Pets",
2795 reply => undef,
2796 tooltip => "Shows information abotu your pets/a specific pet",
2797 },
2814 "c/uptime" => { 2798 "c/uptime" => {
2815 id => "infobox", 2799 id => "infobox",
2816 title => "Uptime", 2800 title => "Uptime",
2817 reply => undef, 2801 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2802 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2805 id => "infobox",
2822 title => "Map Info", 2806 title => "Map Info",
2823 reply => undef, 2807 reply => undef,
2824 tooltip => "Information related to the maps", 2808 tooltip => "Information related to the maps",
2825 }, 2809 },
2810 "c/party" => {
2811 id => "party",
2812 title => "Party",
2813 reply => "gsay ",
2814 tooltip => "Messages and chat related to your party",
2815 },
2816 "c/death" => {
2817 id => "death",
2818 title => "Death",
2819 reply => undef,
2820 tooltip => "Reason for and more info about your most recent death",
2821 },
2822 "c/say" => $SAY_CHANNEL,
2823 "c/chat" => $CHAT_CHANNEL,
2826); 2824);
2827 2825
2828sub cf::client::send_msg { 2826sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2827 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2828
2831 $msg = $self->pl->expand_cfpod ($msg); 2829 $msg = $self->pl->expand_cfpod ($msg)
2830 unless $color & cf::NDI_VERBATIM;
2832 2831
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2832 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2833
2835 # check predefined channels, for the benefit of C 2834 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2835 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 2836 $channel = $CHANNEL{$channel};
2838 2837
2839 $self->ext_msg (channel_info => $channel) 2838 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 2839 $channel = $channel->{id};
2843 2840
2844 } elsif (ref $channel) { 2841 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 2842 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 2843 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 2844 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 2845 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 2846 }
2851 2847
2852 $channel = $channel->{id}; 2848 $channel = $channel->{id};
2853 } 2849 }
2854 2850
2855 return unless @extra || length $msg; 2851 return unless @extra || length $msg;
2856 2852
2857 if ($self->can_msg) {
2858 # default colour, mask it out 2853 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2854 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2855 if $color & cf::NDI_DEF;
2861 2856
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2857 my $pkt = "msg "
2858 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2859 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 2860 );
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 2861
2876 $color &= cf::NDI_COLOR_MASK; 2862 # try lzf for large packets
2863 $pkt = "lzf " . Compress::LZF::compress $pkt
2864 if 1024 <= length $pkt and $self->{can_lzf};
2877 2865
2878 utf8::encode $msg; 2866 # split very large packets
2879 2867 if (8192 < length $pkt and $self->{can_lzf}) {
2880 if (0 && $msg =~ /\[/) { 2868 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2881 # COMMAND/INFO 2869 $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 } 2870 }
2871
2872 $self->send_packet ($pkt);
2889} 2873}
2890 2874
2891=item $client->ext_msg ($type, @msg) 2875=item $client->ext_msg ($type, @msg)
2892 2876
2893Sends an ext event to the client. 2877Sends an ext event to the client.
3067 3051
3068The following functions and methods are available within a safe environment: 3052The following functions and methods are available within a safe environment:
3069 3053
3070 cf::object 3054 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3055 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3056 insert remove name archname title slaying race decrease split
3073 3057
3074 cf::object::player 3058 cf::object::player
3075 player 3059 player
3076 3060
3077 cf::player 3061 cf::player
3082 3066
3083=cut 3067=cut
3084 3068
3085for ( 3069for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3070 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3071 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3072 decrease split destroy change_exp)],
3089 ["cf::object::player" => qw(player)], 3073 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3074 ["cf::player" => qw(peaceful)],
3091 ["cf::map" => qw(trigger)], 3075 ["cf::map" => qw(trigger)],
3092) { 3076) {
3093 no strict 'refs'; 3077 no strict 'refs';
3301 while (my ($k, $v) = each %$want) { 3285 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3286 $ns->fx_want ($k, $v);
3303 } 3287 }
3304}; 3288};
3305 3289
3290sub load_resource_file($) {
3291 my $guard = lock_acquire "load_resource_file";
3292
3293 my $status = load_resource_file_ $_[0];
3294 get_slot 0.1, 100;
3295 cf::arch::commit_load;
3296
3297 $status
3298}
3299
3306sub reload_regions { 3300sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3301 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3302 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3303 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3304
3323} 3317}
3324 3318
3325sub reload_archetypes { 3319sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3320 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3321 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} 3322}
3334 3323
3335sub reload_treasures { 3324sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3325 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3326 or die "unable to load treasurelists\n";
3338} 3327}
3339 3328
3340sub reload_resources { 3329sub reload_resources {
3341 warn "reloading resource files...\n"; 3330 warn "reloading resource files...\n";
3342 3331
3332 reload_facedata;
3333 reload_archetypes;
3343 reload_regions; 3334 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3335 reload_treasures;
3348 3336
3349 warn "finished reloading resource files\n"; 3337 warn "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3338}
3355 3339
3356sub reload_config { 3340sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3341 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3342 or return;
3372 }; 3356 };
3373 warn $@ if $@; 3357 warn $@ if $@;
3374 } 3358 }
3375} 3359}
3376 3360
3361sub pidfile() {
3362 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3363 or die "$PIDFILE: $!";
3364 flock $fh, &Fcntl::LOCK_EX
3365 or die "$PIDFILE: flock: $!";
3366 $fh
3367}
3368
3369# make sure only one server instance is running at any one time
3370sub atomic {
3371 my $fh = pidfile;
3372
3373 my $pid = <$fh>;
3374 kill 9, $pid if $pid > 0;
3375
3376 seek $fh, 0, 0;
3377 print $fh $$;
3378}
3379
3377sub main { 3380sub main {
3381 cf::init_globals; # initialise logging
3382
3383 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3384 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3385 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3386 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3387
3388 cf::init_experience;
3389 cf::init_anim;
3390 cf::init_attackmess;
3391 cf::init_dynamic;
3392
3393 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3394
3378 # we must not ever block the main coroutine 3395 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3396 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3397 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3398 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3399 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3400 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3401 })->prio (Coro::PRIO_MAX);
3385 }; 3402 };
3386 3403
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; 3404 evthread_start IO::AIO::poll_fileno;
3405
3406 cf::sync_job {
3407 reload_resources;
3408 reload_config;
3409 db_init;
3410
3411 cf::load_settings;
3412 cf::load_materials;
3413 cf::init_uuid;
3414 cf::init_signals;
3415 cf::init_commands;
3416 cf::init_skills;
3417
3418 cf::init_beforeplay;
3419
3420 atomic;
3421
3422 load_extensions;
3423
3424 utime time, time, $RUNTIMEFILE;
3425
3426 # no (long-running) fork's whatsoever before this point(!)
3427 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3428
3429 (pop @POST_INIT)->(0) while @POST_INIT;
3430 };
3431
3393 EV::loop; 3432 EV::loop;
3394} 3433}
3395 3434
3396############################################################################# 3435#############################################################################
3397# initialisation and cleanup 3436# initialisation and cleanup
3405 }; 3444 };
3406 } 3445 }
3407} 3446}
3408 3447
3409sub write_runtime_sync { 3448sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3449 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3450 # the fsync below can take a very very long time.
3414 3451
3415 IO::AIO::aio_utime $runtime, undef, undef; 3452 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3453
3417 my $guard = cf::lock_acquire "write_runtime"; 3454 my $guard = cf::lock_acquire "write_runtime";
3418 3455
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3456 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3457 or return;
3421 3458
3422 my $value = $cf::RUNTIME + 90 + 10; 3459 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3460 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3461 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3471 aio_utime $fh, undef, undef;
3435 3472
3436 close $fh 3473 close $fh
3437 or return; 3474 or return;
3438 3475
3439 aio_rename "$runtime~", $runtime 3476 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3477 and return;
3441 3478
3442 warn "runtime file written.\n"; 3479 warn "runtime file written.\n";
3443 3480
3444 1 3481 1
3456 my $uuid = "$LOCALDIR/uuid"; 3493 my $uuid = "$LOCALDIR/uuid";
3457 3494
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3495 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3496 or return;
3460 3497
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3498 my $value = uuid_seq uuid_cur;
3499
3500 unless ($value) {
3501 warn "cowardly refusing to write zero uuid value!\n";
3502 return;
3503 }
3504
3505 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3506 $uuid_skip = 0;
3463 3507
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3508 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3509 and return;
3466 3510
3488} 3532}
3489 3533
3490sub emergency_save() { 3534sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3535 my $freeze_guard = cf::freeze_mainloop;
3492 3536
3493 warn "enter emergency perl save\n"; 3537 warn "emergency_perl_save: enter\n";
3494 3538
3495 cf::sync_job { 3539 cf::sync_job {
3540 # this is a trade-off: we want to be very quick here, so
3541 # save all maps without fsync, and later call a global sync
3542 # (which in turn might be very very slow)
3543 local $USE_FSYNC = 0;
3544
3496 # use a peculiar iteration method to avoid tripping on perl 3545 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3546 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3547 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3548 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3549 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3550 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3551 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3552 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3553 $pl->save;
3505 } 3554 }
3506 warn "end emergency player save\n"; 3555 warn "emergency_perl_save: end player save\n";
3507 3556
3508 warn "begin emergency map save\n"; 3557 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3558 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3559 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3560 $map->valid or next;
3512 $map->save; 3561 $map->save;
3513 } 3562 }
3514 warn "end emergency map save\n"; 3563 warn "emergency_perl_save: end map save\n";
3515 3564
3516 warn "begin emergency database checkpoint\n"; 3565 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3566 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3567 warn "emergency_perl_save: end database checkpoint\n";
3519 3568
3520 warn "begin write uuid\n"; 3569 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3570 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3571 warn "emergency_perl_save: end write uuid\n";
3523 }; 3572 };
3524 3573
3574 warn "emergency_perl_save: starting sync()\n";
3575 IO::AIO::aio_sync sub {
3576 warn "emergency_perl_save: finished sync()\n";
3577 };
3578
3525 warn "leave emergency perl save\n"; 3579 warn "emergency_perl_save: leave\n";
3526} 3580}
3527 3581
3528sub post_cleanup { 3582sub post_cleanup {
3529 my ($make_core) = @_; 3583 my ($make_core) = @_;
3530 3584
3531 warn Carp::longmess "post_cleanup backtrace" 3585 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3586 if $make_core;
3587
3588 my $fh = pidfile;
3589 unlink $PIDFILE if <$fh> == $$;
3590}
3591
3592# a safer delete_package, copied from Symbol
3593sub clear_package($) {
3594 my $pkg = shift;
3595
3596 # expand to full symbol table name if needed
3597 unless ($pkg =~ /^main::.*::$/) {
3598 $pkg = "main$pkg" if $pkg =~ /^::/;
3599 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3600 $pkg .= '::' unless $pkg =~ /::$/;
3601 }
3602
3603 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3604 my $stem_symtab = *{$stem}{HASH};
3605
3606 defined $stem_symtab and exists $stem_symtab->{$leaf}
3607 or return;
3608
3609 # clear all symbols
3610 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3611 for my $name (keys %$leaf_symtab) {
3612 _gv_clear *{"$pkg$name"};
3613# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3614 }
3615 warn "cleared package $pkg\n";#d#
3533} 3616}
3534 3617
3535sub do_reload_perl() { 3618sub do_reload_perl() {
3536 # can/must only be called in main 3619 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3620 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3621 warn "can only reload from main coroutine";
3539 return; 3622 return;
3540 } 3623 }
3541 3624
3625 return if $RELOAD++;
3626
3627 my $t1 = EV::time;
3628
3629 while ($RELOAD) {
3542 warn "reloading..."; 3630 warn "reloading...";
3543 3631
3544 warn "entering sync_job"; 3632 warn "entering sync_job";
3545 3633
3546 cf::sync_job { 3634 cf::sync_job {
3547 cf::write_runtime_sync; # external watchdog should not bark 3635 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3636 cf::emergency_save;
3549 cf::write_runtime_sync; # external watchdog should not bark 3637 cf::write_runtime_sync; # external watchdog should not bark
3550 3638
3551 warn "syncing database to disk"; 3639 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3640 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3641
3554 # if anything goes wrong in here, we should simply crash as we already saved 3642 # if anything goes wrong in here, we should simply crash as we already saved
3555 3643
3556 warn "flushing outstanding aio requests"; 3644 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; 3645 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3646 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 } 3647 }
3588 3648
3589 warn "... nuking $pkg"; 3649 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3650 $_->cancel for values %EXT_CORO;
3591 } 3651 %EXT_CORO = ();
3592 3652
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3653 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3654 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3655
3656 warn "removing ext/exti commands";
3657 %EXTCMD = ();
3658 %EXTICMD = ();
3659
3660 warn "unloading/nuking all extensions";
3661 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3662 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3663
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3664 if (my $cb = $pkg->can ("unload")) {
3665 eval {
3604 $cb->(); 3666 $cb->($pkg);
3667 1
3668 } or warn "$pkg unloaded, but with errors: $@";
3669 }
3670
3671 warn "... clearing $pkg";
3672 clear_package $pkg;
3605 } 3673 }
3606 3674
3607 Symbol::delete_package $k; 3675 warn "unloading all perl modules loaded from $LIBDIR";
3676 while (my ($k, $v) = each %INC) {
3677 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3678
3679 warn "... unloading $k";
3680 delete $INC{$k};
3681
3682 $k =~ s/\.pm$//;
3683 $k =~ s/\//::/g;
3684
3685 if (my $cb = $k->can ("unload_module")) {
3686 $cb->();
3687 }
3688
3689 clear_package $k;
3608 } 3690 }
3609 3691
3610 warn "getting rid of safe::, as good as possible"; 3692 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3693 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3694 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3695
3614 warn "unloading cf.pm \"a bit\""; 3696 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3697 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3698 delete $INC{"cf/pod.pm"};
3617 3699
3618 # don't, removes xs symbols, too, 3700 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3701 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3702 #clear_package __PACKAGE__;
3621 3703
3622 warn "unload completed, starting to reload now"; 3704 warn "unload completed, starting to reload now";
3623 3705
3624 warn "reloading cf.pm"; 3706 warn "reloading cf.pm";
3625 require cf; 3707 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3708 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3709
3628 warn "loading config and database again"; 3710 warn "loading config and database again";
3629 cf::reload_config; 3711 cf::reload_config;
3630 3712
3631 warn "loading extensions"; 3713 warn "loading extensions";
3632 cf::load_extensions; 3714 cf::load_extensions;
3633 3715
3716 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3717 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3718 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3719 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3720 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3721 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3722 reattach $_ for values %PLAYER;
3723 }
3640 3724
3725 warn "running post_init jobs";
3726 (pop @POST_INIT)->(1) while @POST_INIT;
3727
3641 warn "leaving sync_job"; 3728 warn "leaving sync_job";
3642 3729
3643 1 3730 1
3644 } or do { 3731 } or do {
3645 warn $@; 3732 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3733 cf::cleanup "error while reloading, exiting.";
3647 }; 3734 };
3648 3735
3649 warn "reloaded"; 3736 warn "reloaded";
3737 --$RELOAD;
3738 }
3739
3740 $t1 = EV::time - $t1;
3741 warn "reload completed in ${t1}s\n";
3650}; 3742};
3651 3743
3652our $RELOAD_WATCHER; # used only during reload 3744our $RELOAD_WATCHER; # used only during reload
3653 3745
3654sub reload_perl() { 3746sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3747 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3748 # coro crashes during coro_state_free->destroy here.
3657 3749
3750 $RELOAD_WATCHER ||= cf::async {
3751 Coro::AIO::aio_wait cache_extensions;
3752
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3753 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3754 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3755 undef $RELOAD_WATCHER;
3756 };
3661 }; 3757 };
3662} 3758}
3663 3759
3664register_command "reload" => sub { 3760register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3761 my ($who, $arg) = @_;
3679 3775
3680our @WAIT_FOR_TICK; 3776our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3777our @WAIT_FOR_TICK_BEGIN;
3682 3778
3683sub wait_for_tick { 3779sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3780 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3781
3687 my $signal = new Coro::Signal; 3782 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3783 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3784 $signal->wait;
3690} 3785}
3691 3786
3692sub wait_for_tick_begin { 3787sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3788 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3789
3696 my $signal = new Coro::Signal; 3790 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3791 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3792 $signal->wait;
3699} 3793}
3738{ 3832{
3739 # configure BDB 3833 # configure BDB
3740 3834
3741 BDB::min_parallel 8; 3835 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3836 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3837 $AnyEvent::BDB::WATCHER->priority (1);
3744 3838
3745 unless ($DB_ENV) { 3839 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3840 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3841 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 3842 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3843 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3844 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3845 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3846
3752 cf::sync_job { 3847 cf::sync_job {
3753 eval { 3848 eval {
3779{ 3874{
3780 # configure IO::AIO 3875 # configure IO::AIO
3781 3876
3782 IO::AIO::min_parallel 8; 3877 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3878 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3879 undef $AnyEvent::AIO::WATCHER;
3785} 3880}
3786 3881
3787my $_log_backtrace; 3882my $_log_backtrace;
3788 3883
3789sub _log_backtrace { 3884sub _log_backtrace {
3792 $msg =~ s/\n//; 3887 $msg =~ s/\n//;
3793 3888
3794 # limit the # of concurrent backtraces 3889 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3890 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3891 ++$_log_backtrace;
3892 my $perl_bt = Carp::longmess $msg;
3797 async { 3893 async {
3798 $Coro::current->{desc} = "abt $msg"; 3894 $Coro::current->{desc} = "abt $msg";
3799 3895
3800 my @bt = fork_call { 3896 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3897 @addr = map { sprintf "%x", $_ } @addr;
3812 } 3908 }
3813 3909
3814 @funcs 3910 @funcs
3815 }; 3911 };
3816 3912
3817 LOG llevInfo, "[ABT] $msg\n"; 3913 LOG llevInfo, "[ABT] $perl_bt\n";
3914 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3915 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3916 --$_log_backtrace;
3820 }; 3917 };
3821 } else { 3918 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3919 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines