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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines