ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.416 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.471 by root, Mon Apr 27 01:38: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 qw(vars subs);
26 27
27use Symbol; 28use Symbol;
28use List::Util; 29use List::Util;
29use Socket; 30use Socket;
30use EV 3.2; 31use EV;
31use Opcode; 32use Opcode;
32use Safe; 33use Safe;
33use Safe::Hole; 34use Safe::Hole;
34use Storable (); 35use Storable ();
35 36
37use Guard ();
36use Coro 4.50 (); 38use Coro ();
37use Coro::State; 39use Coro::State;
38use Coro::Handle; 40use Coro::Handle;
39use Coro::EV; 41use Coro::EV;
42use Coro::AnyEvent;
40use Coro::Timer; 43use Coro::Timer;
41use Coro::Signal; 44use Coro::Signal;
42use Coro::Semaphore; 45use Coro::Semaphore;
46use Coro::SemaphoreSet;
47use Coro::AnyEvent;
43use Coro::AIO; 48use Coro::AIO;
44use Coro::BDB; 49use Coro::BDB 1.6;
45use Coro::Storable; 50use Coro::Storable;
46use Coro::Util (); 51use Coro::Util ();
47 52
48use JSON::XS 2.01 (); 53use JSON::XS 2.01 ();
49use BDB (); 54use BDB ();
50use Data::Dumper; 55use Data::Dumper;
51use Digest::MD5; 56use Digest::MD5;
52use Fcntl; 57use Fcntl;
53use YAML (); 58use YAML ();
54use IO::AIO 2.51 (); 59use IO::AIO ();
55use Time::HiRes; 60use Time::HiRes;
56use Compress::LZF; 61use Compress::LZF;
57use Digest::MD5 (); 62use Digest::MD5 ();
63
64AnyEvent::detect;
58 65
59# configure various modules to our taste 66# configure various modules to our taste
60# 67#
61$Storable::canonical = 1; # reduce rsync transfers 68$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 69Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
70
71$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
72
73# make sure c-lzf reinitialises itself
74Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 75Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
66 76
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 77sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 78
69our %COMMAND = (); 79our %COMMAND = ();
70our %COMMAND_TIME = (); 80our %COMMAND_TIME = ();
73our %EXTCMD = (); 83our %EXTCMD = ();
74our %EXTICMD = (); 84our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 85our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 86our %EXT_MAP = (); # pluggable maps
77 87
78our $RELOAD; # number of reloads so far 88our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 89our @EVENT;
80 90
81our $CONFDIR = confdir; 91our $CONFDIR = confdir;
82our $DATADIR = datadir; 92our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 93our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 94our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 95our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 96our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 97our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 98our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 99our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 100our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 101our $BDBDIR = "$LOCALDIR/db";
102our $PIDFILE = "$LOCALDIR/pid";
103our $RUNTIMEFILE = "$LOCALDIR/runtime";
104
92our %RESOURCE; 105our %RESOURCE;
93 106
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 107our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 108our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 109our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 110our $USE_FSYNC = 1; # use fsync to write maps - default on
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
117our @EXTRA_MODULES = qw(pod mapscript);
118
106our %CFG; 119our %CFG;
107 120
108our $UPTIME; $UPTIME ||= time; 121our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 122our $RUNTIME;
110our $NOW; 123our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 132our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 133our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 134our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 135our $TICK_START; # for load detecting purposes
123 136
137our @POST_INIT;
138
139our $REATTACH_ON_RELOAD; # ste to true to force object reattach on reload (slow)
140
124binmode STDOUT; 141binmode STDOUT;
125binmode STDERR; 142binmode STDERR;
126 143
127# read virtual server time, if available 144# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 145unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 146 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 147 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 148 $RUNTIME = <$fh> + 0.;
132} 149}
150
151eval "sub TICK() { $TICK } 1" or die;
133 152
134mkdir $_ 153mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 154 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 155
137our $EMERGENCY_POSITION; 156our $EMERGENCY_POSITION;
242for my $pkg (qw( 261for my $pkg (qw(
243 cf::global cf::attachable 262 cf::global cf::attachable
244 cf::object cf::object::player 263 cf::object cf::object::player
245 cf::client cf::player 264 cf::client cf::player
246 cf::arch cf::living 265 cf::arch cf::living
266 cf::map cf::mapspace
247 cf::map cf::party cf::region 267 cf::party cf::region
248)) { 268)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 269 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 270}
252 271
253$EV::DIED = sub { 272$EV::DIED = sub {
254 warn "error in event callback: @_"; 273 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 315our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 316
298sub encode_json($) { $json_coder->encode ($_[0]) } 317sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 318sub decode_json($) { $json_coder->decode ($_[0]) }
300 319
320=item cf::post_init { BLOCK }
321
322Execute the given codeblock, I<after> all extensions have been (re-)loaded,
323but I<before> the server starts ticking again.
324
325The cdoeblock will have a single boolean argument to indicate whether this
326is a reload or not.
327
328=cut
329
330sub post_init(&) {
331 push @POST_INIT, shift;
332}
333
301=item cf::lock_wait $string 334=item cf::lock_wait $string
302 335
303Wait until the given lock is available. See cf::lock_acquire. 336Wait until the given lock is available. See cf::lock_acquire.
304 337
305=item my $lock = cf::lock_acquire $string 338=item my $lock = cf::lock_acquire $string
306 339
307Wait until the given lock is available and then acquires it and returns 340Wait 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, 341a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 342for example when the coroutine gets canceled), the lock is automatically
310returned. 343returned.
311 344
312Locks are *not* recursive, locking from the same coro twice results in a 345Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 346deadlocked coro.
319 352
320Return true if the lock is currently active, i.e. somebody has locked it. 353Return true if the lock is currently active, i.e. somebody has locked it.
321 354
322=cut 355=cut
323 356
324our %LOCK; 357our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 358
327sub lock_wait($) { 359sub lock_wait($) {
328 my ($key) = @_; 360 $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} 361}
341 362
342sub lock_acquire($) { 363sub lock_acquire($) {
343 my ($key) = @_; 364 $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} 365}
357 366
358sub lock_active($) { 367sub lock_active($) {
359 my ($key) = @_; 368 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 369}
363 370
364sub freeze_mainloop { 371sub freeze_mainloop {
365 tick_inhibit_inc; 372 tick_inhibit_inc;
366 373
367 Coro::guard \&tick_inhibit_dec; 374 &Guard::guard (\&tick_inhibit_dec);
368} 375}
369 376
370=item cf::periodic $interval, $cb 377=item cf::periodic $interval, $cb
371 378
372Like EV::periodic, but randomly selects a starting point so that the actions 379Like EV::periodic, but randomly selects a starting point so that the actions
427 } 434 }
428 } 435 }
429}; 436};
430 437
431sub get_slot($;$$) { 438sub get_slot($;$$) {
439 return if tick_inhibit || $Coro::current == $Coro::main;
440
432 my ($time, $pri, $name) = @_; 441 my ($time, $pri, $name) = @_;
433 442
434 $time = $TICK * .6 if $time > $TICK * .6; 443 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 444 my $sig = new Coro::Signal;
436 445
722 731
723############################################################################# 732#############################################################################
724 733
725=head2 ATTACHABLE OBJECTS 734=head2 ATTACHABLE OBJECTS
726 735
727Many objects in crossfire are so-called attachable objects. That means you can 736Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 737attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 738to it. All such attachable objects support the following methods.
730 739
731In the following description, CLASS can be any of C<global>, C<object> 740In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 741C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 791=item cf::CLASS::attachment $name, ...
783 792
784Register an attachment by C<$name> through which attachable objects of the 793Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 794given CLASS can refer to this attachment.
786 795
787Some classes such as crossfire maps and objects can specify attachments 796Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 797that are attached at load/instantiate time, thus the need for a name.
789 798
790These calls expect any number of the following handler/hook descriptions: 799These calls expect any number of the following handler/hook descriptions:
791 800
792=over 4 801=over 4
1083 1092
1084sub reattach { 1093sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1094 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1095 my ($obj) = @_;
1087 1096
1097 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1098 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1099
1090 my $registry = $obj->registry; 1100 my $registry = $obj->registry;
1091 1101
1092 @$registry = (); 1102 @$registry = ();
1093 1103
1139 utf8::decode (my $decname = $filename); 1149 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1150 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1151 $decname, length $$rdata, scalar @$objs;
1142 1152
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1153 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1154 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1155 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1156 aio_fsync $fh if $cf::USE_FSYNC;
1147 close $fh; 1157 aio_close $fh;
1148 1158
1149 if (@$objs) { 1159 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1160 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1161 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1162 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1163 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1164 aio_fsync $fh if $cf::USE_FSYNC;
1155 close $fh; 1165 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1166 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1167 }
1158 } else { 1168 } else {
1159 aio_unlink "$filename.pst"; 1169 aio_unlink "$filename.pst";
1160 } 1170 }
1161 1171
1162 aio_rename "$filename~", $filename; 1172 aio_rename "$filename~", $filename;
1173
1174 $filename =~ s%/[^/]+$%%;
1175 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1176 } else {
1164 warn "FATAL: $filename~: $!\n"; 1177 warn "unable to save objects: $filename~: $!\n";
1165 } 1178 }
1166 } else { 1179 } else {
1167 aio_unlink $filename; 1180 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1181 aio_unlink "$filename.pst";
1169 } 1182 }
1260 my ($name, $cb) = @_; 1273 my ($name, $cb) = @_;
1261 1274
1262 $EXTICMD{$name} = $cb; 1275 $EXTICMD{$name} = $cb;
1263} 1276}
1264 1277
1278use File::Glob ();
1279
1265cf::player->attach ( 1280cf::player->attach (
1266 on_command => sub { 1281 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1282 my ($pl, $name, $params) = @_;
1268 1283
1269 my $cb = $COMMAND{$name} 1284 my $cb = $COMMAND{$name}
1301 1316
1302 cf::override; 1317 cf::override;
1303 }, 1318 },
1304); 1319);
1305 1320
1321# "readahead" all extensions
1322sub cache_extensions {
1323 my $grp = IO::AIO::aio_group;
1324
1325 add $grp IO::AIO::aio_readdir $LIBDIR, sub {
1326 for (grep /\.ext$/, @{$_[0]}) {
1327 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1328 }
1329 };
1330
1331 $grp
1332}
1333
1306sub load_extensions { 1334sub load_extensions {
1307 cf::sync_job { 1335 cf::sync_job {
1308 my %todo; 1336 my %todo;
1309 1337
1310 for my $path (<$LIBDIR/*.ext>) { 1338 for my $path (<$LIBDIR/*.ext>) {
1329 1357
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1358 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1359 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1360
1333 $ext{source} = 1361 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1362 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1363 . "#line 1 \"$path\"\n{\n"
1336 . $source 1364 . $source
1337 . "\n};\n1"; 1365 . "\n};\n1";
1338 1366
1339 $todo{$base} = \%ext; 1367 $todo{$base} = \%ext;
1379 1407
1380=back 1408=back
1381 1409
1382=head2 CORE EXTENSIONS 1410=head2 CORE EXTENSIONS
1383 1411
1384Functions and methods that extend core crossfire objects. 1412Functions and methods that extend core deliantra objects.
1385 1413
1386=cut 1414=cut
1387 1415
1388package cf::player; 1416package cf::player;
1389 1417
1432 1460
1433sub exists($) { 1461sub exists($) {
1434 my ($login) = @_; 1462 my ($login) = @_;
1435 1463
1436 $cf::PLAYER{$login} 1464 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1465 or !aio_stat path $login
1438} 1466}
1439 1467
1440sub find($) { 1468sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1469 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1470 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1482 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1483 or return;
1456 1484
1457 my $pl = cf::player::load_pl $f 1485 my $pl = cf::player::load_pl $f
1458 or return; 1486 or return;
1487
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1488 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1489 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1490 $cf::PLAYER{$login} = $pl
1462 } 1491 }
1463 } 1492 }
1473 1502
1474 return if $pl->{deny_save}; 1503 return if $pl->{deny_save};
1475 1504
1476 aio_mkdir playerdir $pl, 0770; 1505 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1506 $pl->{last_save} = $cf::RUNTIME;
1507
1508 cf::get_slot 0.01;
1478 1509
1479 $pl->save_pl ($path); 1510 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1511 cf::cede_to_tick;
1481} 1512}
1482 1513
1514 my ($pl) = @_; 1545 my ($pl) = @_;
1515 1546
1516 my $name = $pl->ob->name; 1547 my $name = $pl->ob->name;
1517 1548
1518 $pl->{deny_save} = 1; 1549 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1550 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1551
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1552 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1553 $pl->deactivate;
1554 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1555 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1556 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1557 $pl->ns->destroy if $pl->ns;
1525 1558
1526 my $path = playerdir $pl; 1559 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1560 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1599
1567 for my $login (@$dirs) { 1600 for my $login (@$dirs) {
1568 my $path = path $login; 1601 my $path = path $login;
1569 1602
1570 # a .pst is a dead give-away for a valid player 1603 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1604 # if no pst file found, open and chekc for blocked users
1605 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1606 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1607 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1608 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1609 }
1576 1610
1607 } 1641 }
1608 1642
1609 \@paths 1643 \@paths
1610} 1644}
1611 1645
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1646=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1647
1614Expand crossfire pod fragments into protocol xml. 1648Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1649
1705=item $player->ext_reply ($msgid, @msg) 1650=item $player->ext_reply ($msgid, @msg)
1706 1651
1707Sends an ext reply to the player. 1652Sends an ext reply to the player.
1708 1653
1775our $MAX_RESET = 3600; 1720our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1721our $DEFAULT_RESET = 3000;
1777 1722
1778sub generate_random_map { 1723sub generate_random_map {
1779 my ($self, $rmp) = @_; 1724 my ($self, $rmp) = @_;
1725
1726 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1727
1780 # mit "rum" bekleckern, nicht 1728 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1729 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1730 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1731 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1732 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1906 1854
1907# the temporary/swap location 1855# the temporary/swap location
1908sub save_path { 1856sub save_path {
1909 my ($self) = @_; 1857 my ($self) = @_;
1910 1858
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1913} 1861}
1914 1862
1915# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1916sub uniq_path { 1864sub uniq_path {
1917 my ($self) = @_; 1865 my ($self) = @_;
1918 1866
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1869}
1931 1870
1932sub decay_objects { 1871sub decay_objects {
1933 my ($self) = @_; 1872 my ($self) = @_;
1934 1873
2018sub find { 1957sub find {
2019 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
2020 1959
2021 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
2022 1961
2023 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
2025 1964
2026 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
2031 or return; 1967 or return;
2032 1968
2033 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2034 1970
2036 or return; 1972 or return;
2037 1973
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
2041 undef $guard1; 1978 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1979 $map->reset;
2044 return find $path; 1980 return find $path;
2045 } 1981 }
2046 1982
2047 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2011 $f->skip_block;
2076 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2077 or return; 2013 or return;
2078 2014
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2080 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2081 2017
2082 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2019 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2039 $self->decay_objects;
2104 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2105 $self->update_buttons; 2041 $self->update_buttons;
2106 cf::cede_to_tick; 2042 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2043 $self->activate;
2110 } 2044 }
2111 2045
2112 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
2114 2048
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2050 }
2117 2051
2118 $self->post_load; 2052 $self->post_load;
2119} 2053}
2120 2054
2178 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2179 2113
2180 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2181 2115
2182 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2118 }
2185 2119
2186 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2187 2121
2188 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2225 cf::async { 2159 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2228 }; 2162 };
2229 2163
2164 cf::get_slot 0.02;
2165
2230 if ($uniq) { 2166 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2169 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2170 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2242 $self->save; 2178 $self->save;
2243 2179
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2181
2246 return if $self->players; 2182 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2249 2185
2250 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2251 2187
2252 $self->deactivate; 2188 $self->deactivate;
2370 2306
2371sub unique_maps() { 2307sub unique_maps() {
2372 [ 2308 [
2373 map { 2309 map {
2374 utf8::decode $_; 2310 utf8::decode $_;
2375 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2376 ? normalise $_ 2314 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2316 ]
2380} 2317}
2381 2318
2382=back 2319=back
2389 2326
2390=over 4 2327=over 4
2391 2328
2392=item $ob->inv_recursive 2329=item $ob->inv_recursive
2393 2330
2394Returns the inventory of the object _and_ their inventories, recursively. 2331Returns the inventory of the object I<and> their inventories, recursively,
2332but I<not> the object itself.
2395 2333
2396=cut 2334=cut
2397 2335
2398sub inv_recursive_; 2336sub inv_recursive_;
2399sub inv_recursive_ { 2337sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2405} 2343}
2406 2344
2407=item $ref = $ob->ref 2345=item $ref = $ob->ref
2408 2346
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2347Creates and returns a persistent reference to an object that can be stored as a string.
2410 2348
2411=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2412 2350
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2351returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2352even if the object actually exists. May block.
2446can be C<undef>. Does the right thing when the player is currently in a 2384can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2385dialogue with the given NPC character.
2448 2386
2449=cut 2387=cut
2450 2388
2389our $SAY_CHANNEL = {
2390 id => "say",
2391 title => "Map",
2392 reply => "say ",
2393 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2394};
2395
2396our $CHAT_CHANNEL = {
2397 id => "chat",
2398 title => "Chat",
2399 reply => "chat ",
2400 tooltip => "Player chat and shouts, global to the server.",
2401};
2402
2451# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2404# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2405#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2419 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2420
2469 } else { 2421 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2424 }
2473 } 2425 }
2474} 2426}
2475 2427
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2453
2502=item $player_object->enter_link 2454=item $player_object->enter_link
2503 2455
2504Freezes the player and moves him/her to a special map (C<{link}>). 2456Freezes the player and moves him/her to a special map (C<{link}>).
2505 2457
2506The player should be reasonably safe there for short amounts of time. You 2458The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2459for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2460though, as the palyer cannot control the character while it is on the link
2461map.
2508 2462
2509Will never block. 2463Will never block.
2510 2464
2511=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2512 2466
2570 2524
2571 $map->load; 2525 $map->load;
2572 $map->load_neighbours; 2526 $map->load_neighbours;
2573 2527
2574 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2530 $self->activate_recursive;
2576 2531
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2579} 2534}
2583Moves the player to the given map-path and coordinates by first freezing 2538Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2540that has to return the map if sucecssful, and then unfreezes the player on
2586the new (success) or old (failed) map position. In either case, $done will 2541the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2542be called at the end of this process.
2543
2544Note that $check will be called with a potentially non-loaded map, so if
2545it needs a loaded map it has to call C<< ->load >>.
2588 2546
2589=cut 2547=cut
2590 2548
2591our $GOTOGEN; 2549our $GOTOGEN;
2592 2550
2671} 2629}
2672 2630
2673sub prepare_random_map { 2631sub prepare_random_map {
2674 my ($exit) = @_; 2632 my ($exit) = @_;
2675 2633
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2636 # that depends on the exit object
2681 2637
2682 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2640 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2689 } 2647 }
2690 2648
2691 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2692 2650
2693 my $data = cf::encode_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2696 2654
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2657 undef $fh;
2700 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2701 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2704 } 2666 }
2705} 2667}
2706 2668
2707sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2709 2671
2710 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2711 2673
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2674 $self->enter_link;
2724 2675
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2676 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2731 2678
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2679 unless (eval {
2680 $self->deactivate_recursive; # just to be sure
2681
2682 # random map handling
2683 {
2684 my $guard = cf::lock_acquire "exit_prepare:$exit";
2685
2686 prepare_random_map $exit
2687 if $exit->slaying eq "/!";
2688 }
2689
2690 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2691 my $x = $exit->stats->hp;
2692 my $y = $exit->stats->sp;
2693
2734 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2735 2695
2696 # if exit is damned, update players death & WoR home-position
2697 $self->contr->savebed ($map, $x, $y)
2698 if $exit->flag (cf::FLAG_DAMNED);
2699
2736 1; 2700 1
2737 }) { 2701 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2703 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2706
2743 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2809 id => "infobox", 2773 id => "infobox",
2810 title => "Body Parts", 2774 title => "Body Parts",
2811 reply => undef, 2775 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2813 }, 2777 },
2778 "c/statistics" => {
2779 id => "infobox",
2780 title => "Statistics",
2781 reply => undef,
2782 tooltip => "Shows your primary statistics",
2783 },
2784 "c/skills" => {
2785 id => "infobox",
2786 title => "Skills",
2787 reply => undef,
2788 tooltip => "Shows your experience per skill and item power",
2789 },
2790 "c/shopitems" => {
2791 id => "infobox",
2792 title => "Shop Items",
2793 reply => undef,
2794 tooltip => "Shows the items currently for sale in this shop",
2795 },
2796 "c/resistances" => {
2797 id => "infobox",
2798 title => "Resistances",
2799 reply => undef,
2800 tooltip => "Shows your resistances",
2801 },
2802 "c/pets" => {
2803 id => "infobox",
2804 title => "Pets",
2805 reply => undef,
2806 tooltip => "Shows information abotu your pets/a specific pet",
2807 },
2808 "c/perceiveself" => {
2809 id => "infobox",
2810 title => "Perceive Self",
2811 reply => undef,
2812 tooltip => "You gained detailed knowledge about yourself",
2813 },
2814 "c/uptime" => { 2814 "c/uptime" => {
2815 id => "infobox", 2815 id => "infobox",
2816 title => "Uptime", 2816 title => "Uptime",
2817 reply => undef, 2817 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2818 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2821 id => "infobox",
2822 title => "Map Info", 2822 title => "Map Info",
2823 reply => undef, 2823 reply => undef,
2824 tooltip => "Information related to the maps", 2824 tooltip => "Information related to the maps",
2825 }, 2825 },
2826 "c/party" => {
2827 id => "party",
2828 title => "Party",
2829 reply => "gsay ",
2830 tooltip => "Messages and chat related to your party",
2831 },
2832 "c/death" => {
2833 id => "death",
2834 title => "Death",
2835 reply => undef,
2836 tooltip => "Reason for and more info about your most recent death",
2837 },
2838 "c/say" => $SAY_CHANNEL,
2839 "c/chat" => $CHAT_CHANNEL,
2826); 2840);
2827 2841
2828sub cf::client::send_msg { 2842sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2843 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2844
2831 $msg = $self->pl->expand_cfpod ($msg); 2845 $msg = $self->pl->expand_cfpod ($msg)
2846 unless $color & cf::NDI_VERBATIM;
2832 2847
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2848 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2849
2835 # check predefined channels, for the benefit of C 2850 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2851 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 2852 $channel = $CHANNEL{$channel};
2838 2853
2839 $self->ext_msg (channel_info => $channel) 2854 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 2855 $channel = $channel->{id};
2843 2856
2844 } elsif (ref $channel) { 2857 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 2858 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 2859 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 2860 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 2861 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 2862 }
2851 2863
2852 $channel = $channel->{id}; 2864 $channel = $channel->{id};
2853 } 2865 }
2854 2866
2855 return unless @extra || length $msg; 2867 return unless @extra || length $msg;
2856 2868
2857 if ($self->can_msg) {
2858 # default colour, mask it out 2869 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2871 if $color & cf::NDI_DEF;
2861 2872
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2873 my $pkt = "msg "
2874 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2875 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 2876 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 2877
2876 $color &= cf::NDI_COLOR_MASK; 2878 # try lzf for large packets
2879 $pkt = "lzf " . Compress::LZF::compress $pkt
2880 if 1024 <= length $pkt and $self->{can_lzf};
2877 2881
2878 utf8::encode $msg; 2882 # split very large packets
2879 2883 if (8192 < length $pkt and $self->{can_lzf}) {
2880 if (0 && $msg =~ /\[/) { 2884 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2881 # COMMAND/INFO 2885 $pkt = "frag";
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 } 2886 }
2887
2888 $self->send_packet ($pkt);
2889} 2889}
2890 2890
2891=item $client->ext_msg ($type, @msg) 2891=item $client->ext_msg ($type, @msg)
2892 2892
2893Sends an ext event to the client. 2893Sends an ext event to the client.
3067 3067
3068The following functions and methods are available within a safe environment: 3068The following functions and methods are available within a safe environment:
3069 3069
3070 cf::object 3070 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3071 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3072 insert remove name archname title slaying race decrease split
3073 value
3073 3074
3074 cf::object::player 3075 cf::object::player
3075 player 3076 player
3076 3077
3077 cf::player 3078 cf::player
3082 3083
3083=cut 3084=cut
3084 3085
3085for ( 3086for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3087 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3088 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3089 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3090 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3091 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3092 ["cf::map" => qw(trigger)],
3092) { 3093) {
3093 no strict 'refs'; 3094 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3095 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3096 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3112 my ($code, %vars) = @_; 3113 my ($code, %vars) = @_;
3113 3114
3114 my $qcode = $code; 3115 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3116 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3117 $qcode =~ s/\n/\\n/g;
3118
3119 %vars = (_dummy => 0) unless %vars;
3117 3120
3118 local $_; 3121 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars; 3122 local @safe::cf::_safe_eval_args = values %vars;
3120 3123
3121 my $eval = 3124 my $eval =
3301 while (my ($k, $v) = each %$want) { 3304 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3305 $ns->fx_want ($k, $v);
3303 } 3306 }
3304}; 3307};
3305 3308
3309sub load_resource_file($) {
3310 my $guard = lock_acquire "load_resource_file";
3311
3312 my $status = load_resource_file_ $_[0];
3313 get_slot 0.1, 100;
3314 cf::arch::commit_load;
3315
3316 $status
3317}
3318
3306sub reload_regions { 3319sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3320 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3321 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3322 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3323
3323} 3336}
3324 3337
3325sub reload_archetypes { 3338sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3339 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3340 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3341}
3334 3342
3335sub reload_treasures { 3343sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3344 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3345 or die "unable to load treasurelists\n";
3338} 3346}
3339 3347
3340sub reload_resources { 3348sub reload_resources {
3341 warn "reloading resource files...\n"; 3349 warn "reloading resource files...\n";
3342 3350
3351 reload_facedata;
3352 reload_archetypes;
3343 reload_regions; 3353 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3354 reload_treasures;
3348 3355
3349 warn "finished reloading resource files\n"; 3356 warn "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3357}
3355 3358
3356sub reload_config { 3359sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3360 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3361 or return;
3372 }; 3375 };
3373 warn $@ if $@; 3376 warn $@ if $@;
3374 } 3377 }
3375} 3378}
3376 3379
3380sub pidfile() {
3381 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3382 or die "$PIDFILE: $!";
3383 flock $fh, &Fcntl::LOCK_EX
3384 or die "$PIDFILE: flock: $!";
3385 $fh
3386}
3387
3388# make sure only one server instance is running at any one time
3389sub atomic {
3390 my $fh = pidfile;
3391
3392 my $pid = <$fh>;
3393 kill 9, $pid if $pid > 0;
3394
3395 seek $fh, 0, 0;
3396 print $fh $$;
3397}
3398
3377sub main { 3399sub main {
3400 cf::init_globals; # initialise logging
3401
3402 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3403 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3404 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3405 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3406
3407 cf::init_experience;
3408 cf::init_anim;
3409 cf::init_attackmess;
3410 cf::init_dynamic;
3411
3412 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3413
3378 # we must not ever block the main coroutine 3414 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3415 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3416 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3417 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3418 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3419 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3420 })->prio (Coro::PRIO_MAX);
3385 }; 3421 };
3386 3422
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3423 evthread_start IO::AIO::poll_fileno;
3424
3425 cf::sync_job {
3426 reload_resources;
3427 reload_config;
3428 db_init;
3429
3430 cf::load_settings;
3431 cf::load_materials;
3432 cf::init_uuid;
3433 cf::init_signals;
3434 cf::init_commands;
3435 cf::init_skills;
3436
3437 cf::init_beforeplay;
3438
3439 atomic;
3440
3441 load_extensions;
3442
3443 utime time, time, $RUNTIMEFILE;
3444
3445 # no (long-running) fork's whatsoever before this point(!)
3446 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3447
3448 (pop @POST_INIT)->(0) while @POST_INIT;
3449 };
3450
3393 EV::loop; 3451 EV::loop;
3394} 3452}
3395 3453
3396############################################################################# 3454#############################################################################
3397# initialisation and cleanup 3455# initialisation and cleanup
3404 cf::cleanup "SIG$signal"; 3462 cf::cleanup "SIG$signal";
3405 }; 3463 };
3406 } 3464 }
3407} 3465}
3408 3466
3409sub write_runtime { 3467sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3468 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3469 # the fsync below can take a very very long time.
3414 3470
3415 IO::AIO::aio_utime $runtime, undef, undef; 3471 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3472
3417 my $guard = cf::lock_acquire "write_runtime"; 3473 my $guard = cf::lock_acquire "write_runtime";
3418 3474
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3475 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3476 or return;
3421 3477
3422 my $value = $cf::RUNTIME + 90 + 10; 3478 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3479 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3480 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3490 aio_utime $fh, undef, undef;
3435 3491
3436 close $fh 3492 close $fh
3437 or return; 3493 or return;
3438 3494
3439 aio_rename "$runtime~", $runtime 3495 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3496 and return;
3441 3497
3442 warn "runtime file written.\n"; 3498 warn "runtime file written.\n";
3443 3499
3444 1 3500 1
3456 my $uuid = "$LOCALDIR/uuid"; 3512 my $uuid = "$LOCALDIR/uuid";
3457 3513
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3514 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3515 or return;
3460 3516
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3517 my $value = uuid_seq uuid_cur;
3518
3519 unless ($value) {
3520 warn "cowardly refusing to write zero uuid value!\n";
3521 return;
3522 }
3523
3524 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3525 $uuid_skip = 0;
3463 3526
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3527 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3528 and return;
3466 3529
3488} 3551}
3489 3552
3490sub emergency_save() { 3553sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3554 my $freeze_guard = cf::freeze_mainloop;
3492 3555
3493 warn "enter emergency perl save\n"; 3556 warn "emergency_perl_save: enter\n";
3494 3557
3495 cf::sync_job { 3558 cf::sync_job {
3559 # this is a trade-off: we want to be very quick here, so
3560 # save all maps without fsync, and later call a global sync
3561 # (which in turn might be very very slow)
3562 local $USE_FSYNC = 0;
3563
3496 # use a peculiar iteration method to avoid tripping on perl 3564 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3565 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3566 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3567 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3568 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3569 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3570 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3571 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3572 $pl->save;
3505 } 3573 }
3506 warn "end emergency player save\n"; 3574 warn "emergency_perl_save: end player save\n";
3507 3575
3508 warn "begin emergency map save\n"; 3576 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3577 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3578 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3579 $map->valid or next;
3512 $map->save; 3580 $map->save;
3513 } 3581 }
3514 warn "end emergency map save\n"; 3582 warn "emergency_perl_save: end map save\n";
3515 3583
3516 warn "begin emergency database checkpoint\n"; 3584 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3585 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3586 warn "emergency_perl_save: end database checkpoint\n";
3519 3587
3520 warn "begin write uuid\n"; 3588 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3589 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3590 warn "emergency_perl_save: end write uuid\n";
3523 }; 3591 };
3524 3592
3593 warn "emergency_perl_save: starting sync()\n";
3594 IO::AIO::aio_sync sub {
3595 warn "emergency_perl_save: finished sync()\n";
3596 };
3597
3525 warn "leave emergency perl save\n"; 3598 warn "emergency_perl_save: leave\n";
3526} 3599}
3527 3600
3528sub post_cleanup { 3601sub post_cleanup {
3529 my ($make_core) = @_; 3602 my ($make_core) = @_;
3530 3603
3531 warn Carp::longmess "post_cleanup backtrace" 3604 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3605 if $make_core;
3606
3607 my $fh = pidfile;
3608 unlink $PIDFILE if <$fh> == $$;
3609}
3610
3611# a safer delete_package, copied from Symbol
3612sub clear_package($) {
3613 my $pkg = shift;
3614
3615 # expand to full symbol table name if needed
3616 unless ($pkg =~ /^main::.*::$/) {
3617 $pkg = "main$pkg" if $pkg =~ /^::/;
3618 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3619 $pkg .= '::' unless $pkg =~ /::$/;
3620 }
3621
3622 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3623 my $stem_symtab = *{$stem}{HASH};
3624
3625 defined $stem_symtab and exists $stem_symtab->{$leaf}
3626 or return;
3627
3628 # clear all symbols
3629 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3630 for my $name (keys %$leaf_symtab) {
3631 _gv_clear *{"$pkg$name"};
3632# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3633 }
3634 warn "cleared package $pkg\n";#d#
3533} 3635}
3534 3636
3535sub do_reload_perl() { 3637sub do_reload_perl() {
3536 # can/must only be called in main 3638 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3639 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3640 warn "can only reload from main coroutine";
3539 return; 3641 return;
3540 } 3642 }
3541 3643
3644 return if $RELOAD++;
3645
3646 my $t1 = EV::time;
3647
3648 while ($RELOAD) {
3542 warn "reloading..."; 3649 warn "reloading...";
3543 3650
3544 warn "entering sync_job"; 3651 warn "entering sync_job";
3545 3652
3546 cf::sync_job { 3653 cf::sync_job {
3547 cf::write_runtime; # external watchdog should not bark 3654 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3655 cf::emergency_save;
3549 cf::write_runtime; # external watchdog should not bark 3656 cf::write_runtime_sync; # external watchdog should not bark
3550 3657
3551 warn "syncing database to disk"; 3658 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3659 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3660
3554 # if anything goes wrong in here, we should simply crash as we already saved 3661 # if anything goes wrong in here, we should simply crash as we already saved
3555 3662
3556 warn "flushing outstanding aio requests"; 3663 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3664 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3665 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3666 }
3588 3667
3589 warn "... nuking $pkg"; 3668 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3669 $_->cancel for values %EXT_CORO;
3591 } 3670 %EXT_CORO = ();
3592 3671
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3672 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3673 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3674
3675 warn "removing ext/exti commands";
3676 %EXTCMD = ();
3677 %EXTICMD = ();
3678
3679 warn "unloading/nuking all extensions";
3680 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3681 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3682
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3683 if (my $cb = $pkg->can ("unload")) {
3684 eval {
3604 $cb->(); 3685 $cb->($pkg);
3686 1
3687 } or warn "$pkg unloaded, but with errors: $@";
3688 }
3689
3690 warn "... clearing $pkg";
3691 clear_package $pkg;
3605 } 3692 }
3606 3693
3607 Symbol::delete_package $k; 3694 warn "unloading all perl modules loaded from $LIBDIR";
3695 while (my ($k, $v) = each %INC) {
3696 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3697
3698 warn "... unloading $k";
3699 delete $INC{$k};
3700
3701 $k =~ s/\.pm$//;
3702 $k =~ s/\//::/g;
3703
3704 if (my $cb = $k->can ("unload_module")) {
3705 $cb->();
3706 }
3707
3708 clear_package $k;
3608 } 3709 }
3609 3710
3610 warn "getting rid of safe::, as good as possible"; 3711 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3712 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3713 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3714
3614 warn "unloading cf.pm \"a bit\""; 3715 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3716 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3717 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3718
3618 # don't, removes xs symbols, too, 3719 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3720 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3721 #clear_package __PACKAGE__;
3621 3722
3622 warn "unload completed, starting to reload now"; 3723 warn "unload completed, starting to reload now";
3623 3724
3624 warn "reloading cf.pm"; 3725 warn "reloading cf.pm";
3625 require cf; 3726 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3727 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3728
3628 warn "loading config and database again"; 3729 warn "loading config and database again";
3629 cf::reload_config; 3730 cf::reload_config;
3630 3731
3631 warn "loading extensions"; 3732 warn "loading extensions";
3632 cf::load_extensions; 3733 cf::load_extensions;
3633 3734
3735 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3736 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3737 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3738 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3739 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3740 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3741 reattach $_ for values %PLAYER;
3742 }
3640 3743
3744 warn "running post_init jobs";
3745 (pop @POST_INIT)->(1) while @POST_INIT;
3746
3641 warn "leaving sync_job"; 3747 warn "leaving sync_job";
3642 3748
3643 1 3749 1
3644 } or do { 3750 } or do {
3645 warn $@; 3751 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3752 cf::cleanup "error while reloading, exiting.";
3647 }; 3753 };
3648 3754
3649 warn "reloaded"; 3755 warn "reloaded";
3756 --$RELOAD;
3757 }
3758
3759 $t1 = EV::time - $t1;
3760 warn "reload completed in ${t1}s\n";
3650}; 3761};
3651 3762
3652our $RELOAD_WATCHER; # used only during reload 3763our $RELOAD_WATCHER; # used only during reload
3653 3764
3654sub reload_perl() { 3765sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3766 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3767 # coro crashes during coro_state_free->destroy here.
3657 3768
3769 $RELOAD_WATCHER ||= cf::async {
3770 Coro::AIO::aio_wait cache_extensions;
3771
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3772 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3773 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3774 undef $RELOAD_WATCHER;
3775 };
3661 }; 3776 };
3662} 3777}
3663 3778
3664register_command "reload" => sub { 3779register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3780 my ($who, $arg) = @_;
3679 3794
3680our @WAIT_FOR_TICK; 3795our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3796our @WAIT_FOR_TICK_BEGIN;
3682 3797
3683sub wait_for_tick { 3798sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3799 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3800
3687 my $signal = new Coro::Signal; 3801 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3802 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3803 $signal->wait;
3690} 3804}
3691 3805
3692sub wait_for_tick_begin { 3806sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3807 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3808
3696 my $signal = new Coro::Signal; 3809 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3810 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3811 $signal->wait;
3699} 3812}
3709 3822
3710 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3823 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3711 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3824 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3712 Coro::async_pool { 3825 Coro::async_pool {
3713 $Coro::current->{desc} = "runtime saver"; 3826 $Coro::current->{desc} = "runtime saver";
3714 write_runtime 3827 write_runtime_sync
3715 or warn "ERROR: unable to write runtime file: $!"; 3828 or warn "ERROR: unable to write runtime file: $!";
3716 }; 3829 };
3717 } 3830 }
3718 3831
3719 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3832 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3738{ 3851{
3739 # configure BDB 3852 # configure BDB
3740 3853
3741 BDB::min_parallel 8; 3854 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3855 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3856 $AnyEvent::BDB::WATCHER->priority (1);
3744 3857
3745 unless ($DB_ENV) { 3858 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3859 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3860 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 3861 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3862 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3863 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3864 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3865
3752 cf::sync_job { 3866 cf::sync_job {
3753 eval { 3867 eval {
3779{ 3893{
3780 # configure IO::AIO 3894 # configure IO::AIO
3781 3895
3782 IO::AIO::min_parallel 8; 3896 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3897 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3898 undef $AnyEvent::AIO::WATCHER;
3785} 3899}
3786 3900
3787my $_log_backtrace; 3901my $_log_backtrace;
3788 3902
3789sub _log_backtrace { 3903sub _log_backtrace {
3792 $msg =~ s/\n//; 3906 $msg =~ s/\n//;
3793 3907
3794 # limit the # of concurrent backtraces 3908 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3909 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3910 ++$_log_backtrace;
3911 my $perl_bt = Carp::longmess $msg;
3797 async { 3912 async {
3798 $Coro::current->{desc} = "abt $msg"; 3913 $Coro::current->{desc} = "abt $msg";
3799 3914
3800 my @bt = fork_call { 3915 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3916 @addr = map { sprintf "%x", $_ } @addr;
3812 } 3927 }
3813 3928
3814 @funcs 3929 @funcs
3815 }; 3930 };
3816 3931
3817 LOG llevInfo, "[ABT] $msg\n"; 3932 LOG llevInfo, "[ABT] $perl_bt\n";
3933 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3934 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3935 --$_log_backtrace;
3820 }; 3936 };
3821 } else { 3937 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3938 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 3939 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 3940 }
3825} 3941}
3826 3942
3827# load additional modules 3943# load additional modules
3828use cf::pod; 3944require "cf/$_.pm" for @EXTRA_MODULES;
3829 3945
3830END { cf::emergency_save } 3946END { cf::emergency_save }
3831 3947
38321 39481
3833 3949

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines