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.418 by root, Fri Apr 11 21:09:53 2008 UTC vs.
Revision 1.468 by root, Thu Jan 8 19:23:44 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 off
99 111
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 112our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 113our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 114our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 115our $DB_ENV;
105 116
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
1909 1854
1910# the temporary/swap location 1855# the temporary/swap location
1911sub save_path { 1856sub save_path {
1912 my ($self) = @_; 1857 my ($self) = @_;
1913 1858
1914 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1859 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1915 "$TMPDIR/$path.map" 1860 "$TMPDIR/$path.map"
1916} 1861}
1917 1862
1918# the unique path, undef == no special unique path 1863# the unique path, undef == no special unique path
1919sub uniq_path { 1864sub uniq_path {
1920 my ($self) = @_; 1865 my ($self) = @_;
1921 1866
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1867 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1868 "$UNIQUEDIR/$path"
1924}
1925
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933} 1869}
1934 1870
1935sub decay_objects { 1871sub decay_objects {
1936 my ($self) = @_; 1872 my ($self) = @_;
1937 1873
2021sub find { 1957sub find {
2022 my ($path, $origin) = @_; 1958 my ($path, $origin) = @_;
2023 1959
2024 $path = normalise $path, $origin && $origin->path; 1960 $path = normalise $path, $origin && $origin->path;
2025 1961
2026 cf::lock_wait "map_data:$path";#d#remove 1962 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1963 my $guard2 = cf::lock_acquire "map_find:$path";
2028 1964
2029 $cf::MAP{$path} || do { 1965 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 1966 my $map = new_from_path cf::map $path
2034 or return; 1967 or return;
2035 1968
2036 $map->{last_save} = $cf::RUNTIME; 1969 $map->{last_save} = $cf::RUNTIME;
2037 1970
2039 or return; 1972 or return;
2040 1973
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1974 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 1975 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 1976 #$cf::WAIT_FOR_TICK->wait;
1977 undef $guard2;
2044 undef $guard1; 1978 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 1979 $map->reset;
2047 return find $path; 1980 return find $path;
2048 } 1981 }
2049 1982
2050 $cf::MAP{$path} = $map 1983 $cf::MAP{$path} = $map
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2010 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2011 $f->skip_block;
2079 $self->_load_objects ($f) 2012 $self->_load_objects ($f)
2080 or return; 2013 or return;
2081 2014
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2015 $self->post_load_original
2083 if delete $self->{load_original}; 2016 if delete $self->{load_original};
2084 2017
2085 if (my $uniq = $self->uniq_path) { 2018 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2019 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2020 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2038 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2039 $self->decay_objects;
2107 $self->fix_auto_apply; 2040 $self->fix_auto_apply;
2108 $self->update_buttons; 2041 $self->update_buttons;
2109 cf::cede_to_tick; 2042 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2043 $self->activate;
2113 } 2044 }
2114 2045
2115 $self->{last_save} = $cf::RUNTIME; 2046 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2047 $self->last_access ($cf::RUNTIME);
2117 2048
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2049 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2050 }
2120 2051
2121 $self->post_load; 2052 $self->post_load;
2122} 2053}
2123 2054
2181 my ($path, $origin, $load) = @_; 2112 my ($path, $origin, $load) = @_;
2182 2113
2183 $path = normalise $path, $origin && $origin->{path}; 2114 $path = normalise $path, $origin && $origin->{path};
2184 2115
2185 if (my $map = $cf::MAP{$path}) { 2116 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2117 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2118 }
2188 2119
2189 $MAP_PREFETCH{$path} |= $load; 2120 $MAP_PREFETCH{$path} |= $load;
2190 2121
2191 $MAP_PREFETCHER ||= cf::async { 2122 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2159 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2160 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2161 $_->contr->save for $self->players;
2231 }; 2162 };
2232 2163
2164 cf::get_slot 0.02;
2165
2233 if ($uniq) { 2166 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2167 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2168 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2169 } else {
2237 $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);
2245 $self->save; 2178 $self->save;
2246 2179
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2180 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2181
2249 return if $self->players; 2182 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2183 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2184 return if $self->{deny_save};
2252 2185
2253 $self->in_memory (cf::MAP_SWAPPED); 2186 $self->in_memory (cf::MAP_SWAPPED);
2254 2187
2255 $self->deactivate; 2188 $self->deactivate;
2373 2306
2374sub unique_maps() { 2307sub unique_maps() {
2375 [ 2308 [
2376 map { 2309 map {
2377 utf8::decode $_; 2310 utf8::decode $_;
2378 /\.map$/ 2311 s/\.map$//; # TODO future compatibility hack
2312 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2313 ? ()
2379 ? normalise $_ 2314 : normalise $_
2380 : ()
2381 } @{ aio_readdir $UNIQUEDIR or [] } 2315 } @{ aio_readdir $UNIQUEDIR or [] }
2382 ] 2316 ]
2383} 2317}
2384 2318
2385=back 2319=back
2392 2326
2393=over 4 2327=over 4
2394 2328
2395=item $ob->inv_recursive 2329=item $ob->inv_recursive
2396 2330
2397Returns 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.
2398 2333
2399=cut 2334=cut
2400 2335
2401sub inv_recursive_; 2336sub inv_recursive_;
2402sub inv_recursive_ { 2337sub inv_recursive_ {
2407 inv_recursive_ inv $_[0] 2342 inv_recursive_ inv $_[0]
2408} 2343}
2409 2344
2410=item $ref = $ob->ref 2345=item $ref = $ob->ref
2411 2346
2412creates 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.
2413 2348
2414=item $ob = cf::object::deref ($refstring) 2349=item $ob = cf::object::deref ($refstring)
2415 2350
2416returns 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,
2417even if the object actually exists. May block. 2352even if the object actually exists. May block.
2449can 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
2450dialogue with the given NPC character. 2385dialogue with the given NPC character.
2451 2386
2452=cut 2387=cut
2453 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
2454# rough implementation of a future "reply" method that works 2403# rough implementation of a future "reply" method that works
2455# with dialog boxes. 2404# with dialog boxes.
2456#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
2457sub cf::object::player::reply($$$;$) { 2406sub cf::object::player::reply($$$;$) {
2458 my ($self, $npc, $msg, $flags) = @_; 2407 my ($self, $npc, $msg, $flags) = @_;
2469 my $dialog = $pl->{npc_dialog}; 2418 my $dialog = $pl->{npc_dialog};
2470 $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));
2471 2420
2472 } else { 2421 } else {
2473 $msg = $npc->name . " says: $msg" if $npc; 2422 $msg = $npc->name . " says: $msg" if $npc;
2474 $self->message ($msg, $flags); 2423 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2475 } 2424 }
2476 } 2425 }
2477} 2426}
2478 2427
2479=item $object->send_msg ($channel, $msg, $color, [extra...]) 2428=item $object->send_msg ($channel, $msg, $color, [extra...])
2504 2453
2505=item $player_object->enter_link 2454=item $player_object->enter_link
2506 2455
2507Freezes 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}>).
2508 2457
2509The 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.
2510I<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.
2511 2462
2512Will never block. 2463Will never block.
2513 2464
2514=item $player_object->leave_link ($map, $x, $y) 2465=item $player_object->leave_link ($map, $x, $y)
2515 2466
2573 2524
2574 $map->load; 2525 $map->load;
2575 $map->load_neighbours; 2526 $map->load_neighbours;
2576 2527
2577 return unless $self->contr->active; 2528 return unless $self->contr->active;
2529 $self->flag (cf::FLAG_DEBUG, 0);#d# temp
2578 $self->activate_recursive; 2530 $self->activate_recursive;
2579 2531
2580 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2532 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2581 $self->enter_map ($map, $x, $y); 2533 $self->enter_map ($map, $x, $y);
2582} 2534}
2586Moves 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
2587her, loading and preparing them map, calling the provided $check callback 2539her, loading and preparing them map, calling the provided $check callback
2588that 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
2589the 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
2590be 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 >>.
2591 2546
2592=cut 2547=cut
2593 2548
2594our $GOTOGEN; 2549our $GOTOGEN;
2595 2550
2674} 2629}
2675 2630
2676sub prepare_random_map { 2631sub prepare_random_map {
2677 my ($exit) = @_; 2632 my ($exit) = @_;
2678 2633
2679 my $guard = cf::lock_acquire "exit_prepare:$exit";
2680
2681 # all this does is basically replace the /! path by 2634 # all this does is basically replace the /! path by
2682 # a new random map path (?random/...) with a seed 2635 # a new random map path (?random/...) with a seed
2683 # that depends on the exit object 2636 # that depends on the exit object
2684 2637
2685 my $rmp = parse_random_map_params $exit->msg; 2638 my $rmp = parse_random_map_params $exit->msg;
2687 if ($exit->map) { 2640 if ($exit->map) {
2688 $rmp->{region} = $exit->region->name; 2641 $rmp->{region} = $exit->region->name;
2689 $rmp->{origin_map} = $exit->map->path; 2642 $rmp->{origin_map} = $exit->map->path;
2690 $rmp->{origin_x} = $exit->x; 2643 $rmp->{origin_x} = $exit->x;
2691 $rmp->{origin_y} = $exit->y; 2644 $rmp->{origin_y} = $exit->y;
2645
2646 $exit->map->touch;
2692 } 2647 }
2693 2648
2694 $rmp->{random_seed} ||= $exit->random_seed; 2649 $rmp->{random_seed} ||= $exit->random_seed;
2695 2650
2696 my $data = cf::encode_json $rmp; 2651 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2697 my $md5 = Digest::MD5::md5_hex $data; 2652 my $md5 = Digest::MD5::md5_hex $data;
2698 my $meta = "$RANDOMDIR/$md5.meta"; 2653 my $meta = "$RANDOMDIR/$md5.meta";
2699 2654
2700 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2655 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2701 aio_write $fh, 0, (length $data), $data, 0; 2656 aio_write $fh, 0, (length $data), $data, 0;
2702 undef $fh; 2657 undef $fh;
2703 aio_rename "$meta~", $meta; 2658 aio_rename "$meta~", $meta;
2704 2659
2660 my $slaying = "?random/$md5";
2661
2662 if ($exit->valid) {
2705 $exit->slaying ("?random/$md5"); 2663 $exit->slaying ("?random/$md5");
2706 $exit->msg (undef); 2664 $exit->msg (undef);
2665 }
2707 } 2666 }
2708} 2667}
2709 2668
2710sub cf::object::player::enter_exit { 2669sub cf::object::player::enter_exit {
2711 my ($self, $exit) = @_; 2670 my ($self, $exit) = @_;
2712 2671
2713 return unless $self->type == cf::PLAYER; 2672 return unless $self->type == cf::PLAYER;
2714 2673
2715 if ($exit->slaying eq "/!") {
2716 #TODO: this should de-fi-ni-te-ly not be a sync-job
2717 # the problem is that $exit might not survive long enough
2718 # so it needs to be done right now, right here
2719 cf::sync_job { prepare_random_map $exit };
2720 }
2721
2722 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2723 my $hp = $exit->stats->hp;
2724 my $sp = $exit->stats->sp;
2725
2726 $self->enter_link; 2674 $self->enter_link;
2727 2675
2728 # if exit is damned, update players death & WoR home-position
2729 $self->contr->savebed ($slaying, $hp, $sp)
2730 if $exit->flag (FLAG_DAMNED);
2731
2732 (async { 2676 (async {
2733 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2677 $Coro::current->{desc} = "enter_exit";
2734 2678
2735 $self->deactivate_recursive; # just to be sure
2736 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
2737 $self->goto ($slaying, $hp, $sp); 2694 $self->goto ($map, $x, $y);
2738 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
2739 1; 2700 1
2740 }) { 2701 }) {
2741 $self->message ("Something went wrong deep within the crossfire server. " 2702 $self->message ("Something went wrong deep within the deliantra server. "
2742 . "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. "
2743 . "Please report this to the dungeon master!", 2704 . "Please report this to the dungeon master!",
2744 cf::NDI_UNIQUE | cf::NDI_RED); 2705 cf::NDI_UNIQUE | cf::NDI_RED);
2745 2706
2746 warn "ERROR in enter_exit: $@"; 2707 warn "ERROR in enter_exit: $@";
2812 id => "infobox", 2773 id => "infobox",
2813 title => "Body Parts", 2774 title => "Body Parts",
2814 reply => undef, 2775 reply => undef,
2815 tooltip => "Shows which body parts you posess and are available", 2776 tooltip => "Shows which body parts you posess and are available",
2816 }, 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/resistances" => {
2791 id => "infobox",
2792 title => "Resistances",
2793 reply => undef,
2794 tooltip => "Shows your resistances",
2795 },
2796 "c/pets" => {
2797 id => "infobox",
2798 title => "Pets",
2799 reply => undef,
2800 tooltip => "Shows information abotu your pets/a specific pet",
2801 },
2817 "c/uptime" => { 2802 "c/uptime" => {
2818 id => "infobox", 2803 id => "infobox",
2819 title => "Uptime", 2804 title => "Uptime",
2820 reply => undef, 2805 reply => undef,
2821 tooltip => "How long the server has been running since last restart", 2806 tooltip => "How long the server has been running since last restart",
2824 id => "infobox", 2809 id => "infobox",
2825 title => "Map Info", 2810 title => "Map Info",
2826 reply => undef, 2811 reply => undef,
2827 tooltip => "Information related to the maps", 2812 tooltip => "Information related to the maps",
2828 }, 2813 },
2814 "c/party" => {
2815 id => "party",
2816 title => "Party",
2817 reply => "gsay ",
2818 tooltip => "Messages and chat related to your party",
2819 },
2820 "c/death" => {
2821 id => "death",
2822 title => "Death",
2823 reply => undef,
2824 tooltip => "Reason for and more info about your most recent death",
2825 },
2826 "c/say" => $SAY_CHANNEL,
2827 "c/chat" => $CHAT_CHANNEL,
2829); 2828);
2830 2829
2831sub cf::client::send_msg { 2830sub cf::client::send_msg {
2832 my ($self, $channel, $msg, $color, @extra) = @_; 2831 my ($self, $channel, $msg, $color, @extra) = @_;
2833 2832
2834 $msg = $self->pl->expand_cfpod ($msg); 2833 $msg = $self->pl->expand_cfpod ($msg)
2834 unless $color & cf::NDI_VERBATIM;
2835 2835
2836 $color &= cf::NDI_CLIENT_MASK; # just in case... 2836 $color &= cf::NDI_CLIENT_MASK; # just in case...
2837 2837
2838 # check predefined channels, for the benefit of C 2838 # check predefined channels, for the benefit of C
2839 if ($CHANNEL{$channel}) { 2839 if ($CHANNEL{$channel}) {
2840 $channel = $CHANNEL{$channel}; 2840 $channel = $CHANNEL{$channel};
2841 2841
2842 $self->ext_msg (channel_info => $channel) 2842 $self->ext_msg (channel_info => $channel);
2843 if $self->can_msg;
2844
2845 $channel = $channel->{id}; 2843 $channel = $channel->{id};
2846 2844
2847 } elsif (ref $channel) { 2845 } elsif (ref $channel) {
2848 # send meta info to client, if not yet sent 2846 # send meta info to client, if not yet sent
2849 unless (exists $self->{channel}{$channel->{id}}) { 2847 unless (exists $self->{channel}{$channel->{id}}) {
2850 $self->{channel}{$channel->{id}} = $channel; 2848 $self->{channel}{$channel->{id}} = $channel;
2851 $self->ext_msg (channel_info => $channel) 2849 $self->ext_msg (channel_info => $channel);
2852 if $self->can_msg;
2853 } 2850 }
2854 2851
2855 $channel = $channel->{id}; 2852 $channel = $channel->{id};
2856 } 2853 }
2857 2854
2858 return unless @extra || length $msg; 2855 return unless @extra || length $msg;
2859 2856
2860 if ($self->can_msg) {
2861 # default colour, mask it out 2857 # default colour, mask it out
2862 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2858 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2863 if $color & cf::NDI_DEF; 2859 if $color & cf::NDI_DEF;
2864 2860
2865 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2861 my $pkt = "msg "
2862 . $self->{json_coder}->encode (
2866 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2867 } else { 2864 );
2868 if ($color >= 0) {
2869 # replace some tags by gcfclient-compatible ones
2870 for ($msg) {
2871 1 while
2872 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2873 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2874 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2875 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2876 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2877 }
2878 2865
2879 $color &= cf::NDI_COLOR_MASK; 2866 # try lzf for large packets
2867 $pkt = "lzf " . Compress::LZF::compress $pkt
2868 if 1024 <= length $pkt and $self->{can_lzf};
2880 2869
2881 utf8::encode $msg; 2870 # split very large packets
2882 2871 if (8192 < length $pkt and $self->{can_lzf}) {
2883 if (0 && $msg =~ /\[/) { 2872 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2884 # COMMAND/INFO 2873 $pkt = "frag";
2885 $self->send_packet ("drawextinfo $color 10 8 $msg")
2886 } else {
2887 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2888 $self->send_packet ("drawinfo $color $msg")
2889 }
2890 }
2891 } 2874 }
2875
2876 $self->send_packet ($pkt);
2892} 2877}
2893 2878
2894=item $client->ext_msg ($type, @msg) 2879=item $client->ext_msg ($type, @msg)
2895 2880
2896Sends an ext event to the client. 2881Sends an ext event to the client.
3070 3055
3071The following functions and methods are available within a safe environment: 3056The following functions and methods are available within a safe environment:
3072 3057
3073 cf::object 3058 cf::object
3074 contr pay_amount pay_player map x y force_find force_add destroy 3059 contr pay_amount pay_player map x y force_find force_add destroy
3075 insert remove name archname title slaying race decrease_ob_nr 3060 insert remove name archname title slaying race decrease split
3061 value
3076 3062
3077 cf::object::player 3063 cf::object::player
3078 player 3064 player
3079 3065
3080 cf::player 3066 cf::player
3085 3071
3086=cut 3072=cut
3087 3073
3088for ( 3074for (
3089 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3075 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3090 insert remove inv name archname title slaying race 3076 insert remove inv nrof name archname title slaying race
3091 decrease_ob_nr destroy)], 3077 decrease split destroy change_exp value msg lore send_msg)],
3092 ["cf::object::player" => qw(player)], 3078 ["cf::object::player" => qw(player)],
3093 ["cf::player" => qw(peaceful)], 3079 ["cf::player" => qw(peaceful send_msg)],
3094 ["cf::map" => qw(trigger)], 3080 ["cf::map" => qw(trigger)],
3095) { 3081) {
3096 no strict 'refs'; 3082 no strict 'refs';
3097 my ($pkg, @funs) = @$_; 3083 my ($pkg, @funs) = @$_;
3098 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3084 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3115 my ($code, %vars) = @_; 3101 my ($code, %vars) = @_;
3116 3102
3117 my $qcode = $code; 3103 my $qcode = $code;
3118 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3104 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3119 $qcode =~ s/\n/\\n/g; 3105 $qcode =~ s/\n/\\n/g;
3106
3107 %vars = (_dummy => 0) unless %vars;
3120 3108
3121 local $_; 3109 local $_;
3122 local @safe::cf::_safe_eval_args = values %vars; 3110 local @safe::cf::_safe_eval_args = values %vars;
3123 3111
3124 my $eval = 3112 my $eval =
3304 while (my ($k, $v) = each %$want) { 3292 while (my ($k, $v) = each %$want) {
3305 $ns->fx_want ($k, $v); 3293 $ns->fx_want ($k, $v);
3306 } 3294 }
3307}; 3295};
3308 3296
3297sub load_resource_file($) {
3298 my $guard = lock_acquire "load_resource_file";
3299
3300 my $status = load_resource_file_ $_[0];
3301 get_slot 0.1, 100;
3302 cf::arch::commit_load;
3303
3304 $status
3305}
3306
3309sub reload_regions { 3307sub reload_regions {
3310 # HACK to clear player env face cache, we need some signal framework 3308 # HACK to clear player env face cache, we need some signal framework
3311 # for this (global event?) 3309 # for this (global event?)
3312 %ext::player_env::MUSIC_FACE_CACHE = (); 3310 %ext::player_env::MUSIC_FACE_CACHE = ();
3313 3311
3326} 3324}
3327 3325
3328sub reload_archetypes { 3326sub reload_archetypes {
3329 load_resource_file "$DATADIR/archetypes" 3327 load_resource_file "$DATADIR/archetypes"
3330 or die "unable to load archetypes\n"; 3328 or die "unable to load archetypes\n";
3331 #d# NEED to laod twice to resolve forward references
3332 # this really needs to be done in an extra post-pass
3333 # (which needs to be synchronous, so solve it differently)
3334 load_resource_file "$DATADIR/archetypes"
3335 or die "unable to load archetypes\n";
3336} 3329}
3337 3330
3338sub reload_treasures { 3331sub reload_treasures {
3339 load_resource_file "$DATADIR/treasures" 3332 load_resource_file "$DATADIR/treasures"
3340 or die "unable to load treasurelists\n"; 3333 or die "unable to load treasurelists\n";
3341} 3334}
3342 3335
3343sub reload_resources { 3336sub reload_resources {
3344 warn "reloading resource files...\n"; 3337 warn "reloading resource files...\n";
3345 3338
3339 reload_facedata;
3340 reload_archetypes;
3346 reload_regions; 3341 reload_regions;
3347 reload_facedata;
3348 #reload_archetypes;#d#
3349 reload_archetypes;
3350 reload_treasures; 3342 reload_treasures;
3351 3343
3352 warn "finished reloading resource files\n"; 3344 warn "finished reloading resource files\n";
3353}
3354
3355sub init {
3356 reload_resources;
3357} 3345}
3358 3346
3359sub reload_config { 3347sub reload_config {
3360 open my $fh, "<:utf8", "$CONFDIR/config" 3348 open my $fh, "<:utf8", "$CONFDIR/config"
3361 or return; 3349 or return;
3375 }; 3363 };
3376 warn $@ if $@; 3364 warn $@ if $@;
3377 } 3365 }
3378} 3366}
3379 3367
3368sub pidfile() {
3369 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3370 or die "$PIDFILE: $!";
3371 flock $fh, &Fcntl::LOCK_EX
3372 or die "$PIDFILE: flock: $!";
3373 $fh
3374}
3375
3376# make sure only one server instance is running at any one time
3377sub atomic {
3378 my $fh = pidfile;
3379
3380 my $pid = <$fh>;
3381 kill 9, $pid if $pid > 0;
3382
3383 seek $fh, 0, 0;
3384 print $fh $$;
3385}
3386
3380sub main { 3387sub main {
3388 cf::init_globals; # initialise logging
3389
3390 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3391 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3392 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3393 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3394
3395 cf::init_experience;
3396 cf::init_anim;
3397 cf::init_attackmess;
3398 cf::init_dynamic;
3399
3400 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3401
3381 # we must not ever block the main coroutine 3402 # we must not ever block the main coroutine
3382 local $Coro::idle = sub { 3403 local $Coro::idle = sub {
3383 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3404 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3384 (async { 3405 (async {
3385 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3406 $Coro::current->{desc} = "IDLE BUG HANDLER";
3386 EV::loop EV::LOOP_ONESHOT; 3407 EV::loop EV::LOOP_ONESHOT;
3387 })->prio (Coro::PRIO_MAX); 3408 })->prio (Coro::PRIO_MAX);
3388 }; 3409 };
3389 3410
3390 reload_config;
3391 db_init;
3392 load_extensions;
3393
3394 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3395 evthread_start IO::AIO::poll_fileno; 3411 evthread_start IO::AIO::poll_fileno;
3412
3413 cf::sync_job {
3414 reload_resources;
3415 reload_config;
3416 db_init;
3417
3418 cf::load_settings;
3419 cf::load_materials;
3420 cf::init_uuid;
3421 cf::init_signals;
3422 cf::init_commands;
3423 cf::init_skills;
3424
3425 cf::init_beforeplay;
3426
3427 atomic;
3428
3429 load_extensions;
3430
3431 utime time, time, $RUNTIMEFILE;
3432
3433 # no (long-running) fork's whatsoever before this point(!)
3434 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3435
3436 (pop @POST_INIT)->(0) while @POST_INIT;
3437 };
3438
3396 EV::loop; 3439 EV::loop;
3397} 3440}
3398 3441
3399############################################################################# 3442#############################################################################
3400# initialisation and cleanup 3443# initialisation and cleanup
3408 }; 3451 };
3409 } 3452 }
3410} 3453}
3411 3454
3412sub write_runtime_sync { 3455sub write_runtime_sync {
3413 my $runtime = "$LOCALDIR/runtime";
3414
3415 # first touch the runtime file to show we are still running: 3456 # first touch the runtime file to show we are still running:
3416 # the fsync below can take a very very long time. 3457 # the fsync below can take a very very long time.
3417 3458
3418 IO::AIO::aio_utime $runtime, undef, undef; 3459 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3419 3460
3420 my $guard = cf::lock_acquire "write_runtime"; 3461 my $guard = cf::lock_acquire "write_runtime";
3421 3462
3422 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3463 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3423 or return; 3464 or return;
3424 3465
3425 my $value = $cf::RUNTIME + 90 + 10; 3466 my $value = $cf::RUNTIME + 90 + 10;
3426 # 10 is the runtime save interval, for a monotonic clock 3467 # 10 is the runtime save interval, for a monotonic clock
3427 # 60 allows for the watchdog to kill the server. 3468 # 60 allows for the watchdog to kill the server.
3437 aio_utime $fh, undef, undef; 3478 aio_utime $fh, undef, undef;
3438 3479
3439 close $fh 3480 close $fh
3440 or return; 3481 or return;
3441 3482
3442 aio_rename "$runtime~", $runtime 3483 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3443 and return; 3484 and return;
3444 3485
3445 warn "runtime file written.\n"; 3486 warn "runtime file written.\n";
3446 3487
3447 1 3488 1
3459 my $uuid = "$LOCALDIR/uuid"; 3500 my $uuid = "$LOCALDIR/uuid";
3460 3501
3461 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3502 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3462 or return; 3503 or return;
3463 3504
3464 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3505 my $value = uuid_seq uuid_cur;
3506
3507 unless ($value) {
3508 warn "cowardly refusing to write zero uuid value!\n";
3509 return;
3510 }
3511
3512 my $value = uuid_str $value + $uuid_skip;
3465 $uuid_skip = 0; 3513 $uuid_skip = 0;
3466 3514
3467 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3515 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3468 and return; 3516 and return;
3469 3517
3491} 3539}
3492 3540
3493sub emergency_save() { 3541sub emergency_save() {
3494 my $freeze_guard = cf::freeze_mainloop; 3542 my $freeze_guard = cf::freeze_mainloop;
3495 3543
3496 warn "enter emergency perl save\n"; 3544 warn "emergency_perl_save: enter\n";
3497 3545
3498 cf::sync_job { 3546 cf::sync_job {
3547 # this is a trade-off: we want to be very quick here, so
3548 # save all maps without fsync, and later call a global sync
3549 # (which in turn might be very very slow)
3550 local $USE_FSYNC = 0;
3551
3499 # use a peculiar iteration method to avoid tripping on perl 3552 # use a peculiar iteration method to avoid tripping on perl
3500 # refcount bugs in for. also avoids problems with players 3553 # refcount bugs in for. also avoids problems with players
3501 # and maps saved/destroyed asynchronously. 3554 # and maps saved/destroyed asynchronously.
3502 warn "begin emergency player save\n"; 3555 warn "emergency_perl_save: begin player save\n";
3503 for my $login (keys %cf::PLAYER) { 3556 for my $login (keys %cf::PLAYER) {
3504 my $pl = $cf::PLAYER{$login} or next; 3557 my $pl = $cf::PLAYER{$login} or next;
3505 $pl->valid or next; 3558 $pl->valid or next;
3506 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3559 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3507 $pl->save; 3560 $pl->save;
3508 } 3561 }
3509 warn "end emergency player save\n"; 3562 warn "emergency_perl_save: end player save\n";
3510 3563
3511 warn "begin emergency map save\n"; 3564 warn "emergency_perl_save: begin map save\n";
3512 for my $path (keys %cf::MAP) { 3565 for my $path (keys %cf::MAP) {
3513 my $map = $cf::MAP{$path} or next; 3566 my $map = $cf::MAP{$path} or next;
3514 $map->valid or next; 3567 $map->valid or next;
3515 $map->save; 3568 $map->save;
3516 } 3569 }
3517 warn "end emergency map save\n"; 3570 warn "emergency_perl_save: end map save\n";
3518 3571
3519 warn "begin emergency database checkpoint\n"; 3572 warn "emergency_perl_save: begin database checkpoint\n";
3520 BDB::db_env_txn_checkpoint $DB_ENV; 3573 BDB::db_env_txn_checkpoint $DB_ENV;
3521 warn "end emergency database checkpoint\n"; 3574 warn "emergency_perl_save: end database checkpoint\n";
3522 3575
3523 warn "begin write uuid\n"; 3576 warn "emergency_perl_save: begin write uuid\n";
3524 write_uuid_sync 1; 3577 write_uuid_sync 1;
3525 warn "end write uuid\n"; 3578 warn "emergency_perl_save: end write uuid\n";
3526 }; 3579 };
3527 3580
3581 warn "emergency_perl_save: starting sync()\n";
3582 IO::AIO::aio_sync sub {
3583 warn "emergency_perl_save: finished sync()\n";
3584 };
3585
3528 warn "leave emergency perl save\n"; 3586 warn "emergency_perl_save: leave\n";
3529} 3587}
3530 3588
3531sub post_cleanup { 3589sub post_cleanup {
3532 my ($make_core) = @_; 3590 my ($make_core) = @_;
3533 3591
3534 warn Carp::longmess "post_cleanup backtrace" 3592 warn Carp::longmess "post_cleanup backtrace"
3535 if $make_core; 3593 if $make_core;
3594
3595 my $fh = pidfile;
3596 unlink $PIDFILE if <$fh> == $$;
3597}
3598
3599# a safer delete_package, copied from Symbol
3600sub clear_package($) {
3601 my $pkg = shift;
3602
3603 # expand to full symbol table name if needed
3604 unless ($pkg =~ /^main::.*::$/) {
3605 $pkg = "main$pkg" if $pkg =~ /^::/;
3606 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3607 $pkg .= '::' unless $pkg =~ /::$/;
3608 }
3609
3610 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3611 my $stem_symtab = *{$stem}{HASH};
3612
3613 defined $stem_symtab and exists $stem_symtab->{$leaf}
3614 or return;
3615
3616 # clear all symbols
3617 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3618 for my $name (keys %$leaf_symtab) {
3619 _gv_clear *{"$pkg$name"};
3620# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3621 }
3622 warn "cleared package $pkg\n";#d#
3536} 3623}
3537 3624
3538sub do_reload_perl() { 3625sub do_reload_perl() {
3539 # can/must only be called in main 3626 # can/must only be called in main
3540 if ($Coro::current != $Coro::main) { 3627 if ($Coro::current != $Coro::main) {
3541 warn "can only reload from main coroutine"; 3628 warn "can only reload from main coroutine";
3542 return; 3629 return;
3543 } 3630 }
3544 3631
3632 return if $RELOAD++;
3633
3634 my $t1 = EV::time;
3635
3636 while ($RELOAD) {
3545 warn "reloading..."; 3637 warn "reloading...";
3546 3638
3547 warn "entering sync_job"; 3639 warn "entering sync_job";
3548 3640
3549 cf::sync_job { 3641 cf::sync_job {
3550 cf::write_runtime_sync; # external watchdog should not bark 3642 cf::write_runtime_sync; # external watchdog should not bark
3551 cf::emergency_save; 3643 cf::emergency_save;
3552 cf::write_runtime_sync; # external watchdog should not bark 3644 cf::write_runtime_sync; # external watchdog should not bark
3553 3645
3554 warn "syncing database to disk"; 3646 warn "syncing database to disk";
3555 BDB::db_env_txn_checkpoint $DB_ENV; 3647 BDB::db_env_txn_checkpoint $DB_ENV;
3556 3648
3557 # if anything goes wrong in here, we should simply crash as we already saved 3649 # if anything goes wrong in here, we should simply crash as we already saved
3558 3650
3559 warn "flushing outstanding aio requests"; 3651 warn "flushing outstanding aio requests";
3560 for (;;) {
3561 BDB::flush;
3562 IO::AIO::flush;
3563 Coro::cede_notself;
3564 last unless IO::AIO::nreqs || BDB::nreqs; 3652 while (IO::AIO::nreqs || BDB::nreqs) {
3565 warn "iterate..."; 3653 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3566 }
3567
3568 ++$RELOAD;
3569
3570 warn "cancelling all extension coros";
3571 $_->cancel for values %EXT_CORO;
3572 %EXT_CORO = ();
3573
3574 warn "removing commands";
3575 %COMMAND = ();
3576
3577 warn "removing ext/exti commands";
3578 %EXTCMD = ();
3579 %EXTICMD = ();
3580
3581 warn "unloading/nuking all extensions";
3582 for my $pkg (@EXTS) {
3583 warn "... unloading $pkg";
3584
3585 if (my $cb = $pkg->can ("unload")) {
3586 eval {
3587 $cb->($pkg);
3588 1
3589 } or warn "$pkg unloaded, but with errors: $@";
3590 } 3654 }
3591 3655
3592 warn "... nuking $pkg"; 3656 warn "cancelling all extension coros";
3593 Symbol::delete_package $pkg; 3657 $_->cancel for values %EXT_CORO;
3594 } 3658 %EXT_CORO = ();
3595 3659
3596 warn "unloading all perl modules loaded from $LIBDIR"; 3660 warn "removing commands";
3597 while (my ($k, $v) = each %INC) { 3661 %COMMAND = ();
3598 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3599 3662
3663 warn "removing ext/exti commands";
3664 %EXTCMD = ();
3665 %EXTICMD = ();
3666
3667 warn "unloading/nuking all extensions";
3668 for my $pkg (@EXTS) {
3600 warn "... unloading $k"; 3669 warn "... unloading $pkg";
3601 delete $INC{$k};
3602 3670
3603 $k =~ s/\.pm$//;
3604 $k =~ s/\//::/g;
3605
3606 if (my $cb = $k->can ("unload_module")) { 3671 if (my $cb = $pkg->can ("unload")) {
3672 eval {
3607 $cb->(); 3673 $cb->($pkg);
3674 1
3675 } or warn "$pkg unloaded, but with errors: $@";
3676 }
3677
3678 warn "... clearing $pkg";
3679 clear_package $pkg;
3608 } 3680 }
3609 3681
3610 Symbol::delete_package $k; 3682 warn "unloading all perl modules loaded from $LIBDIR";
3683 while (my ($k, $v) = each %INC) {
3684 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3685
3686 warn "... unloading $k";
3687 delete $INC{$k};
3688
3689 $k =~ s/\.pm$//;
3690 $k =~ s/\//::/g;
3691
3692 if (my $cb = $k->can ("unload_module")) {
3693 $cb->();
3694 }
3695
3696 clear_package $k;
3611 } 3697 }
3612 3698
3613 warn "getting rid of safe::, as good as possible"; 3699 warn "getting rid of safe::, as good as possible";
3614 Symbol::delete_package "safe::$_" 3700 clear_package "safe::$_"
3615 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3701 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3616 3702
3617 warn "unloading cf.pm \"a bit\""; 3703 warn "unloading cf.pm \"a bit\"";
3618 delete $INC{"cf.pm"}; 3704 delete $INC{"cf.pm"};
3619 delete $INC{"cf/pod.pm"}; 3705 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3620 3706
3621 # don't, removes xs symbols, too, 3707 # don't, removes xs symbols, too,
3622 # and global variables created in xs 3708 # and global variables created in xs
3623 #Symbol::delete_package __PACKAGE__; 3709 #clear_package __PACKAGE__;
3624 3710
3625 warn "unload completed, starting to reload now"; 3711 warn "unload completed, starting to reload now";
3626 3712
3627 warn "reloading cf.pm"; 3713 warn "reloading cf.pm";
3628 require cf; 3714 require cf;
3629 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3715 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3630 3716
3631 warn "loading config and database again"; 3717 warn "loading config and database again";
3632 cf::reload_config; 3718 cf::reload_config;
3633 3719
3634 warn "loading extensions"; 3720 warn "loading extensions";
3635 cf::load_extensions; 3721 cf::load_extensions;
3636 3722
3723 if ($REATTACH_ON_RELOAD) {
3637 warn "reattaching attachments to objects/players"; 3724 warn "reattaching attachments to objects/players";
3638 _global_reattach; # objects, sockets 3725 _global_reattach; # objects, sockets
3639 warn "reattaching attachments to maps"; 3726 warn "reattaching attachments to maps";
3640 reattach $_ for values %MAP; 3727 reattach $_ for values %MAP;
3641 warn "reattaching attachments to players"; 3728 warn "reattaching attachments to players";
3642 reattach $_ for values %PLAYER; 3729 reattach $_ for values %PLAYER;
3730 }
3643 3731
3732 warn "running post_init jobs";
3733 (pop @POST_INIT)->(1) while @POST_INIT;
3734
3644 warn "leaving sync_job"; 3735 warn "leaving sync_job";
3645 3736
3646 1 3737 1
3647 } or do { 3738 } or do {
3648 warn $@; 3739 warn $@;
3649 cf::cleanup "error while reloading, exiting."; 3740 cf::cleanup "error while reloading, exiting.";
3650 }; 3741 };
3651 3742
3652 warn "reloaded"; 3743 warn "reloaded";
3744 --$RELOAD;
3745 }
3746
3747 $t1 = EV::time - $t1;
3748 warn "reload completed in ${t1}s\n";
3653}; 3749};
3654 3750
3655our $RELOAD_WATCHER; # used only during reload 3751our $RELOAD_WATCHER; # used only during reload
3656 3752
3657sub reload_perl() { 3753sub reload_perl() {
3658 # doing reload synchronously and two reloads happen back-to-back, 3754 # doing reload synchronously and two reloads happen back-to-back,
3659 # coro crashes during coro_state_free->destroy here. 3755 # coro crashes during coro_state_free->destroy here.
3660 3756
3757 $RELOAD_WATCHER ||= cf::async {
3758 Coro::AIO::aio_wait cache_extensions;
3759
3661 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3760 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3662 do_reload_perl; 3761 do_reload_perl;
3663 undef $RELOAD_WATCHER; 3762 undef $RELOAD_WATCHER;
3763 };
3664 }; 3764 };
3665} 3765}
3666 3766
3667register_command "reload" => sub { 3767register_command "reload" => sub {
3668 my ($who, $arg) = @_; 3768 my ($who, $arg) = @_;
3682 3782
3683our @WAIT_FOR_TICK; 3783our @WAIT_FOR_TICK;
3684our @WAIT_FOR_TICK_BEGIN; 3784our @WAIT_FOR_TICK_BEGIN;
3685 3785
3686sub wait_for_tick { 3786sub wait_for_tick {
3687 return if tick_inhibit;
3688 return if $Coro::current == $Coro::main; 3787 return if tick_inhibit || $Coro::current == $Coro::main;
3689 3788
3690 my $signal = new Coro::Signal; 3789 my $signal = new Coro::Signal;
3691 push @WAIT_FOR_TICK, $signal; 3790 push @WAIT_FOR_TICK, $signal;
3692 $signal->wait; 3791 $signal->wait;
3693} 3792}
3694 3793
3695sub wait_for_tick_begin { 3794sub wait_for_tick_begin {
3696 return if tick_inhibit;
3697 return if $Coro::current == $Coro::main; 3795 return if tick_inhibit || $Coro::current == $Coro::main;
3698 3796
3699 my $signal = new Coro::Signal; 3797 my $signal = new Coro::Signal;
3700 push @WAIT_FOR_TICK_BEGIN, $signal; 3798 push @WAIT_FOR_TICK_BEGIN, $signal;
3701 $signal->wait; 3799 $signal->wait;
3702} 3800}
3741{ 3839{
3742 # configure BDB 3840 # configure BDB
3743 3841
3744 BDB::min_parallel 8; 3842 BDB::min_parallel 8;
3745 BDB::max_poll_reqs $TICK * 0.1; 3843 BDB::max_poll_reqs $TICK * 0.1;
3746 $Coro::BDB::WATCHER->priority (1); 3844 $AnyEvent::BDB::WATCHER->priority (1);
3747 3845
3748 unless ($DB_ENV) { 3846 unless ($DB_ENV) {
3749 $DB_ENV = BDB::db_env_create; 3847 $DB_ENV = BDB::db_env_create;
3750 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3848 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3751 | BDB::LOG_AUTOREMOVE, 1); 3849 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3850 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3752 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3851 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3753 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3852 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3754 3853
3755 cf::sync_job { 3854 cf::sync_job {
3756 eval { 3855 eval {
3782{ 3881{
3783 # configure IO::AIO 3882 # configure IO::AIO
3784 3883
3785 IO::AIO::min_parallel 8; 3884 IO::AIO::min_parallel 8;
3786 IO::AIO::max_poll_time $TICK * 0.1; 3885 IO::AIO::max_poll_time $TICK * 0.1;
3787 $Coro::AIO::WATCHER->priority (1); 3886 undef $AnyEvent::AIO::WATCHER;
3788} 3887}
3789 3888
3790my $_log_backtrace; 3889my $_log_backtrace;
3791 3890
3792sub _log_backtrace { 3891sub _log_backtrace {
3795 $msg =~ s/\n//; 3894 $msg =~ s/\n//;
3796 3895
3797 # limit the # of concurrent backtraces 3896 # limit the # of concurrent backtraces
3798 if ($_log_backtrace < 2) { 3897 if ($_log_backtrace < 2) {
3799 ++$_log_backtrace; 3898 ++$_log_backtrace;
3899 my $perl_bt = Carp::longmess $msg;
3800 async { 3900 async {
3801 $Coro::current->{desc} = "abt $msg"; 3901 $Coro::current->{desc} = "abt $msg";
3802 3902
3803 my @bt = fork_call { 3903 my @bt = fork_call {
3804 @addr = map { sprintf "%x", $_ } @addr; 3904 @addr = map { sprintf "%x", $_ } @addr;
3815 } 3915 }
3816 3916
3817 @funcs 3917 @funcs
3818 }; 3918 };
3819 3919
3820 LOG llevInfo, "[ABT] $msg\n"; 3920 LOG llevInfo, "[ABT] $perl_bt\n";
3921 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3821 LOG llevInfo, "[ABT] $_\n" for @bt; 3922 LOG llevInfo, "[ABT] $_\n" for @bt;
3822 --$_log_backtrace; 3923 --$_log_backtrace;
3823 }; 3924 };
3824 } else { 3925 } else {
3825 LOG llevInfo, "[ABT] $msg\n"; 3926 LOG llevInfo, "[ABT] $msg\n";
3826 LOG llevInfo, "[ABT] [suppressed]\n"; 3927 LOG llevInfo, "[ABT] [suppressed]\n";
3827 } 3928 }
3828} 3929}
3829 3930
3830# load additional modules 3931# load additional modules
3831use cf::pod; 3932require "cf/$_.pm" for @EXTRA_MODULES;
3832 3933
3833END { cf::emergency_save } 3934END { cf::emergency_save }
3834 3935
38351 39361
3836 3937

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines