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.423 by root, Sun Apr 20 00:44:13 2008 UTC vs.
Revision 1.464 by root, Thu Jan 1 18:35:48 2009 UTC

… …
19# The authors can be reached via e-mail to <support@deliantra.net> 19# The authors can be reached via e-mail to <support@deliantra.net>
20# 20#
21 21
22package cf; 22package cf;
23 23
24use 5.10.0;
24use utf8; 25use utf8;
25use strict; 26use strict "vars", "subs";
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 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
… …
724 727
725############################################################################# 728#############################################################################
726 729
727=head2 ATTACHABLE OBJECTS 730=head2 ATTACHABLE OBJECTS
728 731
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 733attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 734to it. All such attachable objects support the following methods.
732 735
733In 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>
734C<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
… …
784=item cf::CLASS::attachment $name, ... 787=item cf::CLASS::attachment $name, ...
785 788
786Register an attachment by C<$name> through which attachable objects of the 789Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 790given CLASS can refer to this attachment.
788 791
789Some classes such as crossfire maps and objects can specify attachments 792Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 794
792These calls expect any number of the following handler/hook descriptions: 795These calls expect any number of the following handler/hook descriptions:
793 796
794=over 4 797=over 4
… …
1085 1088
1086sub reattach { 1089sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1090 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1091 my ($obj) = @_;
1089 1092
1093 # no longer needed after getting rid of delete_package?
1090 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
1091 1095
1092 my $registry = $obj->registry; 1096 my $registry = $obj->registry;
1093 1097
1094 @$registry = (); 1098 @$registry = ();
1095 1099
… …
1141 utf8::decode (my $decname = $filename); 1145 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1146 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1147 $decname, length $$rdata, scalar @$objs;
1144 1148
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1149 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1150 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1151 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1152 aio_fsync $fh if $cf::USE_FSYNC;
1149 close $fh; 1153 aio_close $fh;
1150 1154
1151 if (@$objs) { 1155 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1157 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1158 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1159 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1160 aio_fsync $fh if $cf::USE_FSYNC;
1157 close $fh; 1161 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1162 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1163 }
1160 } else { 1164 } else {
1161 aio_unlink "$filename.pst"; 1165 aio_unlink "$filename.pst";
1162 } 1166 }
1163 1167
1164 aio_rename "$filename~", $filename; 1168 aio_rename "$filename~", $filename;
1169
1170 $filename =~ s%/[^/]+$%%;
1171 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1172 } else {
1166 warn "FATAL: $filename~: $!\n"; 1173 warn "unable to save objects: $filename~: $!\n";
1167 } 1174 }
1168 } else { 1175 } else {
1169 aio_unlink $filename; 1176 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1177 aio_unlink "$filename.pst";
1171 } 1178 }
… …
1262 my ($name, $cb) = @_; 1269 my ($name, $cb) = @_;
1263 1270
1264 $EXTICMD{$name} = $cb; 1271 $EXTICMD{$name} = $cb;
1265} 1272}
1266 1273
1274use File::Glob ();
1275
1267cf::player->attach ( 1276cf::player->attach (
1268 on_command => sub { 1277 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1278 my ($pl, $name, $params) = @_;
1270 1279
1271 my $cb = $COMMAND{$name} 1280 my $cb = $COMMAND{$name}
… …
1303 1312
1304 cf::override; 1313 cf::override;
1305 }, 1314 },
1306); 1315);
1307 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
1308sub load_extensions { 1330sub load_extensions {
1309 cf::sync_job { 1331 cf::sync_job {
1310 my %todo; 1332 my %todo;
1311 1333
1312 for my $path (<$LIBDIR/*.ext>) { 1334 for my $path (<$LIBDIR/*.ext>) {
… …
1331 1353
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1354 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1355 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1356
1335 $ext{source} = 1357 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1358 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1359 . "#line 1 \"$path\"\n{\n"
1338 . $source 1360 . $source
1339 . "\n};\n1"; 1361 . "\n};\n1";
1340 1362
1341 $todo{$base} = \%ext; 1363 $todo{$base} = \%ext;
… …
1381 1403
1382=back 1404=back
1383 1405
1384=head2 CORE EXTENSIONS 1406=head2 CORE EXTENSIONS
1385 1407
1386Functions and methods that extend core crossfire objects. 1408Functions and methods that extend core deliantra objects.
1387 1409
1388=cut 1410=cut
1389 1411
1390package cf::player; 1412package cf::player;
1391 1413
… …
1434 1456
1435sub exists($) { 1457sub exists($) {
1436 my ($login) = @_; 1458 my ($login) = @_;
1437 1459
1438 $cf::PLAYER{$login} 1460 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1461 or !aio_stat path $login
1440} 1462}
1441 1463
1442sub find($) { 1464sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1465 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1466 my $login = $_[0];
… …
1456 my $f = new_from_file cf::object::thawer path $login 1478 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1479 or return;
1458 1480
1459 my $pl = cf::player::load_pl $f 1481 my $pl = cf::player::load_pl $f
1460 or return; 1482 or return;
1483
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1484 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1485 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1486 $cf::PLAYER{$login} = $pl
1464 } 1487 }
1465 } 1488 }
… …
1518 my ($pl) = @_; 1541 my ($pl) = @_;
1519 1542
1520 my $name = $pl->ob->name; 1543 my $name = $pl->ob->name;
1521 1544
1522 $pl->{deny_save} = 1; 1545 $pl->{deny_save} = 1;
1523 $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
1524 1547
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1548 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1549 $pl->deactivate;
1550 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1551 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1552 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1553 $pl->ns->destroy if $pl->ns;
1529 1554
1530 my $path = playerdir $pl; 1555 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1556 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1570 1595
1571 for my $login (@$dirs) { 1596 for my $login (@$dirs) {
1572 my $path = path $login; 1597 my $path = path $login;
1573 1598
1574 # a .pst is a dead give-away for a valid player 1599 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1600 # if no pst file found, open and chekc for blocked users
1601 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1602 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1603 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1604 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1605 }
1580 1606
… …
1611 } 1637 }
1612 1638
1613 \@paths 1639 \@paths
1614} 1640}
1615 1641
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1642=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1643
1618Expand crossfire pod fragments into protocol xml. 1644Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1645
1709=item $player->ext_reply ($msgid, @msg) 1646=item $player->ext_reply ($msgid, @msg)
1710 1647
1711Sends an ext reply to the player. 1648Sends an ext reply to the player.
1712 1649
… …
1925 1862
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1863 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1864 "$UNIQUEDIR/$path"
1928} 1865}
1929 1866
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1867sub decay_objects {
1940 my ($self) = @_; 1868 my ($self) = @_;
1941 1869
1942 return if $self->{deny_reset}; 1870 return if $self->{deny_reset};
1943 1871
… …
2025sub find { 1953sub find {
2026 my ($path, $origin) = @_; 1954 my ($path, $origin) = @_;
2027 1955
2028 $path = normalise $path, $origin && $origin->path; 1956 $path = normalise $path, $origin && $origin->path;
2029 1957
2030 cf::lock_wait "map_data:$path";#d#remove 1958 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1959 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1960
2033 $cf::MAP{$path} || do { 1961 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
2038 or return; 1963 or return;
2039 1964
2040 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
2041 1966
… …
2043 or return; 1968 or return;
2044 1969
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard2;
2048 undef $guard1; 1974 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1975 $map->reset;
2051 return find $path; 1976 return find $path;
2052 } 1977 }
2053 1978
2054 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
… …
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2007 $f->skip_block;
2083 $self->_load_objects ($f) 2008 $self->_load_objects ($f)
2084 or return; 2009 or return;
2085 2010
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->post_load_original
2087 if delete $self->{load_original}; 2012 if delete $self->{load_original};
2088 2013
2089 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2015 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2016 unless (aio_stat $uniq) {
… …
2108 2033
2109 unless ($self->{deny_activate}) { 2034 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2035 $self->decay_objects;
2111 $self->fix_auto_apply; 2036 $self->fix_auto_apply;
2112 $self->update_buttons; 2037 $self->update_buttons;
2113 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick; 2038 cf::cede_to_tick;
2116 $self->activate; 2039 $self->activate;
2117 } 2040 }
2118 2041
2119 $self->{last_save} = $cf::RUNTIME; 2042 $self->{last_save} = $cf::RUNTIME;
… …
2457can 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
2458dialogue with the given NPC character. 2381dialogue with the given NPC character.
2459 2382
2460=cut 2383=cut
2461 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
2462# rough implementation of a future "reply" method that works 2399# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2400# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2402sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2403 my ($self, $npc, $msg, $flags) = @_;
… …
2477 my $dialog = $pl->{npc_dialog}; 2414 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2416
2480 } else { 2417 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2418 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2419 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2420 }
2484 } 2421 }
2485} 2422}
2486 2423
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2424=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2512 2449
2513=item $player_object->enter_link 2450=item $player_object->enter_link
2514 2451
2515Freezes 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}>).
2516 2453
2517The 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.
2518I<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.
2519 2458
2520Will never block. 2459Will never block.
2521 2460
2522=item $player_object->leave_link ($map, $x, $y) 2461=item $player_object->leave_link ($map, $x, $y)
2523 2462
… …
2581 2520
2582 $map->load; 2521 $map->load;
2583 $map->load_neighbours; 2522 $map->load_neighbours;
2584 2523
2585 return unless $self->contr->active; 2524 return unless $self->contr->active;
2525 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2586 $self->activate_recursive; 2526 $self->activate_recursive;
2587 2527
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2528 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2529 $self->enter_map ($map, $x, $y);
2590} 2530}
… …
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2535her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2542
2600=cut 2543=cut
2601 2544
2602our $GOTOGEN; 2545our $GOTOGEN;
2603 2546
… …
2682} 2625}
2683 2626
2684sub prepare_random_map { 2627sub prepare_random_map {
2685 my ($exit) = @_; 2628 my ($exit) = @_;
2686 2629
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2630 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2631 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2632 # that depends on the exit object
2692 2633
2693 my $rmp = parse_random_map_params $exit->msg; 2634 my $rmp = parse_random_map_params $exit->msg;
… …
2695 if ($exit->map) { 2636 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2637 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2638 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2639 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2640 $rmp->{origin_y} = $exit->y;
2641
2642 $exit->map->touch;
2700 } 2643 }
2701 2644
2702 $rmp->{random_seed} ||= $exit->random_seed; 2645 $rmp->{random_seed} ||= $exit->random_seed;
2703 2646
2704 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp); 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
… …
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2651 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2652 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2653 undef $fh;
2711 aio_rename "$meta~", $meta; 2654 aio_rename "$meta~", $meta;
2712 2655
2656 my $slaying = "?random/$md5";
2657
2658 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2659 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2660 $exit->msg (undef);
2661 }
2715 } 2662 }
2716} 2663}
2717 2664
2718sub cf::object::player::enter_exit { 2665sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2666 my ($self, $exit) = @_;
2720 2667
2721 return unless $self->type == cf::PLAYER; 2668 return unless $self->type == cf::PLAYER;
2722 2669
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2670 $self->enter_link;
2735 2671
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2672 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2673 $Coro::current->{desc} = "enter_exit";
2742 2674
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2690 $self->goto ($map, $x, $y);
2746 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
2747 1; 2696 1
2748 }) { 2697 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2698 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2700 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2701 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2702
2754 warn "ERROR in enter_exit: $@"; 2703 warn "ERROR in enter_exit: $@";
… …
2820 id => "infobox", 2769 id => "infobox",
2821 title => "Body Parts", 2770 title => "Body Parts",
2822 reply => undef, 2771 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2772 tooltip => "Shows which body parts you posess and are available",
2824 }, 2773 },
2774 "c/skills" => {
2775 id => "infobox",
2776 title => "Skills",
2777 reply => undef,
2778 tooltip => "Shows your experience per skill and item power",
2779 },
2825 "c/uptime" => { 2780 "c/uptime" => {
2826 id => "infobox", 2781 id => "infobox",
2827 title => "Uptime", 2782 title => "Uptime",
2828 reply => undef, 2783 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2784 tooltip => "How long the server has been running since last restart",
… …
2832 id => "infobox", 2787 id => "infobox",
2833 title => "Map Info", 2788 title => "Map Info",
2834 reply => undef, 2789 reply => undef,
2835 tooltip => "Information related to the maps", 2790 tooltip => "Information related to the maps",
2836 }, 2791 },
2792 "c/party" => {
2793 id => "party",
2794 title => "Party",
2795 reply => "gsay ",
2796 tooltip => "Messages and chat related to your party",
2797 },
2798 "c/death" => {
2799 id => "death",
2800 title => "Death",
2801 reply => undef,
2802 tooltip => "Reason for and more info about your most recent death",
2803 },
2804 "c/say" => $SAY_CHANNEL,
2805 "c/chat" => $CHAT_CHANNEL,
2837); 2806);
2838 2807
2839sub cf::client::send_msg { 2808sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2809 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2810
2842 $msg = $self->pl->expand_cfpod ($msg); 2811 $msg = $self->pl->expand_cfpod ($msg)
2812 unless $color & cf::NDI_VERBATIM;
2843 2813
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2814 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2815
2846 # check predefined channels, for the benefit of C 2816 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2817 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2818 $channel = $CHANNEL{$channel};
2849 2819
2850 $self->ext_msg (channel_info => $channel) 2820 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2821 $channel = $channel->{id};
2854 2822
2855 } elsif (ref $channel) { 2823 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2824 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2825 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2826 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2827 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2828 }
2862 2829
2863 $channel = $channel->{id}; 2830 $channel = $channel->{id};
2864 } 2831 }
2865 2832
2866 return unless @extra || length $msg; 2833 return unless @extra || length $msg;
2867 2834
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2835 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2836 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2837 if $color & cf::NDI_DEF;
2872 2838
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2839 my $pkt = "msg "
2840 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2841 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2842 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 2843
2887 $color &= cf::NDI_COLOR_MASK; 2844 # try lzf for large packets
2845 $pkt = "lzf " . Compress::LZF::compress $pkt
2846 if 1024 <= length $pkt and $self->{can_lzf};
2888 2847
2889 utf8::encode $msg; 2848 # split very large packets
2890 2849 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2850 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2851 $pkt = "frag";
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 } 2852 }
2853
2854 $self->send_packet ($pkt);
2900} 2855}
2901 2856
2902=item $client->ext_msg ($type, @msg) 2857=item $client->ext_msg ($type, @msg)
2903 2858
2904Sends an ext event to the client. 2859Sends an ext event to the client.
… …
3078 3033
3079The following functions and methods are available within a safe environment: 3034The following functions and methods are available within a safe environment:
3080 3035
3081 cf::object 3036 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3037 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3038 insert remove name archname title slaying race decrease split
3084 3039
3085 cf::object::player 3040 cf::object::player
3086 player 3041 player
3087 3042
3088 cf::player 3043 cf::player
… …
3093 3048
3094=cut 3049=cut
3095 3050
3096for ( 3051for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3052 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3053 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3054 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3055 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3056 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3057 ["cf::map" => qw(trigger)],
3103) { 3058) {
3104 no strict 'refs'; 3059 no strict 'refs';
… …
3313 $ns->fx_want ($k, $v); 3268 $ns->fx_want ($k, $v);
3314 } 3269 }
3315}; 3270};
3316 3271
3317sub load_resource_file($) { 3272sub load_resource_file($) {
3273 my $guard = lock_acquire "load_resource_file";
3274
3318 my $status = load_resource_file_ $_[0]; 3275 my $status = load_resource_file_ $_[0];
3319 get_slot 0.1, 100; 3276 get_slot 0.1, 100;
3320 cf::arch::commit_load; 3277 cf::arch::commit_load;
3278
3321 $status 3279 $status
3322} 3280}
3323 3281
3324sub reload_regions { 3282sub reload_regions {
3325 # HACK to clear player env face cache, we need some signal framework 3283 # HACK to clear player env face cache, we need some signal framework
… …
3357 reload_archetypes; 3315 reload_archetypes;
3358 reload_regions; 3316 reload_regions;
3359 reload_treasures; 3317 reload_treasures;
3360 3318
3361 warn "finished reloading resource files\n"; 3319 warn "finished reloading resource files\n";
3362}
3363
3364sub init {
3365 my $guard = freeze_mainloop;
3366
3367 reload_resources;
3368} 3320}
3369 3321
3370sub reload_config { 3322sub reload_config {
3371 open my $fh, "<:utf8", "$CONFDIR/config" 3323 open my $fh, "<:utf8", "$CONFDIR/config"
3372 or return; 3324 or return;
… …
3386 }; 3338 };
3387 warn $@ if $@; 3339 warn $@ if $@;
3388 } 3340 }
3389} 3341}
3390 3342
3343sub pidfile() {
3344 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3345 or die "$PIDFILE: $!";
3346 flock $fh, &Fcntl::LOCK_EX
3347 or die "$PIDFILE: flock: $!";
3348 $fh
3349}
3350
3351# make sure only one server instance is running at any one time
3352sub atomic {
3353 my $fh = pidfile;
3354
3355 my $pid = <$fh>;
3356 kill 9, $pid if $pid > 0;
3357
3358 seek $fh, 0, 0;
3359 print $fh $$;
3360}
3361
3391sub main { 3362sub main {
3363 cf::init_globals; # initialise logging
3364
3365 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3366 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3367 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3368 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3369
3370 cf::init_experience;
3371 cf::init_anim;
3372 cf::init_attackmess;
3373 cf::init_dynamic;
3374
3375 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3376
3392 # we must not ever block the main coroutine 3377 # we must not ever block the main coroutine
3393 local $Coro::idle = sub { 3378 local $Coro::idle = sub {
3394 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3379 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3395 (async { 3380 (async {
3396 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3381 $Coro::current->{desc} = "IDLE BUG HANDLER";
3397 EV::loop EV::LOOP_ONESHOT; 3382 EV::loop EV::LOOP_ONESHOT;
3398 })->prio (Coro::PRIO_MAX); 3383 })->prio (Coro::PRIO_MAX);
3399 }; 3384 };
3400 3385
3401 { 3386 evthread_start IO::AIO::poll_fileno;
3402 my $guard = freeze_mainloop; 3387
3388 cf::sync_job {
3389 reload_resources;
3403 reload_config; 3390 reload_config;
3404 db_init; 3391 db_init;
3392
3393 cf::load_settings;
3394 cf::load_materials;
3395 cf::init_uuid;
3396 cf::init_signals;
3397 cf::init_commands;
3398 cf::init_skills;
3399
3400 cf::init_beforeplay;
3401
3402 atomic;
3403
3405 load_extensions; 3404 load_extensions;
3406 3405
3407 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority 3406 utime time, time, $RUNTIMEFILE;
3408 evthread_start IO::AIO::poll_fileno; 3407
3408 # no (long-running) fork's whatsoever before this point(!)
3409 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3410
3411 (pop @POST_INIT)->(0) while @POST_INIT;
3409 } 3412 };
3410 3413
3411 EV::loop; 3414 EV::loop;
3412} 3415}
3413 3416
3414############################################################################# 3417#############################################################################
… …
3423 }; 3426 };
3424 } 3427 }
3425} 3428}
3426 3429
3427sub write_runtime_sync { 3430sub write_runtime_sync {
3428 my $runtime = "$LOCALDIR/runtime";
3429
3430 # first touch the runtime file to show we are still running: 3431 # first touch the runtime file to show we are still running:
3431 # the fsync below can take a very very long time. 3432 # the fsync below can take a very very long time.
3432 3433
3433 IO::AIO::aio_utime $runtime, undef, undef; 3434 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3434 3435
3435 my $guard = cf::lock_acquire "write_runtime"; 3436 my $guard = cf::lock_acquire "write_runtime";
3436 3437
3437 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3438 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3438 or return; 3439 or return;
3439 3440
3440 my $value = $cf::RUNTIME + 90 + 10; 3441 my $value = $cf::RUNTIME + 90 + 10;
3441 # 10 is the runtime save interval, for a monotonic clock 3442 # 10 is the runtime save interval, for a monotonic clock
3442 # 60 allows for the watchdog to kill the server. 3443 # 60 allows for the watchdog to kill the server.
… …
3452 aio_utime $fh, undef, undef; 3453 aio_utime $fh, undef, undef;
3453 3454
3454 close $fh 3455 close $fh
3455 or return; 3456 or return;
3456 3457
3457 aio_rename "$runtime~", $runtime 3458 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3458 and return; 3459 and return;
3459 3460
3460 warn "runtime file written.\n"; 3461 warn "runtime file written.\n";
3461 3462
3462 1 3463 1
… …
3474 my $uuid = "$LOCALDIR/uuid"; 3475 my $uuid = "$LOCALDIR/uuid";
3475 3476
3476 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3477 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3477 or return; 3478 or return;
3478 3479
3479 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3480 my $value = uuid_seq uuid_cur;
3481
3482 unless ($value) {
3483 warn "cowardly refusing to write zero uuid value!\n";
3484 return;
3485 }
3486
3487 my $value = uuid_str $value + $uuid_skip;
3480 $uuid_skip = 0; 3488 $uuid_skip = 0;
3481 3489
3482 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3490 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3483 and return; 3491 and return;
3484 3492
… …
3506} 3514}
3507 3515
3508sub emergency_save() { 3516sub emergency_save() {
3509 my $freeze_guard = cf::freeze_mainloop; 3517 my $freeze_guard = cf::freeze_mainloop;
3510 3518
3511 warn "enter emergency perl save\n"; 3519 warn "emergency_perl_save: enter\n";
3512 3520
3513 cf::sync_job { 3521 cf::sync_job {
3522 # this is a trade-off: we want to be very quick here, so
3523 # save all maps without fsync, and later call a global sync
3524 # (which in turn might be very very slow)
3525 local $USE_FSYNC = 0;
3526
3514 # use a peculiar iteration method to avoid tripping on perl 3527 # use a peculiar iteration method to avoid tripping on perl
3515 # refcount bugs in for. also avoids problems with players 3528 # refcount bugs in for. also avoids problems with players
3516 # and maps saved/destroyed asynchronously. 3529 # and maps saved/destroyed asynchronously.
3517 warn "begin emergency player save\n"; 3530 warn "emergency_perl_save: begin player save\n";
3518 for my $login (keys %cf::PLAYER) { 3531 for my $login (keys %cf::PLAYER) {
3519 my $pl = $cf::PLAYER{$login} or next; 3532 my $pl = $cf::PLAYER{$login} or next;
3520 $pl->valid or next; 3533 $pl->valid or next;
3521 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3534 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3522 $pl->save; 3535 $pl->save;
3523 } 3536 }
3524 warn "end emergency player save\n"; 3537 warn "emergency_perl_save: end player save\n";
3525 3538
3526 warn "begin emergency map save\n"; 3539 warn "emergency_perl_save: begin map save\n";
3527 for my $path (keys %cf::MAP) { 3540 for my $path (keys %cf::MAP) {
3528 my $map = $cf::MAP{$path} or next; 3541 my $map = $cf::MAP{$path} or next;
3529 $map->valid or next; 3542 $map->valid or next;
3530 $map->save; 3543 $map->save;
3531 } 3544 }
3532 warn "end emergency map save\n"; 3545 warn "emergency_perl_save: end map save\n";
3533 3546
3534 warn "begin emergency database checkpoint\n"; 3547 warn "emergency_perl_save: begin database checkpoint\n";
3535 BDB::db_env_txn_checkpoint $DB_ENV; 3548 BDB::db_env_txn_checkpoint $DB_ENV;
3536 warn "end emergency database checkpoint\n"; 3549 warn "emergency_perl_save: end database checkpoint\n";
3537 3550
3538 warn "begin write uuid\n"; 3551 warn "emergency_perl_save: begin write uuid\n";
3539 write_uuid_sync 1; 3552 write_uuid_sync 1;
3540 warn "end write uuid\n"; 3553 warn "emergency_perl_save: end write uuid\n";
3541 }; 3554 };
3542 3555
3556 warn "emergency_perl_save: starting sync()\n";
3557 IO::AIO::aio_sync sub {
3558 warn "emergency_perl_save: finished sync()\n";
3559 };
3560
3543 warn "leave emergency perl save\n"; 3561 warn "emergency_perl_save: leave\n";
3544} 3562}
3545 3563
3546sub post_cleanup { 3564sub post_cleanup {
3547 my ($make_core) = @_; 3565 my ($make_core) = @_;
3548 3566
3549 warn Carp::longmess "post_cleanup backtrace" 3567 warn Carp::longmess "post_cleanup backtrace"
3550 if $make_core; 3568 if $make_core;
3569
3570 my $fh = pidfile;
3571 unlink $PIDFILE if <$fh> == $$;
3572}
3573
3574# a safer delete_package, copied from Symbol
3575sub clear_package($) {
3576 my $pkg = shift;
3577
3578 # expand to full symbol table name if needed
3579 unless ($pkg =~ /^main::.*::$/) {
3580 $pkg = "main$pkg" if $pkg =~ /^::/;
3581 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3582 $pkg .= '::' unless $pkg =~ /::$/;
3583 }
3584
3585 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3586 my $stem_symtab = *{$stem}{HASH};
3587
3588 defined $stem_symtab and exists $stem_symtab->{$leaf}
3589 or return;
3590
3591 # clear all symbols
3592 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3593 for my $name (keys %$leaf_symtab) {
3594 _gv_clear *{"$pkg$name"};
3595# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3596 }
3597 warn "cleared package $pkg\n";#d#
3551} 3598}
3552 3599
3553sub do_reload_perl() { 3600sub do_reload_perl() {
3554 # can/must only be called in main 3601 # can/must only be called in main
3555 if ($Coro::current != $Coro::main) { 3602 if ($Coro::current != $Coro::main) {
3556 warn "can only reload from main coroutine"; 3603 warn "can only reload from main coroutine";
3557 return; 3604 return;
3558 } 3605 }
3559 3606
3607 return if $RELOAD++;
3608
3609 my $t1 = EV::time;
3610
3611 while ($RELOAD) {
3560 warn "reloading..."; 3612 warn "reloading...";
3561 3613
3562 warn "entering sync_job"; 3614 warn "entering sync_job";
3563 3615
3564 cf::sync_job { 3616 cf::sync_job {
3565 cf::write_runtime_sync; # external watchdog should not bark 3617 cf::write_runtime_sync; # external watchdog should not bark
3566 cf::emergency_save; 3618 cf::emergency_save;
3567 cf::write_runtime_sync; # external watchdog should not bark 3619 cf::write_runtime_sync; # external watchdog should not bark
3568 3620
3569 warn "syncing database to disk"; 3621 warn "syncing database to disk";
3570 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3571 3623
3572 # if anything goes wrong in here, we should simply crash as we already saved 3624 # if anything goes wrong in here, we should simply crash as we already saved
3573 3625
3574 warn "flushing outstanding aio requests"; 3626 warn "flushing outstanding aio requests";
3575 for (;;) {
3576 BDB::flush;
3577 IO::AIO::flush;
3578 Coro::cede_notself;
3579 last unless IO::AIO::nreqs || BDB::nreqs; 3627 while (IO::AIO::nreqs || BDB::nreqs) {
3580 warn "iterate..."; 3628 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3581 }
3582
3583 ++$RELOAD;
3584
3585 warn "cancelling all extension coros";
3586 $_->cancel for values %EXT_CORO;
3587 %EXT_CORO = ();
3588
3589 warn "removing commands";
3590 %COMMAND = ();
3591
3592 warn "removing ext/exti commands";
3593 %EXTCMD = ();
3594 %EXTICMD = ();
3595
3596 warn "unloading/nuking all extensions";
3597 for my $pkg (@EXTS) {
3598 warn "... unloading $pkg";
3599
3600 if (my $cb = $pkg->can ("unload")) {
3601 eval {
3602 $cb->($pkg);
3603 1
3604 } or warn "$pkg unloaded, but with errors: $@";
3605 } 3629 }
3606 3630
3607 warn "... nuking $pkg"; 3631 warn "cancelling all extension coros";
3608 Symbol::delete_package $pkg; 3632 $_->cancel for values %EXT_CORO;
3609 } 3633 %EXT_CORO = ();
3610 3634
3611 warn "unloading all perl modules loaded from $LIBDIR"; 3635 warn "removing commands";
3612 while (my ($k, $v) = each %INC) { 3636 %COMMAND = ();
3613 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3614 3637
3638 warn "removing ext/exti commands";
3639 %EXTCMD = ();
3640 %EXTICMD = ();
3641
3642 warn "unloading/nuking all extensions";
3643 for my $pkg (@EXTS) {
3615 warn "... unloading $k"; 3644 warn "... unloading $pkg";
3616 delete $INC{$k};
3617 3645
3618 $k =~ s/\.pm$//;
3619 $k =~ s/\//::/g;
3620
3621 if (my $cb = $k->can ("unload_module")) { 3646 if (my $cb = $pkg->can ("unload")) {
3647 eval {
3622 $cb->(); 3648 $cb->($pkg);
3649 1
3650 } or warn "$pkg unloaded, but with errors: $@";
3651 }
3652
3653 warn "... clearing $pkg";
3654 clear_package $pkg;
3623 } 3655 }
3624 3656
3625 Symbol::delete_package $k; 3657 warn "unloading all perl modules loaded from $LIBDIR";
3658 while (my ($k, $v) = each %INC) {
3659 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3660
3661 warn "... unloading $k";
3662 delete $INC{$k};
3663
3664 $k =~ s/\.pm$//;
3665 $k =~ s/\//::/g;
3666
3667 if (my $cb = $k->can ("unload_module")) {
3668 $cb->();
3669 }
3670
3671 clear_package $k;
3626 } 3672 }
3627 3673
3628 warn "getting rid of safe::, as good as possible"; 3674 warn "getting rid of safe::, as good as possible";
3629 Symbol::delete_package "safe::$_" 3675 clear_package "safe::$_"
3630 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3676 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3631 3677
3632 warn "unloading cf.pm \"a bit\""; 3678 warn "unloading cf.pm \"a bit\"";
3633 delete $INC{"cf.pm"}; 3679 delete $INC{"cf.pm"};
3634 delete $INC{"cf/pod.pm"}; 3680 delete $INC{"cf/pod.pm"};
3635 3681
3636 # don't, removes xs symbols, too, 3682 # don't, removes xs symbols, too,
3637 # and global variables created in xs 3683 # and global variables created in xs
3638 #Symbol::delete_package __PACKAGE__; 3684 #clear_package __PACKAGE__;
3639 3685
3640 warn "unload completed, starting to reload now"; 3686 warn "unload completed, starting to reload now";
3641 3687
3642 warn "reloading cf.pm"; 3688 warn "reloading cf.pm";
3643 require cf; 3689 require cf;
3644 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3690 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3645 3691
3646 warn "loading config and database again"; 3692 warn "loading config and database again";
3647 cf::reload_config; 3693 cf::reload_config;
3648 3694
3649 warn "loading extensions"; 3695 warn "loading extensions";
3650 cf::load_extensions; 3696 cf::load_extensions;
3651 3697
3698 if ($REATTACH_ON_RELOAD) {
3652 warn "reattaching attachments to objects/players"; 3699 warn "reattaching attachments to objects/players";
3653 _global_reattach; # objects, sockets 3700 _global_reattach; # objects, sockets
3654 warn "reattaching attachments to maps"; 3701 warn "reattaching attachments to maps";
3655 reattach $_ for values %MAP; 3702 reattach $_ for values %MAP;
3656 warn "reattaching attachments to players"; 3703 warn "reattaching attachments to players";
3657 reattach $_ for values %PLAYER; 3704 reattach $_ for values %PLAYER;
3705 }
3658 3706
3707 warn "running post_init jobs";
3708 (pop @POST_INIT)->(1) while @POST_INIT;
3709
3659 warn "leaving sync_job"; 3710 warn "leaving sync_job";
3660 3711
3661 1 3712 1
3662 } or do { 3713 } or do {
3663 warn $@; 3714 warn $@;
3664 cf::cleanup "error while reloading, exiting."; 3715 cf::cleanup "error while reloading, exiting.";
3665 }; 3716 };
3666 3717
3667 warn "reloaded"; 3718 warn "reloaded";
3719 --$RELOAD;
3720 }
3721
3722 $t1 = EV::time - $t1;
3723 warn "reload completed in ${t1}s\n";
3668}; 3724};
3669 3725
3670our $RELOAD_WATCHER; # used only during reload 3726our $RELOAD_WATCHER; # used only during reload
3671 3727
3672sub reload_perl() { 3728sub reload_perl() {
3673 # doing reload synchronously and two reloads happen back-to-back, 3729 # doing reload synchronously and two reloads happen back-to-back,
3674 # coro crashes during coro_state_free->destroy here. 3730 # coro crashes during coro_state_free->destroy here.
3675 3731
3732 $RELOAD_WATCHER ||= cf::async {
3733 Coro::AIO::aio_wait cache_extensions;
3734
3676 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3735 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3677 do_reload_perl; 3736 do_reload_perl;
3678 undef $RELOAD_WATCHER; 3737 undef $RELOAD_WATCHER;
3738 };
3679 }; 3739 };
3680} 3740}
3681 3741
3682register_command "reload" => sub { 3742register_command "reload" => sub {
3683 my ($who, $arg) = @_; 3743 my ($who, $arg) = @_;
… …
3754{ 3814{
3755 # configure BDB 3815 # configure BDB
3756 3816
3757 BDB::min_parallel 8; 3817 BDB::min_parallel 8;
3758 BDB::max_poll_reqs $TICK * 0.1; 3818 BDB::max_poll_reqs $TICK * 0.1;
3759 $Coro::BDB::WATCHER->priority (1); 3819 $AnyEvent::BDB::WATCHER->priority (1);
3760 3820
3761 unless ($DB_ENV) { 3821 unless ($DB_ENV) {
3762 $DB_ENV = BDB::db_env_create; 3822 $DB_ENV = BDB::db_env_create;
3763 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3823 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3764 | BDB::LOG_AUTOREMOVE, 1); 3824 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3825 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3765 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3826 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3766 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3827 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3767 3828
3768 cf::sync_job { 3829 cf::sync_job {
3769 eval { 3830 eval {
… …
3795{ 3856{
3796 # configure IO::AIO 3857 # configure IO::AIO
3797 3858
3798 IO::AIO::min_parallel 8; 3859 IO::AIO::min_parallel 8;
3799 IO::AIO::max_poll_time $TICK * 0.1; 3860 IO::AIO::max_poll_time $TICK * 0.1;
3800 $Coro::AIO::WATCHER->priority (1); 3861 undef $AnyEvent::AIO::WATCHER;
3801} 3862}
3802 3863
3803my $_log_backtrace; 3864my $_log_backtrace;
3804 3865
3805sub _log_backtrace { 3866sub _log_backtrace {
… …
3808 $msg =~ s/\n//; 3869 $msg =~ s/\n//;
3809 3870
3810 # limit the # of concurrent backtraces 3871 # limit the # of concurrent backtraces
3811 if ($_log_backtrace < 2) { 3872 if ($_log_backtrace < 2) {
3812 ++$_log_backtrace; 3873 ++$_log_backtrace;
3874 my $perl_bt = Carp::longmess $msg;
3813 async { 3875 async {
3814 $Coro::current->{desc} = "abt $msg"; 3876 $Coro::current->{desc} = "abt $msg";
3815 3877
3816 my @bt = fork_call { 3878 my @bt = fork_call {
3817 @addr = map { sprintf "%x", $_ } @addr; 3879 @addr = map { sprintf "%x", $_ } @addr;
… …
3828 } 3890 }
3829 3891
3830 @funcs 3892 @funcs
3831 }; 3893 };
3832 3894
3833 LOG llevInfo, "[ABT] $msg\n"; 3895 LOG llevInfo, "[ABT] $perl_bt\n";
3896 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3834 LOG llevInfo, "[ABT] $_\n" for @bt; 3897 LOG llevInfo, "[ABT] $_\n" for @bt;
3835 --$_log_backtrace; 3898 --$_log_backtrace;
3836 }; 3899 };
3837 } else { 3900 } else {
3838 LOG llevInfo, "[ABT] $msg\n"; 3901 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines