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.420 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.462 by root, Tue Dec 23 06:58:23 2008 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($;$$) {
432 return if tick_inhibit; 435 return if tick_inhibit || $Coro::current == $Coro::main;
433 436
434 my ($time, $pri, $name) = @_; 437 my ($time, $pri, $name) = @_;
435 438
436 $time = $TICK * .6 if $time > $TICK * .6; 439 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 440 my $sig = new Coro::Signal;
… …
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 = cf::encode_json $rmp; 2647 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2648 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2649 my $meta = "$RANDOMDIR/$md5.meta";
2707 2650
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/say" => $SAY_CHANNEL,
2799 "c/chat" => $CHAT_CHANNEL,
2837); 2800);
2838 2801
2839sub cf::client::send_msg { 2802sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2803 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2804
2842 $msg = $self->pl->expand_cfpod ($msg); 2805 $msg = $self->pl->expand_cfpod ($msg)
2806 unless $color & cf::NDI_VERBATIM;
2843 2807
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2808 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2809
2846 # check predefined channels, for the benefit of C 2810 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2811 if ($CHANNEL{$channel}) {
… …
2868 if ($self->can_msg) { 2832 if ($self->can_msg) {
2869 # default colour, mask it out 2833 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2834 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2835 if $color & cf::NDI_DEF;
2872 2836
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2837 my $pkt = "msg "
2838 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2839 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2840 );
2841
2842 # try lzf for large packets
2843 $pkt = "lzf " . Compress::LZF::compress $pkt
2844 if 1024 <= length $pkt and $self->{can_lzf};
2845
2846 # split very large packets
2847 if (8192 < length $pkt and $self->{can_lzf}) {
2848 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2849 $pkt = "frag";
2850 }
2851
2852 $self->send_packet ($pkt);
2875 } else { 2853 } else {
2876 if ($color >= 0) { 2854 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones 2855 # replace some tags by gcfclient-compatible ones
2878 for ($msg) { 2856 for ($msg) {
2879 1 while 2857 1 while
… …
3078 3056
3079The following functions and methods are available within a safe environment: 3057The following functions and methods are available within a safe environment:
3080 3058
3081 cf::object 3059 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3060 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3061 insert remove name archname title slaying race decrease split
3084 3062
3085 cf::object::player 3063 cf::object::player
3086 player 3064 player
3087 3065
3088 cf::player 3066 cf::player
… …
3093 3071
3094=cut 3072=cut
3095 3073
3096for ( 3074for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3077 decrease split destroy change_exp)],
3100 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful)],
3102 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3103) { 3081) {
3104 no strict 'refs'; 3082 no strict 'refs';
… …
3312 while (my ($k, $v) = each %$want) { 3290 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3291 $ns->fx_want ($k, $v);
3314 } 3292 }
3315}; 3293};
3316 3294
3295sub load_resource_file($) {
3296 my $guard = lock_acquire "load_resource_file";
3297
3298 my $status = load_resource_file_ $_[0];
3299 get_slot 0.1, 100;
3300 cf::arch::commit_load;
3301
3302 $status
3303}
3304
3317sub reload_regions { 3305sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3306 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3307 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3308 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3309
… …
3334} 3322}
3335 3323
3336sub reload_archetypes { 3324sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3325 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3326 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3327}
3345 3328
3346sub reload_treasures { 3329sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3330 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3331 or die "unable to load treasurelists\n";
3349} 3332}
3350 3333
3351sub reload_resources { 3334sub reload_resources {
3352 warn "reloading resource files...\n"; 3335 warn "reloading resource files...\n";
3353 3336
3337 reload_facedata;
3338 reload_archetypes;
3354 reload_regions; 3339 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3340 reload_treasures;
3359 3341
3360 warn "finished reloading resource files\n"; 3342 warn "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3343}
3366 3344
3367sub reload_config { 3345sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3346 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3347 or return;
… …
3383 }; 3361 };
3384 warn $@ if $@; 3362 warn $@ if $@;
3385 } 3363 }
3386} 3364}
3387 3365
3366sub pidfile() {
3367 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3368 or die "$PIDFILE: $!";
3369 flock $fh, &Fcntl::LOCK_EX
3370 or die "$PIDFILE: flock: $!";
3371 $fh
3372}
3373
3374# make sure only one server instance is running at any one time
3375sub atomic {
3376 my $fh = pidfile;
3377
3378 my $pid = <$fh>;
3379 kill 9, $pid if $pid > 0;
3380
3381 seek $fh, 0, 0;
3382 print $fh $$;
3383}
3384
3388sub main { 3385sub main {
3386 cf::init_globals; # initialise logging
3387
3388 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3389 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3390 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3391 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3392
3393 cf::init_experience;
3394 cf::init_anim;
3395 cf::init_attackmess;
3396 cf::init_dynamic;
3397
3398 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3399
3389 # we must not ever block the main coroutine 3400 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3401 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3402 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3403 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3404 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3405 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3406 })->prio (Coro::PRIO_MAX);
3396 }; 3407 };
3397 3408
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3409 evthread_start IO::AIO::poll_fileno;
3410
3411 cf::sync_job {
3412 reload_resources;
3413 reload_config;
3414 db_init;
3415
3416 cf::load_settings;
3417 cf::load_materials;
3418 cf::init_uuid;
3419 cf::init_signals;
3420 cf::init_commands;
3421 cf::init_skills;
3422
3423 cf::init_beforeplay;
3424
3425 atomic;
3426
3427 load_extensions;
3428
3429 utime time, time, $RUNTIMEFILE;
3430
3431 # no (long-running) fork's whatsoever before this point(!)
3432 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3433
3434 (pop @POST_INIT)->(0) while @POST_INIT;
3435 };
3436
3404 EV::loop; 3437 EV::loop;
3405} 3438}
3406 3439
3407############################################################################# 3440#############################################################################
3408# initialisation and cleanup 3441# initialisation and cleanup
… …
3416 }; 3449 };
3417 } 3450 }
3418} 3451}
3419 3452
3420sub write_runtime_sync { 3453sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3454 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3455 # the fsync below can take a very very long time.
3425 3456
3426 IO::AIO::aio_utime $runtime, undef, undef; 3457 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3458
3428 my $guard = cf::lock_acquire "write_runtime"; 3459 my $guard = cf::lock_acquire "write_runtime";
3429 3460
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3461 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3462 or return;
3432 3463
3433 my $value = $cf::RUNTIME + 90 + 10; 3464 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3465 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3466 # 60 allows for the watchdog to kill the server.
… …
3445 aio_utime $fh, undef, undef; 3476 aio_utime $fh, undef, undef;
3446 3477
3447 close $fh 3478 close $fh
3448 or return; 3479 or return;
3449 3480
3450 aio_rename "$runtime~", $runtime 3481 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3482 and return;
3452 3483
3453 warn "runtime file written.\n"; 3484 warn "runtime file written.\n";
3454 3485
3455 1 3486 1
… …
3467 my $uuid = "$LOCALDIR/uuid"; 3498 my $uuid = "$LOCALDIR/uuid";
3468 3499
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3500 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3501 or return;
3471 3502
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3503 my $value = uuid_seq uuid_cur;
3504
3505 unless ($value) {
3506 warn "cowardly refusing to write zero uuid value!\n";
3507 return;
3508 }
3509
3510 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3511 $uuid_skip = 0;
3474 3512
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3513 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3514 and return;
3477 3515
… …
3499} 3537}
3500 3538
3501sub emergency_save() { 3539sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3540 my $freeze_guard = cf::freeze_mainloop;
3503 3541
3504 warn "enter emergency perl save\n"; 3542 warn "emergency_perl_save: enter\n";
3505 3543
3506 cf::sync_job { 3544 cf::sync_job {
3545 # this is a trade-off: we want to be very quick here, so
3546 # save all maps without fsync, and later call a global sync
3547 # (which in turn might be very very slow)
3548 local $USE_FSYNC = 0;
3549
3507 # use a peculiar iteration method to avoid tripping on perl 3550 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3551 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3552 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3553 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3554 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3555 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3556 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3557 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3558 $pl->save;
3516 } 3559 }
3517 warn "end emergency player save\n"; 3560 warn "emergency_perl_save: end player save\n";
3518 3561
3519 warn "begin emergency map save\n"; 3562 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3563 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3564 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3565 $map->valid or next;
3523 $map->save; 3566 $map->save;
3524 } 3567 }
3525 warn "end emergency map save\n"; 3568 warn "emergency_perl_save: end map save\n";
3526 3569
3527 warn "begin emergency database checkpoint\n"; 3570 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3571 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3572 warn "emergency_perl_save: end database checkpoint\n";
3530 3573
3531 warn "begin write uuid\n"; 3574 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3575 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3576 warn "emergency_perl_save: end write uuid\n";
3534 }; 3577 };
3535 3578
3579 warn "emergency_perl_save: starting sync()\n";
3580 IO::AIO::aio_sync sub {
3581 warn "emergency_perl_save: finished sync()\n";
3582 };
3583
3536 warn "leave emergency perl save\n"; 3584 warn "emergency_perl_save: leave\n";
3537} 3585}
3538 3586
3539sub post_cleanup { 3587sub post_cleanup {
3540 my ($make_core) = @_; 3588 my ($make_core) = @_;
3541 3589
3542 warn Carp::longmess "post_cleanup backtrace" 3590 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3591 if $make_core;
3592
3593 my $fh = pidfile;
3594 unlink $PIDFILE if <$fh> == $$;
3595}
3596
3597# a safer delete_package, copied from Symbol
3598sub clear_package($) {
3599 my $pkg = shift;
3600
3601 # expand to full symbol table name if needed
3602 unless ($pkg =~ /^main::.*::$/) {
3603 $pkg = "main$pkg" if $pkg =~ /^::/;
3604 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3605 $pkg .= '::' unless $pkg =~ /::$/;
3606 }
3607
3608 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3609 my $stem_symtab = *{$stem}{HASH};
3610
3611 defined $stem_symtab and exists $stem_symtab->{$leaf}
3612 or return;
3613
3614 # clear all symbols
3615 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3616 for my $name (keys %$leaf_symtab) {
3617 _gv_clear *{"$pkg$name"};
3618# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3619 }
3620 warn "cleared package $pkg\n";#d#
3544} 3621}
3545 3622
3546sub do_reload_perl() { 3623sub do_reload_perl() {
3547 # can/must only be called in main 3624 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3625 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3626 warn "can only reload from main coroutine";
3550 return; 3627 return;
3551 } 3628 }
3552 3629
3630 return if $RELOAD++;
3631
3632 my $t1 = EV::time;
3633
3634 while ($RELOAD) {
3553 warn "reloading..."; 3635 warn "reloading...";
3554 3636
3555 warn "entering sync_job"; 3637 warn "entering sync_job";
3556 3638
3557 cf::sync_job { 3639 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3640 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3641 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3561 3643
3562 warn "syncing database to disk"; 3644 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3645 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3646
3565 # if anything goes wrong in here, we should simply crash as we already saved 3647 # if anything goes wrong in here, we should simply crash as we already saved
3566 3648
3567 warn "flushing outstanding aio requests"; 3649 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3650 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3651 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3652 }
3599 3653
3600 warn "... nuking $pkg"; 3654 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3655 $_->cancel for values %EXT_CORO;
3602 } 3656 %EXT_CORO = ();
3603 3657
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3658 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3659 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3660
3661 warn "removing ext/exti commands";
3662 %EXTCMD = ();
3663 %EXTICMD = ();
3664
3665 warn "unloading/nuking all extensions";
3666 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3667 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3668
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3669 if (my $cb = $pkg->can ("unload")) {
3670 eval {
3615 $cb->(); 3671 $cb->($pkg);
3672 1
3673 } or warn "$pkg unloaded, but with errors: $@";
3674 }
3675
3676 warn "... clearing $pkg";
3677 clear_package $pkg;
3616 } 3678 }
3617 3679
3618 Symbol::delete_package $k; 3680 warn "unloading all perl modules loaded from $LIBDIR";
3681 while (my ($k, $v) = each %INC) {
3682 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3683
3684 warn "... unloading $k";
3685 delete $INC{$k};
3686
3687 $k =~ s/\.pm$//;
3688 $k =~ s/\//::/g;
3689
3690 if (my $cb = $k->can ("unload_module")) {
3691 $cb->();
3692 }
3693
3694 clear_package $k;
3619 } 3695 }
3620 3696
3621 warn "getting rid of safe::, as good as possible"; 3697 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3698 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3699 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3700
3625 warn "unloading cf.pm \"a bit\""; 3701 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3702 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3703 delete $INC{"cf/pod.pm"};
3628 3704
3629 # don't, removes xs symbols, too, 3705 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3706 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3707 #clear_package __PACKAGE__;
3632 3708
3633 warn "unload completed, starting to reload now"; 3709 warn "unload completed, starting to reload now";
3634 3710
3635 warn "reloading cf.pm"; 3711 warn "reloading cf.pm";
3636 require cf; 3712 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3713 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3714
3639 warn "loading config and database again"; 3715 warn "loading config and database again";
3640 cf::reload_config; 3716 cf::reload_config;
3641 3717
3642 warn "loading extensions"; 3718 warn "loading extensions";
3643 cf::load_extensions; 3719 cf::load_extensions;
3644 3720
3721 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3722 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3723 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3724 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3725 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3726 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3727 reattach $_ for values %PLAYER;
3728 }
3651 3729
3730 warn "running post_init jobs";
3731 (pop @POST_INIT)->(1) while @POST_INIT;
3732
3652 warn "leaving sync_job"; 3733 warn "leaving sync_job";
3653 3734
3654 1 3735 1
3655 } or do { 3736 } or do {
3656 warn $@; 3737 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3738 cf::cleanup "error while reloading, exiting.";
3658 }; 3739 };
3659 3740
3660 warn "reloaded"; 3741 warn "reloaded";
3742 --$RELOAD;
3743 }
3744
3745 $t1 = EV::time - $t1;
3746 warn "reload completed in ${t1}s\n";
3661}; 3747};
3662 3748
3663our $RELOAD_WATCHER; # used only during reload 3749our $RELOAD_WATCHER; # used only during reload
3664 3750
3665sub reload_perl() { 3751sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3752 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3753 # coro crashes during coro_state_free->destroy here.
3668 3754
3755 $RELOAD_WATCHER ||= cf::async {
3756 Coro::AIO::aio_wait cache_extensions;
3757
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3758 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3759 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3760 undef $RELOAD_WATCHER;
3761 };
3672 }; 3762 };
3673} 3763}
3674 3764
3675register_command "reload" => sub { 3765register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3766 my ($who, $arg) = @_;
… …
3690 3780
3691our @WAIT_FOR_TICK; 3781our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3782our @WAIT_FOR_TICK_BEGIN;
3693 3783
3694sub wait_for_tick { 3784sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3785 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3786
3698 my $signal = new Coro::Signal; 3787 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3788 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3789 $signal->wait;
3701} 3790}
3702 3791
3703sub wait_for_tick_begin { 3792sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3793 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3794
3707 my $signal = new Coro::Signal; 3795 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3796 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3797 $signal->wait;
3710} 3798}
… …
3749{ 3837{
3750 # configure BDB 3838 # configure BDB
3751 3839
3752 BDB::min_parallel 8; 3840 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3841 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3842 $AnyEvent::BDB::WATCHER->priority (1);
3755 3843
3756 unless ($DB_ENV) { 3844 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3845 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3846 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3847 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3848 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3849 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3850 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3851
3763 cf::sync_job { 3852 cf::sync_job {
3764 eval { 3853 eval {
… …
3790{ 3879{
3791 # configure IO::AIO 3880 # configure IO::AIO
3792 3881
3793 IO::AIO::min_parallel 8; 3882 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3883 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3884 undef $AnyEvent::AIO::WATCHER;
3796} 3885}
3797 3886
3798my $_log_backtrace; 3887my $_log_backtrace;
3799 3888
3800sub _log_backtrace { 3889sub _log_backtrace {
… …
3803 $msg =~ s/\n//; 3892 $msg =~ s/\n//;
3804 3893
3805 # limit the # of concurrent backtraces 3894 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3895 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3896 ++$_log_backtrace;
3897 my $perl_bt = Carp::longmess $msg;
3808 async { 3898 async {
3809 $Coro::current->{desc} = "abt $msg"; 3899 $Coro::current->{desc} = "abt $msg";
3810 3900
3811 my @bt = fork_call { 3901 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3902 @addr = map { sprintf "%x", $_ } @addr;
… …
3823 } 3913 }
3824 3914
3825 @funcs 3915 @funcs
3826 }; 3916 };
3827 3917
3828 LOG llevInfo, "[ABT] $msg\n"; 3918 LOG llevInfo, "[ABT] $perl_bt\n";
3919 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3920 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3921 --$_log_backtrace;
3831 }; 3922 };
3832 } else { 3923 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3924 LOG llevInfo, "[ABT] $msg\n";

Diff Legend

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