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

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.474 by root, Thu Jul 16 21:42:56 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 76
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 77# strictly for debugging
78$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 79
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 80sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 81
69our %COMMAND = (); 82our %COMMAND = ();
70our %COMMAND_TIME = (); 83our %COMMAND_TIME = ();
73our %EXTCMD = (); 86our %EXTCMD = ();
74our %EXTICMD = (); 87our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 88our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 89our %EXT_MAP = (); # pluggable maps
77 90
78our $RELOAD; # number of reloads so far 91our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 92our @EVENT;
80 93
81our $CONFDIR = confdir; 94our $CONFDIR = confdir;
82our $DATADIR = datadir; 95our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 96our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 97our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 98our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 99our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 100our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 101our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 102our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 103our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 104our $BDBDIR = "$LOCALDIR/db";
105our $PIDFILE = "$LOCALDIR/pid";
106our $RUNTIMEFILE = "$LOCALDIR/runtime";
107
92our %RESOURCE; 108our %RESOURCE;
93 109
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 110our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 111our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 112our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 113our $USE_FSYNC = 1; # use fsync to write maps - default on
99 114
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 115our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 116our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 117our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 118our $DB_ENV;
105 119
120our @EXTRA_MODULES = qw(pod mapscript);
121
106our %CFG; 122our %CFG;
107 123
108our $UPTIME; $UPTIME ||= time; 124our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 125our $RUNTIME;
110our $NOW; 126our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 135our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 136our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 137our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 138our $TICK_START; # for load detecting purposes
123 139
140our @POST_INIT;
141
142our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
143our $REALLY_UNLOOP; # never set to true, please :)
144
124binmode STDOUT; 145binmode STDOUT;
125binmode STDERR; 146binmode STDERR;
126 147
127# read virtual server time, if available 148# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 149unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 150 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 151 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 152 $RUNTIME = <$fh> + 0.;
132} 153}
154
155eval "sub TICK() { $TICK } 1" or die;
133 156
134mkdir $_ 157mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 158 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 159
137our $EMERGENCY_POSITION; 160our $EMERGENCY_POSITION;
242for my $pkg (qw( 265for my $pkg (qw(
243 cf::global cf::attachable 266 cf::global cf::attachable
244 cf::object cf::object::player 267 cf::object cf::object::player
245 cf::client cf::player 268 cf::client cf::player
246 cf::arch cf::living 269 cf::arch cf::living
270 cf::map cf::mapspace
247 cf::map cf::party cf::region 271 cf::party cf::region
248)) { 272)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 273 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 274}
252 275
253$EV::DIED = sub { 276$EV::DIED = sub {
254 warn "error in event callback: @_"; 277 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 319our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 320
298sub encode_json($) { $json_coder->encode ($_[0]) } 321sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 322sub decode_json($) { $json_coder->decode ($_[0]) }
300 323
324=item cf::post_init { BLOCK }
325
326Execute the given codeblock, I<after> all extensions have been (re-)loaded,
327but I<before> the server starts ticking again.
328
329The cdoeblock will have a single boolean argument to indicate whether this
330is a reload or not.
331
332=cut
333
334sub post_init(&) {
335 push @POST_INIT, shift;
336}
337
301=item cf::lock_wait $string 338=item cf::lock_wait $string
302 339
303Wait until the given lock is available. See cf::lock_acquire. 340Wait until the given lock is available. See cf::lock_acquire.
304 341
305=item my $lock = cf::lock_acquire $string 342=item my $lock = cf::lock_acquire $string
306 343
307Wait until the given lock is available and then acquires it and returns 344Wait 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, 345a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 346for example when the coroutine gets canceled), the lock is automatically
310returned. 347returned.
311 348
312Locks are *not* recursive, locking from the same coro twice results in a 349Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 350deadlocked coro.
319 356
320Return true if the lock is currently active, i.e. somebody has locked it. 357Return true if the lock is currently active, i.e. somebody has locked it.
321 358
322=cut 359=cut
323 360
324our %LOCK; 361our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 362
327sub lock_wait($) { 363sub lock_wait($) {
328 my ($key) = @_; 364 $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} 365}
341 366
342sub lock_acquire($) { 367sub lock_acquire($) {
343 my ($key) = @_; 368 $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} 369}
357 370
358sub lock_active($) { 371sub lock_active($) {
359 my ($key) = @_; 372 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 373}
363 374
364sub freeze_mainloop { 375sub freeze_mainloop {
365 tick_inhibit_inc; 376 tick_inhibit_inc;
366 377
367 Coro::guard \&tick_inhibit_dec; 378 &Guard::guard (\&tick_inhibit_dec);
368} 379}
369 380
370=item cf::periodic $interval, $cb 381=item cf::periodic $interval, $cb
371 382
372Like EV::periodic, but randomly selects a starting point so that the actions 383Like EV::periodic, but randomly selects a starting point so that the actions
427 } 438 }
428 } 439 }
429}; 440};
430 441
431sub get_slot($;$$) { 442sub get_slot($;$$) {
443 return if tick_inhibit || $Coro::current == $Coro::main;
444
432 my ($time, $pri, $name) = @_; 445 my ($time, $pri, $name) = @_;
433 446
434 $time = $TICK * .6 if $time > $TICK * .6; 447 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 448 my $sig = new Coro::Signal;
436 449
722 735
723############################################################################# 736#############################################################################
724 737
725=head2 ATTACHABLE OBJECTS 738=head2 ATTACHABLE OBJECTS
726 739
727Many objects in crossfire are so-called attachable objects. That means you can 740Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 741attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 742to it. All such attachable objects support the following methods.
730 743
731In the following description, CLASS can be any of C<global>, C<object> 744In 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 745C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 795=item cf::CLASS::attachment $name, ...
783 796
784Register an attachment by C<$name> through which attachable objects of the 797Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 798given CLASS can refer to this attachment.
786 799
787Some classes such as crossfire maps and objects can specify attachments 800Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 801that are attached at load/instantiate time, thus the need for a name.
789 802
790These calls expect any number of the following handler/hook descriptions: 803These calls expect any number of the following handler/hook descriptions:
791 804
792=over 4 805=over 4
1083 1096
1084sub reattach { 1097sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1098 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1099 my ($obj) = @_;
1087 1100
1101 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1102 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1103
1090 my $registry = $obj->registry; 1104 my $registry = $obj->registry;
1091 1105
1092 @$registry = (); 1106 @$registry = ();
1093 1107
1139 utf8::decode (my $decname = $filename); 1153 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1154 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1155 $decname, length $$rdata, scalar @$objs;
1142 1156
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1157 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1158 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1159 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1160 if ($cf::USE_FSYNC) {
1161 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1162 aio_fsync $fh;
1163 }
1147 close $fh; 1164 aio_close $fh;
1148 1165
1149 if (@$objs) { 1166 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1167 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1168 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1169 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1170 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1171 if ($cf::USE_FSYNC) {
1172 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1173 aio_fsync $fh;
1174 }
1155 close $fh; 1175 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1176 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1177 }
1158 } else { 1178 } else {
1159 aio_unlink "$filename.pst"; 1179 aio_unlink "$filename.pst";
1160 } 1180 }
1161 1181
1162 aio_rename "$filename~", $filename; 1182 aio_rename "$filename~", $filename;
1183
1184 $filename =~ s%/[^/]+$%%;
1185 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1186 } else {
1164 warn "FATAL: $filename~: $!\n"; 1187 warn "unable to save objects: $filename~: $!\n";
1165 } 1188 }
1166 } else { 1189 } else {
1167 aio_unlink $filename; 1190 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1191 aio_unlink "$filename.pst";
1169 } 1192 }
1260 my ($name, $cb) = @_; 1283 my ($name, $cb) = @_;
1261 1284
1262 $EXTICMD{$name} = $cb; 1285 $EXTICMD{$name} = $cb;
1263} 1286}
1264 1287
1288use File::Glob ();
1289
1265cf::player->attach ( 1290cf::player->attach (
1266 on_command => sub { 1291 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1292 my ($pl, $name, $params) = @_;
1268 1293
1269 my $cb = $COMMAND{$name} 1294 my $cb = $COMMAND{$name}
1301 1326
1302 cf::override; 1327 cf::override;
1303 }, 1328 },
1304); 1329);
1305 1330
1331# "readahead" all extensions
1332sub cache_extensions {
1333 my $grp = IO::AIO::aio_group;
1334
1335 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1336 for (grep /\.ext$/, @{$_[0]}) {
1337 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1338 }
1339 };
1340
1341 $grp
1342}
1343
1306sub load_extensions { 1344sub load_extensions {
1307 cf::sync_job { 1345 cf::sync_job {
1308 my %todo; 1346 my %todo;
1309 1347
1310 for my $path (<$LIBDIR/*.ext>) { 1348 for my $path (<$LIBDIR/*.ext>) {
1329 1367
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1368 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1369 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1370
1333 $ext{source} = 1371 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1372 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1373 . "#line 1 \"$path\"\n{\n"
1336 . $source 1374 . $source
1337 . "\n};\n1"; 1375 . "\n};\n1";
1338 1376
1339 $todo{$base} = \%ext; 1377 $todo{$base} = \%ext;
1379 1417
1380=back 1418=back
1381 1419
1382=head2 CORE EXTENSIONS 1420=head2 CORE EXTENSIONS
1383 1421
1384Functions and methods that extend core crossfire objects. 1422Functions and methods that extend core deliantra objects.
1385 1423
1386=cut 1424=cut
1387 1425
1388package cf::player; 1426package cf::player;
1389 1427
1432 1470
1433sub exists($) { 1471sub exists($) {
1434 my ($login) = @_; 1472 my ($login) = @_;
1435 1473
1436 $cf::PLAYER{$login} 1474 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1475 or !aio_stat path $login
1438} 1476}
1439 1477
1440sub find($) { 1478sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1479 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1480 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1492 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1493 or return;
1456 1494
1457 my $pl = cf::player::load_pl $f 1495 my $pl = cf::player::load_pl $f
1458 or return; 1496 or return;
1497
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1498 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1499 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1500 $cf::PLAYER{$login} = $pl
1462 } 1501 }
1463 } 1502 }
1473 1512
1474 return if $pl->{deny_save}; 1513 return if $pl->{deny_save};
1475 1514
1476 aio_mkdir playerdir $pl, 0770; 1515 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1516 $pl->{last_save} = $cf::RUNTIME;
1517
1518 cf::get_slot 0.01;
1478 1519
1479 $pl->save_pl ($path); 1520 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1521 cf::cede_to_tick;
1481} 1522}
1482 1523
1514 my ($pl) = @_; 1555 my ($pl) = @_;
1515 1556
1516 my $name = $pl->ob->name; 1557 my $name = $pl->ob->name;
1517 1558
1518 $pl->{deny_save} = 1; 1559 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1560 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1561
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1562 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1563 $pl->deactivate;
1564 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1565 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1566 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1567 $pl->ns->destroy if $pl->ns;
1525 1568
1526 my $path = playerdir $pl; 1569 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1570 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1609
1567 for my $login (@$dirs) { 1610 for my $login (@$dirs) {
1568 my $path = path $login; 1611 my $path = path $login;
1569 1612
1570 # a .pst is a dead give-away for a valid player 1613 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1614 # if no pst file found, open and chekc for blocked users
1615 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1616 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1617 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1618 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1619 }
1576 1620
1607 } 1651 }
1608 1652
1609 \@paths 1653 \@paths
1610} 1654}
1611 1655
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1656=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1657
1614Expand crossfire pod fragments into protocol xml. 1658Expand 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 1659
1705=item $player->ext_reply ($msgid, @msg) 1660=item $player->ext_reply ($msgid, @msg)
1706 1661
1707Sends an ext reply to the player. 1662Sends an ext reply to the player.
1708 1663
1775our $MAX_RESET = 3600; 1730our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1731our $DEFAULT_RESET = 3000;
1777 1732
1778sub generate_random_map { 1733sub generate_random_map {
1779 my ($self, $rmp) = @_; 1734 my ($self, $rmp) = @_;
1735
1736 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1737
1780 # mit "rum" bekleckern, nicht 1738 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1739 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1740 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1741 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1742 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1906 1864
1907# the temporary/swap location 1865# the temporary/swap location
1908sub save_path { 1866sub save_path {
1909 my ($self) = @_; 1867 my ($self) = @_;
1910 1868
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1869 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1870 "$TMPDIR/$path.map"
1913} 1871}
1914 1872
1915# the unique path, undef == no special unique path 1873# the unique path, undef == no special unique path
1916sub uniq_path { 1874sub uniq_path {
1917 my ($self) = @_; 1875 my ($self) = @_;
1918 1876
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1877 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1878 "$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} 1879}
1931 1880
1932sub decay_objects { 1881sub decay_objects {
1933 my ($self) = @_; 1882 my ($self) = @_;
1934 1883
2018sub find { 1967sub find {
2019 my ($path, $origin) = @_; 1968 my ($path, $origin) = @_;
2020 1969
2021 $path = normalise $path, $origin && $origin->path; 1970 $path = normalise $path, $origin && $origin->path;
2022 1971
2023 cf::lock_wait "map_data:$path";#d#remove 1972 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1973 my $guard2 = cf::lock_acquire "map_find:$path";
2025 1974
2026 $cf::MAP{$path} || do { 1975 $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 1976 my $map = new_from_path cf::map $path
2031 or return; 1977 or return;
2032 1978
2033 $map->{last_save} = $cf::RUNTIME; 1979 $map->{last_save} = $cf::RUNTIME;
2034 1980
2036 or return; 1982 or return;
2037 1983
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1984 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 1985 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 1986 #$cf::WAIT_FOR_TICK->wait;
1987 undef $guard2;
2041 undef $guard1; 1988 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 1989 $map->reset;
2044 return find $path; 1990 return find $path;
2045 } 1991 }
2046 1992
2047 $cf::MAP{$path} = $map 1993 $cf::MAP{$path} = $map
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2020 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2021 $f->skip_block;
2076 $self->_load_objects ($f) 2022 $self->_load_objects ($f)
2077 or return; 2023 or return;
2078 2024
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2025 $self->post_load_original
2080 if delete $self->{load_original}; 2026 if delete $self->{load_original};
2081 2027
2082 if (my $uniq = $self->uniq_path) { 2028 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2029 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2030 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2048 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2049 $self->decay_objects;
2104 $self->fix_auto_apply; 2050 $self->fix_auto_apply;
2105 $self->update_buttons; 2051 $self->update_buttons;
2106 cf::cede_to_tick; 2052 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2053 $self->activate;
2110 } 2054 }
2111 2055
2112 $self->{last_save} = $cf::RUNTIME; 2056 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2057 $self->last_access ($cf::RUNTIME);
2114 2058
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2059 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2060 }
2117 2061
2118 $self->post_load; 2062 $self->post_load;
2119} 2063}
2120 2064
2178 my ($path, $origin, $load) = @_; 2122 my ($path, $origin, $load) = @_;
2179 2123
2180 $path = normalise $path, $origin && $origin->{path}; 2124 $path = normalise $path, $origin && $origin->{path};
2181 2125
2182 if (my $map = $cf::MAP{$path}) { 2126 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2127 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2128 }
2185 2129
2186 $MAP_PREFETCH{$path} |= $load; 2130 $MAP_PREFETCH{$path} |= $load;
2187 2131
2188 $MAP_PREFETCHER ||= cf::async { 2132 $MAP_PREFETCHER ||= cf::async {
2225 cf::async { 2169 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2170 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2171 $_->contr->save for $self->players;
2228 }; 2172 };
2229 2173
2174 cf::get_slot 0.02;
2175
2230 if ($uniq) { 2176 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2177 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2178 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2179 } else {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2180 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2242 $self->save; 2188 $self->save;
2243 2189
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2190 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2191
2246 return if $self->players; 2192 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2193 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2194 return if $self->{deny_save};
2249 2195
2250 $self->in_memory (cf::MAP_SWAPPED); 2196 $self->in_memory (cf::MAP_SWAPPED);
2251 2197
2252 $self->deactivate; 2198 $self->deactivate;
2370 2316
2371sub unique_maps() { 2317sub unique_maps() {
2372 [ 2318 [
2373 map { 2319 map {
2374 utf8::decode $_; 2320 utf8::decode $_;
2375 /\.map$/ 2321 s/\.map$//; # TODO future compatibility hack
2322 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2323 ? ()
2376 ? normalise $_ 2324 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2325 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2326 ]
2380} 2327}
2381 2328
2382=back 2329=back
2389 2336
2390=over 4 2337=over 4
2391 2338
2392=item $ob->inv_recursive 2339=item $ob->inv_recursive
2393 2340
2394Returns the inventory of the object _and_ their inventories, recursively. 2341Returns the inventory of the object I<and> their inventories, recursively,
2342but I<not> the object itself.
2395 2343
2396=cut 2344=cut
2397 2345
2398sub inv_recursive_; 2346sub inv_recursive_;
2399sub inv_recursive_ { 2347sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2352 inv_recursive_ inv $_[0]
2405} 2353}
2406 2354
2407=item $ref = $ob->ref 2355=item $ref = $ob->ref
2408 2356
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2357Creates and returns a persistent reference to an object that can be stored as a string.
2410 2358
2411=item $ob = cf::object::deref ($refstring) 2359=item $ob = cf::object::deref ($refstring)
2412 2360
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2361returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2362even if the object actually exists. May block.
2446can be C<undef>. Does the right thing when the player is currently in a 2394can be C<undef>. Does the right thing when the player is currently in a
2447dialogue with the given NPC character. 2395dialogue with the given NPC character.
2448 2396
2449=cut 2397=cut
2450 2398
2399our $SAY_CHANNEL = {
2400 id => "say",
2401 title => "Map",
2402 reply => "say ",
2403 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2404};
2405
2406our $CHAT_CHANNEL = {
2407 id => "chat",
2408 title => "Chat",
2409 reply => "chat ",
2410 tooltip => "Player chat and shouts, global to the server.",
2411};
2412
2451# rough implementation of a future "reply" method that works 2413# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2414# with dialog boxes.
2453#TODO: the first argument must go, split into a $npc->reply_to ( method 2415#TODO: the first argument must go, split into a $npc->reply_to ( method
2454sub cf::object::player::reply($$$;$) { 2416sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2417 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2428 my $dialog = $pl->{npc_dialog};
2467 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2429 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2468 2430
2469 } else { 2431 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2432 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2433 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2434 }
2473 } 2435 }
2474} 2436}
2475 2437
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2438=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2463
2502=item $player_object->enter_link 2464=item $player_object->enter_link
2503 2465
2504Freezes the player and moves him/her to a special map (C<{link}>). 2466Freezes the player and moves him/her to a special map (C<{link}>).
2505 2467
2506The player should be reasonably safe there for short amounts of time. You 2468The player should be reasonably safe there for short amounts of time (e.g.
2507I<MUST> call C<leave_link> as soon as possible, though. 2469for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2470though, as the palyer cannot control the character while it is on the link
2471map.
2508 2472
2509Will never block. 2473Will never block.
2510 2474
2511=item $player_object->leave_link ($map, $x, $y) 2475=item $player_object->leave_link ($map, $x, $y)
2512 2476
2570 2534
2571 $map->load; 2535 $map->load;
2572 $map->load_neighbours; 2536 $map->load_neighbours;
2573 2537
2574 return unless $self->contr->active; 2538 return unless $self->contr->active;
2539 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2575 $self->activate_recursive; 2540 $self->activate_recursive;
2576 2541
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2542 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $self->enter_map ($map, $x, $y); 2543 $self->enter_map ($map, $x, $y);
2579} 2544}
2583Moves the player to the given map-path and coordinates by first freezing 2548Moves the player to the given map-path and coordinates by first freezing
2584her, loading and preparing them map, calling the provided $check callback 2549her, loading and preparing them map, calling the provided $check callback
2585that has to return the map if sucecssful, and then unfreezes the player on 2550that 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 2551the new (success) or old (failed) map position. In either case, $done will
2587be called at the end of this process. 2552be called at the end of this process.
2553
2554Note that $check will be called with a potentially non-loaded map, so if
2555it needs a loaded map it has to call C<< ->load >>.
2588 2556
2589=cut 2557=cut
2590 2558
2591our $GOTOGEN; 2559our $GOTOGEN;
2592 2560
2671} 2639}
2672 2640
2673sub prepare_random_map { 2641sub prepare_random_map {
2674 my ($exit) = @_; 2642 my ($exit) = @_;
2675 2643
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2644 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2645 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2646 # that depends on the exit object
2681 2647
2682 my $rmp = parse_random_map_params $exit->msg; 2648 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2650 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2651 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2652 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2653 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2654 $rmp->{origin_y} = $exit->y;
2655
2656 $exit->map->touch;
2689 } 2657 }
2690 2658
2691 $rmp->{random_seed} ||= $exit->random_seed; 2659 $rmp->{random_seed} ||= $exit->random_seed;
2692 2660
2693 my $data = cf::encode_json $rmp; 2661 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2662 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2663 my $meta = "$RANDOMDIR/$md5.meta";
2696 2664
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2665 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2666 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2667 undef $fh;
2700 aio_rename "$meta~", $meta; 2668 aio_rename "$meta~", $meta;
2701 2669
2670 my $slaying = "?random/$md5";
2671
2672 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2673 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2674 $exit->msg (undef);
2675 }
2704 } 2676 }
2705} 2677}
2706 2678
2707sub cf::object::player::enter_exit { 2679sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2680 my ($self, $exit) = @_;
2709 2681
2710 return unless $self->type == cf::PLAYER; 2682 return unless $self->type == cf::PLAYER;
2711 2683
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; 2684 $self->enter_link;
2724 2685
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 { 2686 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2687 $Coro::current->{desc} = "enter_exit";
2731 2688
2732 $self->deactivate_recursive; # just to be sure
2733 unless (eval { 2689 unless (eval {
2690 $self->deactivate_recursive; # just to be sure
2691
2692 # random map handling
2693 {
2694 my $guard = cf::lock_acquire "exit_prepare:$exit";
2695
2696 prepare_random_map $exit
2697 if $exit->slaying eq "/!";
2698 }
2699
2700 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2701 my $x = $exit->stats->hp;
2702 my $y = $exit->stats->sp;
2703
2734 $self->goto ($slaying, $hp, $sp); 2704 $self->goto ($map, $x, $y);
2735 2705
2706 # if exit is damned, update players death & WoR home-position
2707 $self->contr->savebed ($map, $x, $y)
2708 if $exit->flag (cf::FLAG_DAMNED);
2709
2736 1; 2710 1
2737 }) { 2711 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2712 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "I'll try to bring you back to the map you were before. " 2713 . "I'll try to bring you back to the map you were before. "
2740 . "Please report this to the dungeon master!", 2714 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2715 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2716
2743 warn "ERROR in enter_exit: $@"; 2717 warn "ERROR in enter_exit: $@";
2809 id => "infobox", 2783 id => "infobox",
2810 title => "Body Parts", 2784 title => "Body Parts",
2811 reply => undef, 2785 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2786 tooltip => "Shows which body parts you posess and are available",
2813 }, 2787 },
2788 "c/statistics" => {
2789 id => "infobox",
2790 title => "Statistics",
2791 reply => undef,
2792 tooltip => "Shows your primary statistics",
2793 },
2794 "c/skills" => {
2795 id => "infobox",
2796 title => "Skills",
2797 reply => undef,
2798 tooltip => "Shows your experience per skill and item power",
2799 },
2800 "c/shopitems" => {
2801 id => "infobox",
2802 title => "Shop Items",
2803 reply => undef,
2804 tooltip => "Shows the items currently for sale in this shop",
2805 },
2806 "c/resistances" => {
2807 id => "infobox",
2808 title => "Resistances",
2809 reply => undef,
2810 tooltip => "Shows your resistances",
2811 },
2812 "c/pets" => {
2813 id => "infobox",
2814 title => "Pets",
2815 reply => undef,
2816 tooltip => "Shows information abotu your pets/a specific pet",
2817 },
2818 "c/perceiveself" => {
2819 id => "infobox",
2820 title => "Perceive Self",
2821 reply => undef,
2822 tooltip => "You gained detailed knowledge about yourself",
2823 },
2814 "c/uptime" => { 2824 "c/uptime" => {
2815 id => "infobox", 2825 id => "infobox",
2816 title => "Uptime", 2826 title => "Uptime",
2817 reply => undef, 2827 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2828 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2831 id => "infobox",
2822 title => "Map Info", 2832 title => "Map Info",
2823 reply => undef, 2833 reply => undef,
2824 tooltip => "Information related to the maps", 2834 tooltip => "Information related to the maps",
2825 }, 2835 },
2836 "c/party" => {
2837 id => "party",
2838 title => "Party",
2839 reply => "gsay ",
2840 tooltip => "Messages and chat related to your party",
2841 },
2842 "c/death" => {
2843 id => "death",
2844 title => "Death",
2845 reply => undef,
2846 tooltip => "Reason for and more info about your most recent death",
2847 },
2848 "c/say" => $SAY_CHANNEL,
2849 "c/chat" => $CHAT_CHANNEL,
2826); 2850);
2827 2851
2828sub cf::client::send_msg { 2852sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2853 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2854
2831 $msg = $self->pl->expand_cfpod ($msg); 2855 $msg = $self->pl->expand_cfpod ($msg)
2856 unless $color & cf::NDI_VERBATIM;
2832 2857
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2858 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2859
2835 # check predefined channels, for the benefit of C 2860 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2861 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 2862 $channel = $CHANNEL{$channel};
2838 2863
2839 $self->ext_msg (channel_info => $channel) 2864 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 2865 $channel = $channel->{id};
2843 2866
2844 } elsif (ref $channel) { 2867 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 2868 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 2869 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 2870 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 2871 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 2872 }
2851 2873
2852 $channel = $channel->{id}; 2874 $channel = $channel->{id};
2853 } 2875 }
2854 2876
2855 return unless @extra || length $msg; 2877 return unless @extra || length $msg;
2856 2878
2857 if ($self->can_msg) {
2858 # default colour, mask it out 2879 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2880 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2881 if $color & cf::NDI_DEF;
2861 2882
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2883 my $pkt = "msg "
2884 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2885 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 2886 );
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 2887
2876 $color &= cf::NDI_COLOR_MASK; 2888 # try lzf for large packets
2889 $pkt = "lzf " . Compress::LZF::compress $pkt
2890 if 1024 <= length $pkt and $self->{can_lzf};
2877 2891
2878 utf8::encode $msg; 2892 # split very large packets
2879 2893 if (8192 < length $pkt and $self->{can_lzf}) {
2880 if (0 && $msg =~ /\[/) { 2894 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2881 # COMMAND/INFO 2895 $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 } 2896 }
2897
2898 $self->send_packet ($pkt);
2889} 2899}
2890 2900
2891=item $client->ext_msg ($type, @msg) 2901=item $client->ext_msg ($type, @msg)
2892 2902
2893Sends an ext event to the client. 2903Sends an ext event to the client.
3067 3077
3068The following functions and methods are available within a safe environment: 3078The following functions and methods are available within a safe environment:
3069 3079
3070 cf::object 3080 cf::object
3071 contr pay_amount pay_player map x y force_find force_add destroy 3081 contr pay_amount pay_player map x y force_find force_add destroy
3072 insert remove name archname title slaying race decrease_ob_nr 3082 insert remove name archname title slaying race decrease split
3083 value
3073 3084
3074 cf::object::player 3085 cf::object::player
3075 player 3086 player
3076 3087
3077 cf::player 3088 cf::player
3082 3093
3083=cut 3094=cut
3084 3095
3085for ( 3096for (
3086 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3087 insert remove inv name archname title slaying race 3098 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3099 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3100 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3101 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3102 ["cf::map" => qw(trigger)],
3092) { 3103) {
3093 no strict 'refs'; 3104 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3105 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3112 my ($code, %vars) = @_; 3123 my ($code, %vars) = @_;
3113 3124
3114 my $qcode = $code; 3125 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3127 $qcode =~ s/\n/\\n/g;
3128
3129 %vars = (_dummy => 0) unless %vars;
3117 3130
3118 local $_; 3131 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars; 3132 local @safe::cf::_safe_eval_args = values %vars;
3120 3133
3121 my $eval = 3134 my $eval =
3301 while (my ($k, $v) = each %$want) { 3314 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3315 $ns->fx_want ($k, $v);
3303 } 3316 }
3304}; 3317};
3305 3318
3319sub load_resource_file($) {
3320 my $guard = lock_acquire "load_resource_file";
3321
3322 my $status = load_resource_file_ $_[0];
3323 get_slot 0.1, 100;
3324 cf::arch::commit_load;
3325
3326 $status
3327}
3328
3306sub reload_regions { 3329sub reload_regions {
3307 # HACK to clear player env face cache, we need some signal framework 3330 # HACK to clear player env face cache, we need some signal framework
3308 # for this (global event?) 3331 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3332 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3333
3323} 3346}
3324 3347
3325sub reload_archetypes { 3348sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3349 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3350 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} 3351}
3334 3352
3335sub reload_treasures { 3353sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3354 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3355 or die "unable to load treasurelists\n";
3338} 3356}
3339 3357
3340sub reload_resources { 3358sub reload_resources {
3341 warn "reloading resource files...\n"; 3359 warn "reloading resource files...\n";
3342 3360
3361 reload_facedata;
3362 reload_archetypes;
3343 reload_regions; 3363 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3364 reload_treasures;
3348 3365
3349 warn "finished reloading resource files\n"; 3366 warn "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3367}
3355 3368
3356sub reload_config { 3369sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3370 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3371 or return;
3372 }; 3385 };
3373 warn $@ if $@; 3386 warn $@ if $@;
3374 } 3387 }
3375} 3388}
3376 3389
3390sub pidfile() {
3391 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3392 or die "$PIDFILE: $!";
3393 flock $fh, &Fcntl::LOCK_EX
3394 or die "$PIDFILE: flock: $!";
3395 $fh
3396}
3397
3398# make sure only one server instance is running at any one time
3399sub atomic {
3400 my $fh = pidfile;
3401
3402 my $pid = <$fh>;
3403 kill 9, $pid if $pid > 0;
3404
3405 seek $fh, 0, 0;
3406 print $fh $$;
3407}
3408
3409sub main_loop {
3410 warn "EV::loop starting\n";
3411 if (1) {
3412 EV::loop;
3413 }
3414 warn "EV::loop returned\n";
3415 goto &main_loop unless $REALLY_UNLOOP;
3416}
3417
3377sub main { 3418sub main {
3419 cf::init_globals; # initialise logging
3420
3421 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3422 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3423 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3424 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3425
3426 cf::init_experience;
3427 cf::init_anim;
3428 cf::init_attackmess;
3429 cf::init_dynamic;
3430
3431 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3432
3378 # we must not ever block the main coroutine 3433 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3434 local $Coro::idle = sub {
3380 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3435 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3381 (async { 3436 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3437 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3438 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3439 })->prio (Coro::PRIO_MAX);
3385 }; 3440 };
3386 3441
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; 3442 evthread_start IO::AIO::poll_fileno;
3393 EV::loop; 3443
3444 cf::sync_job {
3445 reload_resources;
3446 reload_config;
3447 db_init;
3448
3449 cf::load_settings;
3450 cf::load_materials;
3451 cf::init_uuid;
3452 cf::init_signals;
3453 cf::init_commands;
3454 cf::init_skills;
3455
3456 cf::init_beforeplay;
3457
3458 atomic;
3459
3460 load_extensions;
3461
3462 utime time, time, $RUNTIMEFILE;
3463
3464 # no (long-running) fork's whatsoever before this point(!)
3465 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3466
3467 (pop @POST_INIT)->(0) while @POST_INIT;
3468 };
3469
3470 main_loop;
3394} 3471}
3395 3472
3396############################################################################# 3473#############################################################################
3397# initialisation and cleanup 3474# initialisation and cleanup
3398 3475
3405 }; 3482 };
3406 } 3483 }
3407} 3484}
3408 3485
3409sub write_runtime_sync { 3486sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3487 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3488 # the fsync below can take a very very long time.
3414 3489
3415 IO::AIO::aio_utime $runtime, undef, undef; 3490 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3491
3417 my $guard = cf::lock_acquire "write_runtime"; 3492 my $guard = cf::lock_acquire "write_runtime";
3418 3493
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3494 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3495 or return;
3421 3496
3422 my $value = $cf::RUNTIME + 90 + 10; 3497 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3498 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3499 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3509 aio_utime $fh, undef, undef;
3435 3510
3436 close $fh 3511 close $fh
3437 or return; 3512 or return;
3438 3513
3439 aio_rename "$runtime~", $runtime 3514 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3515 and return;
3441 3516
3442 warn "runtime file written.\n"; 3517 warn "runtime file written.\n";
3443 3518
3444 1 3519 1
3456 my $uuid = "$LOCALDIR/uuid"; 3531 my $uuid = "$LOCALDIR/uuid";
3457 3532
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3533 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3534 or return;
3460 3535
3461 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3536 my $value = uuid_seq uuid_cur;
3537
3538 unless ($value) {
3539 warn "cowardly refusing to write zero uuid value!\n";
3540 return;
3541 }
3542
3543 my $value = uuid_str $value + $uuid_skip;
3462 $uuid_skip = 0; 3544 $uuid_skip = 0;
3463 3545
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3546 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3547 and return;
3466 3548
3488} 3570}
3489 3571
3490sub emergency_save() { 3572sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3573 my $freeze_guard = cf::freeze_mainloop;
3492 3574
3493 warn "enter emergency perl save\n"; 3575 warn "emergency_perl_save: enter\n";
3494 3576
3495 cf::sync_job { 3577 cf::sync_job {
3578 # this is a trade-off: we want to be very quick here, so
3579 # save all maps without fsync, and later call a global sync
3580 # (which in turn might be very very slow)
3581 local $USE_FSYNC = 0;
3582
3496 # use a peculiar iteration method to avoid tripping on perl 3583 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3584 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3585 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3586 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3587 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3588 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3589 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3590 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3591 $pl->save;
3505 } 3592 }
3506 warn "end emergency player save\n"; 3593 warn "emergency_perl_save: end player save\n";
3507 3594
3508 warn "begin emergency map save\n"; 3595 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3596 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3597 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3598 $map->valid or next;
3512 $map->save; 3599 $map->save;
3513 } 3600 }
3514 warn "end emergency map save\n"; 3601 warn "emergency_perl_save: end map save\n";
3515 3602
3516 warn "begin emergency database checkpoint\n"; 3603 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3604 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3605 warn "emergency_perl_save: end database checkpoint\n";
3519 3606
3520 warn "begin write uuid\n"; 3607 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3608 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3609 warn "emergency_perl_save: end write uuid\n";
3523 }; 3610 };
3524 3611
3612 warn "emergency_perl_save: starting sync()\n";
3613 IO::AIO::aio_sync sub {
3614 warn "emergency_perl_save: finished sync()\n";
3615 };
3616
3525 warn "leave emergency perl save\n"; 3617 warn "emergency_perl_save: leave\n";
3526} 3618}
3527 3619
3528sub post_cleanup { 3620sub post_cleanup {
3529 my ($make_core) = @_; 3621 my ($make_core) = @_;
3530 3622
3531 warn Carp::longmess "post_cleanup backtrace" 3623 warn Carp::longmess "post_cleanup backtrace"
3532 if $make_core; 3624 if $make_core;
3625
3626 my $fh = pidfile;
3627 unlink $PIDFILE if <$fh> == $$;
3628}
3629
3630# a safer delete_package, copied from Symbol
3631sub clear_package($) {
3632 my $pkg = shift;
3633
3634 # expand to full symbol table name if needed
3635 unless ($pkg =~ /^main::.*::$/) {
3636 $pkg = "main$pkg" if $pkg =~ /^::/;
3637 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3638 $pkg .= '::' unless $pkg =~ /::$/;
3639 }
3640
3641 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3642 my $stem_symtab = *{$stem}{HASH};
3643
3644 defined $stem_symtab and exists $stem_symtab->{$leaf}
3645 or return;
3646
3647 # clear all symbols
3648 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3649 for my $name (keys %$leaf_symtab) {
3650 _gv_clear *{"$pkg$name"};
3651# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3652 }
3653 warn "cleared package $pkg\n";#d#
3533} 3654}
3534 3655
3535sub do_reload_perl() { 3656sub do_reload_perl() {
3536 # can/must only be called in main 3657 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3658 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3659 warn "can only reload from main coroutine";
3539 return; 3660 return;
3540 } 3661 }
3541 3662
3663 return if $RELOAD++;
3664
3665 my $t1 = EV::time;
3666
3667 while ($RELOAD) {
3542 warn "reloading..."; 3668 warn "reloading...";
3543 3669
3544 warn "entering sync_job"; 3670 warn "entering sync_job";
3545 3671
3546 cf::sync_job { 3672 cf::sync_job {
3547 cf::write_runtime_sync; # external watchdog should not bark 3673 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3674 cf::emergency_save;
3549 cf::write_runtime_sync; # external watchdog should not bark 3675 cf::write_runtime_sync; # external watchdog should not bark
3550 3676
3551 warn "syncing database to disk"; 3677 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3678 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3679
3554 # if anything goes wrong in here, we should simply crash as we already saved 3680 # if anything goes wrong in here, we should simply crash as we already saved
3555 3681
3556 warn "flushing outstanding aio requests"; 3682 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; 3683 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3684 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 } 3685 }
3588 3686
3589 warn "... nuking $pkg"; 3687 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3688 $_->cancel for values %EXT_CORO;
3591 } 3689 %EXT_CORO = ();
3592 3690
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3691 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3692 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3693
3694 warn "removing ext/exti commands";
3695 %EXTCMD = ();
3696 %EXTICMD = ();
3697
3698 warn "unloading/nuking all extensions";
3699 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3700 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3701
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3702 if (my $cb = $pkg->can ("unload")) {
3703 eval {
3604 $cb->(); 3704 $cb->($pkg);
3705 1
3706 } or warn "$pkg unloaded, but with errors: $@";
3707 }
3708
3709 warn "... clearing $pkg";
3710 clear_package $pkg;
3605 } 3711 }
3606 3712
3607 Symbol::delete_package $k; 3713 warn "unloading all perl modules loaded from $LIBDIR";
3714 while (my ($k, $v) = each %INC) {
3715 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3716
3717 warn "... unloading $k";
3718 delete $INC{$k};
3719
3720 $k =~ s/\.pm$//;
3721 $k =~ s/\//::/g;
3722
3723 if (my $cb = $k->can ("unload_module")) {
3724 $cb->();
3725 }
3726
3727 clear_package $k;
3608 } 3728 }
3609 3729
3610 warn "getting rid of safe::, as good as possible"; 3730 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3731 clear_package "safe::$_"
3612 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3732 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3613 3733
3614 warn "unloading cf.pm \"a bit\""; 3734 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3735 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3736 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3737
3618 # don't, removes xs symbols, too, 3738 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3739 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3740 #clear_package __PACKAGE__;
3621 3741
3622 warn "unload completed, starting to reload now"; 3742 warn "unload completed, starting to reload now";
3623 3743
3624 warn "reloading cf.pm"; 3744 warn "reloading cf.pm";
3625 require cf; 3745 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3746 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3747
3628 warn "loading config and database again"; 3748 warn "loading config and database again";
3629 cf::reload_config; 3749 cf::reload_config;
3630 3750
3631 warn "loading extensions"; 3751 warn "loading extensions";
3632 cf::load_extensions; 3752 cf::load_extensions;
3633 3753
3754 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3755 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3756 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3757 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3758 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3759 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3760 reattach $_ for values %PLAYER;
3761 }
3640 3762
3763 warn "running post_init jobs";
3764 (pop @POST_INIT)->(1) while @POST_INIT;
3765
3641 warn "leaving sync_job"; 3766 warn "leaving sync_job";
3642 3767
3643 1 3768 1
3644 } or do { 3769 } or do {
3645 warn $@; 3770 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3771 cf::cleanup "error while reloading, exiting.";
3647 }; 3772 };
3648 3773
3649 warn "reloaded"; 3774 warn "reloaded";
3775 --$RELOAD;
3776 }
3777
3778 $t1 = EV::time - $t1;
3779 warn "reload completed in ${t1}s\n";
3650}; 3780};
3651 3781
3652our $RELOAD_WATCHER; # used only during reload 3782our $RELOAD_WATCHER; # used only during reload
3653 3783
3654sub reload_perl() { 3784sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3785 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3786 # coro crashes during coro_state_free->destroy here.
3657 3787
3788 $RELOAD_WATCHER ||= cf::async {
3789 Coro::AIO::aio_wait cache_extensions;
3790
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3791 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3792 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3793 undef $RELOAD_WATCHER;
3794 };
3661 }; 3795 };
3662} 3796}
3663 3797
3664register_command "reload" => sub { 3798register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3799 my ($who, $arg) = @_;
3679 3813
3680our @WAIT_FOR_TICK; 3814our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3815our @WAIT_FOR_TICK_BEGIN;
3682 3816
3683sub wait_for_tick { 3817sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3818 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3819
3687 my $signal = new Coro::Signal; 3820 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3821 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3822 $signal->wait;
3690} 3823}
3691 3824
3692sub wait_for_tick_begin { 3825sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3826 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3827
3696 my $signal = new Coro::Signal; 3828 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3829 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3830 $signal->wait;
3699} 3831}
3738{ 3870{
3739 # configure BDB 3871 # configure BDB
3740 3872
3741 BDB::min_parallel 8; 3873 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3874 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3875 $AnyEvent::BDB::WATCHER->priority (1);
3744 3876
3745 unless ($DB_ENV) { 3877 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3878 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3879 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | BDB::LOG_AUTOREMOVE, 1); 3880 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3881 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3882 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3883 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3884
3752 cf::sync_job { 3885 cf::sync_job {
3753 eval { 3886 eval {
3779{ 3912{
3780 # configure IO::AIO 3913 # configure IO::AIO
3781 3914
3782 IO::AIO::min_parallel 8; 3915 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3916 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3917 undef $AnyEvent::AIO::WATCHER;
3785} 3918}
3786 3919
3787my $_log_backtrace; 3920my $_log_backtrace;
3788 3921
3789sub _log_backtrace { 3922sub _log_backtrace {
3792 $msg =~ s/\n//; 3925 $msg =~ s/\n//;
3793 3926
3794 # limit the # of concurrent backtraces 3927 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3928 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3929 ++$_log_backtrace;
3930 my $perl_bt = Carp::longmess $msg;
3797 async { 3931 async {
3798 $Coro::current->{desc} = "abt $msg"; 3932 $Coro::current->{desc} = "abt $msg";
3799 3933
3800 my @bt = fork_call { 3934 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3935 @addr = map { sprintf "%x", $_ } @addr;
3812 } 3946 }
3813 3947
3814 @funcs 3948 @funcs
3815 }; 3949 };
3816 3950
3817 LOG llevInfo, "[ABT] $msg\n"; 3951 LOG llevInfo, "[ABT] $perl_bt\n";
3952 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3953 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3954 --$_log_backtrace;
3820 }; 3955 };
3821 } else { 3956 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3957 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 3958 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 3959 }
3825} 3960}
3826 3961
3827# load additional modules 3962# load additional modules
3828use cf::pod; 3963require "cf/$_.pm" for @EXTRA_MODULES;
3829 3964
3830END { cf::emergency_save } 3965END { cf::emergency_save }
3831 3966
38321 39671
3833 3968

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines