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.421 by root, Tue Apr 15 18:43:11 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($;$$) {
432 return if tick_inhibit; 440 return if tick_inhibit || $Coro::current == $Coro::main;
433 441
434 my ($time, $pri, $name) = @_; 442 my ($time, $pri, $name) = @_;
435 443
436 $time = $TICK * .6 if $time > $TICK * .6; 444 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 445 my $sig = new Coro::Signal;
724 732
725############################################################################# 733#############################################################################
726 734
727=head2 ATTACHABLE OBJECTS 735=head2 ATTACHABLE OBJECTS
728 736
729Many 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
730attach callbacks/event handlers (a collection of which is called an "attachment") 738attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 739to it. All such attachable objects support the following methods.
732 740
733In 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>
734C<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
784=item cf::CLASS::attachment $name, ... 792=item cf::CLASS::attachment $name, ...
785 793
786Register an attachment by C<$name> through which attachable objects of the 794Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 795given CLASS can refer to this attachment.
788 796
789Some classes such as crossfire maps and objects can specify attachments 797Some classes such as deliantra maps and objects can specify attachments
790that 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.
791 799
792These calls expect any number of the following handler/hook descriptions: 800These calls expect any number of the following handler/hook descriptions:
793 801
794=over 4 802=over 4
1085 1093
1086sub reattach { 1094sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1095 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1096 my ($obj) = @_;
1089 1097
1098 # no longer needed after getting rid of delete_package?
1090 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
1091 1100
1092 my $registry = $obj->registry; 1101 my $registry = $obj->registry;
1093 1102
1094 @$registry = (); 1103 @$registry = ();
1095 1104
1141 utf8::decode (my $decname = $filename); 1150 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1151 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1152 $decname, length $$rdata, scalar @$objs;
1144 1153
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1154 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1155 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1156 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 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 }
1149 close $fh; 1161 aio_close $fh;
1150 1162
1151 if (@$objs) { 1163 if (@$objs) {
1152 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) {
1153 chmod SAVE_MODE, $fh; 1165 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1166 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1167 aio_write $fh, 0, (length $data), $data, 0;
1156 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 }
1157 close $fh; 1172 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1173 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1174 }
1160 } else { 1175 } else {
1161 aio_unlink "$filename.pst"; 1176 aio_unlink "$filename.pst";
1162 } 1177 }
1163 1178
1164 aio_rename "$filename~", $filename; 1179 aio_rename "$filename~", $filename;
1180
1181 $filename =~ s%/[^/]+$%%;
1182 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1183 } else {
1166 warn "FATAL: $filename~: $!\n"; 1184 warn "unable to save objects: $filename~: $!\n";
1167 } 1185 }
1168 } else { 1186 } else {
1169 aio_unlink $filename; 1187 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1188 aio_unlink "$filename.pst";
1171 } 1189 }
1262 my ($name, $cb) = @_; 1280 my ($name, $cb) = @_;
1263 1281
1264 $EXTICMD{$name} = $cb; 1282 $EXTICMD{$name} = $cb;
1265} 1283}
1266 1284
1285use File::Glob ();
1286
1267cf::player->attach ( 1287cf::player->attach (
1268 on_command => sub { 1288 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1289 my ($pl, $name, $params) = @_;
1270 1290
1271 my $cb = $COMMAND{$name} 1291 my $cb = $COMMAND{$name}
1303 1323
1304 cf::override; 1324 cf::override;
1305 }, 1325 },
1306); 1326);
1307 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
1308sub load_extensions { 1341sub load_extensions {
1309 cf::sync_job { 1342 cf::sync_job {
1310 my %todo; 1343 my %todo;
1311 1344
1312 for my $path (<$LIBDIR/*.ext>) { 1345 for my $path (<$LIBDIR/*.ext>) {
1331 1364
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1365 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1366 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1367
1335 $ext{source} = 1368 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1369 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1370 . "#line 1 \"$path\"\n{\n"
1338 . $source 1371 . $source
1339 . "\n};\n1"; 1372 . "\n};\n1";
1340 1373
1341 $todo{$base} = \%ext; 1374 $todo{$base} = \%ext;
1381 1414
1382=back 1415=back
1383 1416
1384=head2 CORE EXTENSIONS 1417=head2 CORE EXTENSIONS
1385 1418
1386Functions and methods that extend core crossfire objects. 1419Functions and methods that extend core deliantra objects.
1387 1420
1388=cut 1421=cut
1389 1422
1390package cf::player; 1423package cf::player;
1391 1424
1434 1467
1435sub exists($) { 1468sub exists($) {
1436 my ($login) = @_; 1469 my ($login) = @_;
1437 1470
1438 $cf::PLAYER{$login} 1471 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1472 or !aio_stat path $login
1440} 1473}
1441 1474
1442sub find($) { 1475sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1476 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1477 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1489 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1490 or return;
1458 1491
1459 my $pl = cf::player::load_pl $f 1492 my $pl = cf::player::load_pl $f
1460 or return; 1493 or return;
1494
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1495 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1496 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1497 $cf::PLAYER{$login} = $pl
1464 } 1498 }
1465 } 1499 }
1518 my ($pl) = @_; 1552 my ($pl) = @_;
1519 1553
1520 my $name = $pl->ob->name; 1554 my $name = $pl->ob->name;
1521 1555
1522 $pl->{deny_save} = 1; 1556 $pl->{deny_save} = 1;
1523 $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
1524 1558
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1559 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1560 $pl->deactivate;
1561 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1562 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1563 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1564 $pl->ns->destroy if $pl->ns;
1529 1565
1530 my $path = playerdir $pl; 1566 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1567 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1606
1571 for my $login (@$dirs) { 1607 for my $login (@$dirs) {
1572 my $path = path $login; 1608 my $path = path $login;
1573 1609
1574 # a .pst is a dead give-away for a valid player 1610 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1611 # if no pst file found, open and chekc for blocked users
1612 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1613 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1614 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1615 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1616 }
1580 1617
1611 } 1648 }
1612 1649
1613 \@paths 1650 \@paths
1614} 1651}
1615 1652
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1653=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1654
1618Expand crossfire pod fragments into protocol xml. 1655Expand deliantra pod fragments into protocol xml.
1619
1620=cut
1621
1622use re 'eval';
1623
1624my $group;
1625my $interior; $interior = qr{
1626 # match a pod interior sequence sans C<< >>
1627 (?:
1628 \ (.*?)\ (?{ $group = $^N })
1629 | < (??{$interior}) >
1630 )
1631}x;
1632
1633sub expand_cfpod {
1634 my ($self, $pod) = @_;
1635
1636 my $xml;
1637
1638 while () {
1639 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1640 $group = $1;
1641
1642 $group =~ s/&/&amp;/g;
1643 $group =~ s/</&lt;/g;
1644
1645 $xml .= $group;
1646 } elsif ($pod =~ m%\G
1647 ([BCGHITU])
1648 <
1649 (?:
1650 ([^<>]*) (?{ $group = $^N })
1651 | < $interior >
1652 )
1653 >
1654 %gcsx
1655 ) {
1656 my ($code, $data) = ($1, $group);
1657
1658 if ($code eq "B") {
1659 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1660 } elsif ($code eq "I") {
1661 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1662 } elsif ($code eq "U") {
1663 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1664 } elsif ($code eq "C") {
1665 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1666 } elsif ($code eq "T") {
1667 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1668 } elsif ($code eq "G") {
1669 my ($male, $female) = split /\|/, $data;
1670 $data = $self->gender ? $female : $male;
1671 $xml .= expand_cfpod ($self, $data);
1672 } elsif ($code eq "H") {
1673 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1674 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1675 "")
1676 [$self->{hintmode}];
1677 } else {
1678 $xml .= "error processing '$code($data)' directive";
1679 }
1680 } else {
1681 if ($pod =~ /\G(.+)/) {
1682 warn "parse error while expanding $pod (at $1)";
1683 }
1684 last;
1685 }
1686 }
1687
1688 for ($xml) {
1689 # create single paragraphs (very hackish)
1690 s/(?<=\S)\n(?=\w)/ /g;
1691
1692 # compress some whitespace
1693 s/\s+\n/\n/g; # ws line-ends
1694 s/\n\n+/\n/g; # double lines
1695 s/^\n+//; # beginning lines
1696 s/\n+$//; # ending lines
1697 }
1698
1699 $xml
1700}
1701
1702no re 'eval';
1703
1704sub hintmode {
1705 $_[0]{hintmode} = $_[1] if @_ > 1;
1706 $_[0]{hintmode}
1707}
1708 1656
1709=item $player->ext_reply ($msgid, @msg) 1657=item $player->ext_reply ($msgid, @msg)
1710 1658
1711Sends an ext reply to the player. 1659Sends an ext reply to the player.
1712 1660
1925 1873
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1874 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1875 "$UNIQUEDIR/$path"
1928} 1876}
1929 1877
1930# and all this just because we cannot iterate over
1931# all maps in C++...
1932sub change_all_map_light {
1933 my ($change) = @_;
1934
1935 $_->change_map_light ($change)
1936 for grep $_->outdoor, values %cf::MAP;
1937}
1938
1939sub decay_objects { 1878sub decay_objects {
1940 my ($self) = @_; 1879 my ($self) = @_;
1941 1880
1942 return if $self->{deny_reset}; 1881 return if $self->{deny_reset};
1943 1882
2025sub find { 1964sub find {
2026 my ($path, $origin) = @_; 1965 my ($path, $origin) = @_;
2027 1966
2028 $path = normalise $path, $origin && $origin->path; 1967 $path = normalise $path, $origin && $origin->path;
2029 1968
2030 cf::lock_wait "map_data:$path";#d#remove 1969 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1970 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1971
2033 $cf::MAP{$path} || do { 1972 $cf::MAP{$path} || do {
2034 my $guard1 = cf::lock_acquire "map_find:$path";
2035 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2036
2037 my $map = new_from_path cf::map $path 1973 my $map = new_from_path cf::map $path
2038 or return; 1974 or return;
2039 1975
2040 $map->{last_save} = $cf::RUNTIME; 1976 $map->{last_save} = $cf::RUNTIME;
2041 1977
2043 or return; 1979 or return;
2044 1980
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1981 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1982 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1983 #$cf::WAIT_FOR_TICK->wait;
1984 undef $guard2;
2048 undef $guard1; 1985 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 1986 $map->reset;
2051 return find $path; 1987 return find $path;
2052 } 1988 }
2053 1989
2054 $cf::MAP{$path} = $map 1990 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2017 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2018 $f->skip_block;
2083 $self->_load_objects ($f) 2019 $self->_load_objects ($f)
2084 or return; 2020 or return;
2085 2021
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2022 $self->post_load_original
2087 if delete $self->{load_original}; 2023 if delete $self->{load_original};
2088 2024
2089 if (my $uniq = $self->uniq_path) { 2025 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2026 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2027 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2045 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2046 $self->decay_objects;
2111 $self->fix_auto_apply; 2047 $self->fix_auto_apply;
2112 $self->update_buttons; 2048 $self->update_buttons;
2113 cf::cede_to_tick; 2049 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2050 $self->activate;
2117 } 2051 }
2118 2052
2119 $self->{last_save} = $cf::RUNTIME; 2053 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2054 $self->last_access ($cf::RUNTIME);
2286 2220
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2221 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2222
2289 return if $self->players; 2223 return if $self->players;
2290 2224
2291 warn "resetting map ", $self->path; 2225 warn "resetting map ", $self->path, "\n";
2292 2226
2293 $self->in_memory (cf::MAP_SWAPPED); 2227 $self->in_memory (cf::MAP_SWAPPED);
2294 2228
2295 # need to save uniques path 2229 # need to save uniques path
2296 unless ($self->{deny_save}) { 2230 unless ($self->{deny_save}) {
2457can 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
2458dialogue with the given NPC character. 2392dialogue with the given NPC character.
2459 2393
2460=cut 2394=cut
2461 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
2462# rough implementation of a future "reply" method that works 2410# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2411# with dialog boxes.
2464#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
2465sub cf::object::player::reply($$$;$) { 2413sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2414 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2425 my $dialog = $pl->{npc_dialog};
2478 $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));
2479 2427
2480 } else { 2428 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2429 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2430 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2431 }
2484 } 2432 }
2485} 2433}
2486 2434
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2435=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2460
2513=item $player_object->enter_link 2461=item $player_object->enter_link
2514 2462
2515Freezes 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}>).
2516 2464
2517The 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.
2518I<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.
2519 2469
2520Will never block. 2470Will never block.
2521 2471
2522=item $player_object->leave_link ($map, $x, $y) 2472=item $player_object->leave_link ($map, $x, $y)
2523 2473
2581 2531
2582 $map->load; 2532 $map->load;
2583 $map->load_neighbours; 2533 $map->load_neighbours;
2584 2534
2585 return unless $self->contr->active; 2535 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2536
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2537 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $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;
2590} 2542}
2591 2543
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2544=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593 2545
2594Moves 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
2595her, loading and preparing them map, calling the provided $check callback 2547her, loading and preparing them map, calling the provided $check callback
2596that 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
2597the 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
2598be 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 >>.
2599 2554
2600=cut 2555=cut
2601 2556
2602our $GOTOGEN; 2557our $GOTOGEN;
2603 2558
2682} 2637}
2683 2638
2684sub prepare_random_map { 2639sub prepare_random_map {
2685 my ($exit) = @_; 2640 my ($exit) = @_;
2686 2641
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2642 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2643 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2644 # that depends on the exit object
2692 2645
2693 my $rmp = parse_random_map_params $exit->msg; 2646 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2648 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2649 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2650 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2651 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2652 $rmp->{origin_y} = $exit->y;
2653
2654 $exit->map->touch;
2700 } 2655 }
2701 2656
2702 $rmp->{random_seed} ||= $exit->random_seed; 2657 $rmp->{random_seed} ||= $exit->random_seed;
2703 2658
2704 my $data = JSON::XS->new->utf8->pretty->canolicalize->encode ($rmp); 2659 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2660 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2661 my $meta = "$RANDOMDIR/$md5.meta";
2707 2662
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2663 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2664 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2665 undef $fh;
2711 aio_rename "$meta~", $meta; 2666 aio_rename "$meta~", $meta;
2712 2667
2668 my $slaying = "?random/$md5";
2669
2670 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2671 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2672 $exit->msg (undef);
2673 }
2715 } 2674 }
2716} 2675}
2717 2676
2718sub cf::object::player::enter_exit { 2677sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2678 my ($self, $exit) = @_;
2720 2679
2721 return unless $self->type == cf::PLAYER; 2680 return unless $self->type == cf::PLAYER;
2722 2681
2723 if ($exit->slaying eq "/!") {
2724 #TODO: this should de-fi-ni-te-ly not be a sync-job
2725 # the problem is that $exit might not survive long enough
2726 # so it needs to be done right now, right here
2727 cf::sync_job { prepare_random_map $exit };
2728 }
2729
2730 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2731 my $hp = $exit->stats->hp;
2732 my $sp = $exit->stats->sp;
2733
2734 $self->enter_link; 2682 $self->enter_link;
2735 2683
2736 # if exit is damned, update players death & WoR home-position
2737 $self->contr->savebed ($slaying, $hp, $sp)
2738 if $exit->flag (FLAG_DAMNED);
2739
2740 (async { 2684 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2685 $Coro::current->{desc} = "enter_exit";
2742 2686
2743 $self->deactivate_recursive; # just to be sure
2744 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
2745 $self->goto ($slaying, $hp, $sp); 2702 $self->goto ($map, $x, $y);
2746 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
2747 1; 2708 1
2748 }) { 2709 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2710 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "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. "
2751 . "Please report this to the dungeon master!", 2712 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2713 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2714
2754 warn "ERROR in enter_exit: $@"; 2715 warn "ERROR in enter_exit: $@";
2820 id => "infobox", 2781 id => "infobox",
2821 title => "Body Parts", 2782 title => "Body Parts",
2822 reply => undef, 2783 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2784 tooltip => "Shows which body parts you posess and are available",
2824 }, 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 },
2825 "c/uptime" => { 2822 "c/uptime" => {
2826 id => "infobox", 2823 id => "infobox",
2827 title => "Uptime", 2824 title => "Uptime",
2828 reply => undef, 2825 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2826 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2829 id => "infobox",
2833 title => "Map Info", 2830 title => "Map Info",
2834 reply => undef, 2831 reply => undef,
2835 tooltip => "Information related to the maps", 2832 tooltip => "Information related to the maps",
2836 }, 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,
2837); 2848);
2838 2849
2839sub cf::client::send_msg { 2850sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2851 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2852
2842 $msg = $self->pl->expand_cfpod ($msg); 2853 $msg = $self->pl->expand_cfpod ($msg)
2854 unless $color & cf::NDI_VERBATIM;
2843 2855
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2856 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2857
2846 # check predefined channels, for the benefit of C 2858 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2859 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2860 $channel = $CHANNEL{$channel};
2849 2861
2850 $self->ext_msg (channel_info => $channel) 2862 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2863 $channel = $channel->{id};
2854 2864
2855 } elsif (ref $channel) { 2865 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2866 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2867 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2868 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2869 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2870 }
2862 2871
2863 $channel = $channel->{id}; 2872 $channel = $channel->{id};
2864 } 2873 }
2865 2874
2866 return unless @extra || length $msg; 2875 return unless @extra || length $msg;
2867 2876
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2877 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2878 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2879 if $color & cf::NDI_DEF;
2872 2880
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2881 my $pkt = "msg "
2882 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2883 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2884 );
2876 if ($color >= 0) {
2877 # replace some tags by gcfclient-compatible ones
2878 for ($msg) {
2879 1 while
2880 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2881 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2882 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2883 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2884 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2885 }
2886 2885
2887 $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};
2888 2889
2889 utf8::encode $msg; 2890 # split very large packets
2890 2891 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2892 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2893 $pkt = "frag";
2893 $self->send_packet ("drawextinfo $color 10 8 $msg")
2894 } else {
2895 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2896 $self->send_packet ("drawinfo $color $msg")
2897 }
2898 }
2899 } 2894 }
2895
2896 $self->send_packet ($pkt);
2900} 2897}
2901 2898
2902=item $client->ext_msg ($type, @msg) 2899=item $client->ext_msg ($type, @msg)
2903 2900
2904Sends an ext event to the client. 2901Sends an ext event to the client.
3078 3075
3079The following functions and methods are available within a safe environment: 3076The following functions and methods are available within a safe environment:
3080 3077
3081 cf::object 3078 cf::object
3082 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
3083 insert remove name archname title slaying race decrease_ob_nr 3080 insert remove name archname title slaying race decrease split
3081 value
3084 3082
3085 cf::object::player 3083 cf::object::player
3086 player 3084 player
3087 3085
3088 cf::player 3086 cf::player
3093 3091
3094=cut 3092=cut
3095 3093
3096for ( 3094for (
3097 ["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
3098 insert remove inv name archname title slaying race 3096 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3097 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3098 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3099 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3100 ["cf::map" => qw(trigger)],
3103) { 3101) {
3104 no strict 'refs'; 3102 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3103 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3104 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 my ($code, %vars) = @_; 3121 my ($code, %vars) = @_;
3124 3122
3125 my $qcode = $code; 3123 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3124 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3125 $qcode =~ s/\n/\\n/g;
3126
3127 %vars = (_dummy => 0) unless %vars;
3128 3128
3129 local $_; 3129 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars; 3130 local @safe::cf::_safe_eval_args = values %vars;
3131 3131
3132 my $eval = 3132 my $eval =
3312 while (my ($k, $v) = each %$want) { 3312 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3313 $ns->fx_want ($k, $v);
3314 } 3314 }
3315}; 3315};
3316 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
3317sub reload_regions { 3327sub reload_regions {
3318 # 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
3319 # for this (global event?) 3329 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3330 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3331
3334} 3344}
3335 3345
3336sub reload_archetypes { 3346sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3347 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3348 or die "unable to load archetypes\n";
3339 #d# NEED to laod twice to resolve forward references
3340 # this really needs to be done in an extra post-pass
3341 # (which needs to be synchronous, so solve it differently)
3342 load_resource_file "$DATADIR/archetypes"
3343 or die "unable to load archetypes\n";
3344} 3349}
3345 3350
3346sub reload_treasures { 3351sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3352 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3353 or die "unable to load treasurelists\n";
3349} 3354}
3350 3355
3351sub reload_resources { 3356sub reload_resources {
3352 warn "reloading resource files...\n"; 3357 warn "reloading resource files...\n";
3353 3358
3359 reload_facedata;
3360 reload_archetypes;
3354 reload_regions; 3361 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3362 reload_treasures;
3359 3363
3360 warn "finished reloading resource files\n"; 3364 warn "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3365}
3366 3366
3367sub reload_config { 3367sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3368 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3369 or return;
3383 }; 3383 };
3384 warn $@ if $@; 3384 warn $@ if $@;
3385 } 3385 }
3386} 3386}
3387 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
3388sub 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
3389 # we must not ever block the main coroutine 3431 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3432 local $Coro::idle = sub {
3391 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#
3392 (async { 3434 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3435 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3436 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3437 })->prio (Coro::PRIO_MAX);
3396 }; 3438 };
3397 3439
3398 reload_config;
3399 db_init;
3400 load_extensions;
3401
3402 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3403 evthread_start IO::AIO::poll_fileno; 3440 evthread_start IO::AIO::poll_fileno;
3404 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;
3405} 3470}
3406 3471
3407############################################################################# 3472#############################################################################
3408# initialisation and cleanup 3473# initialisation and cleanup
3409 3474
3416 }; 3481 };
3417 } 3482 }
3418} 3483}
3419 3484
3420sub write_runtime_sync { 3485sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3486 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3487 # the fsync below can take a very very long time.
3425 3488
3426 IO::AIO::aio_utime $runtime, undef, undef; 3489 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3490
3428 my $guard = cf::lock_acquire "write_runtime"; 3491 my $guard = cf::lock_acquire "write_runtime";
3429 3492
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3493 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3494 or return;
3432 3495
3433 my $value = $cf::RUNTIME + 90 + 10; 3496 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3497 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3498 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3508 aio_utime $fh, undef, undef;
3446 3509
3447 close $fh 3510 close $fh
3448 or return; 3511 or return;
3449 3512
3450 aio_rename "$runtime~", $runtime 3513 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3514 and return;
3452 3515
3453 warn "runtime file written.\n"; 3516 warn "runtime file written.\n";
3454 3517
3455 1 3518 1
3467 my $uuid = "$LOCALDIR/uuid"; 3530 my $uuid = "$LOCALDIR/uuid";
3468 3531
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3532 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3533 or return;
3471 3534
3472 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;
3473 $uuid_skip = 0; 3543 $uuid_skip = 0;
3474 3544
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3545 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3546 and return;
3477 3547
3499} 3569}
3500 3570
3501sub emergency_save() { 3571sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3572 my $freeze_guard = cf::freeze_mainloop;
3503 3573
3504 warn "enter emergency perl save\n"; 3574 warn "emergency_perl_save: enter\n";
3505 3575
3506 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
3507 # use a peculiar iteration method to avoid tripping on perl 3582 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3583 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3584 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3585 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3586 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3587 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3588 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3589 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3590 $pl->save;
3516 } 3591 }
3517 warn "end emergency player save\n"; 3592 warn "emergency_perl_save: end player save\n";
3518 3593
3519 warn "begin emergency map save\n"; 3594 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3595 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3596 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3597 $map->valid or next;
3523 $map->save; 3598 $map->save;
3524 } 3599 }
3525 warn "end emergency map save\n"; 3600 warn "emergency_perl_save: end map save\n";
3526 3601
3527 warn "begin emergency database checkpoint\n"; 3602 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3603 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3604 warn "emergency_perl_save: end database checkpoint\n";
3530 3605
3531 warn "begin write uuid\n"; 3606 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3607 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3608 warn "emergency_perl_save: end write uuid\n";
3534 }; 3609 };
3535 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
3536 warn "leave emergency perl save\n"; 3616 warn "emergency_perl_save: leave\n";
3537} 3617}
3538 3618
3539sub post_cleanup { 3619sub post_cleanup {
3540 my ($make_core) = @_; 3620 my ($make_core) = @_;
3541 3621
3542 warn Carp::longmess "post_cleanup backtrace" 3622 warn Carp::longmess "post_cleanup backtrace"
3543 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#
3544} 3653}
3545 3654
3546sub do_reload_perl() { 3655sub do_reload_perl() {
3547 # can/must only be called in main 3656 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3657 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3658 warn "can only reload from main coroutine";
3550 return; 3659 return;
3551 } 3660 }
3552 3661
3662 return if $RELOAD++;
3663
3664 my $t1 = EV::time;
3665
3666 while ($RELOAD) {
3553 warn "reloading..."; 3667 warn "reloading...";
3554 3668
3555 warn "entering sync_job"; 3669 warn "entering sync_job";
3556 3670
3557 cf::sync_job { 3671 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3672 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3673 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3674 cf::write_runtime_sync; # external watchdog should not bark
3561 3675
3562 warn "syncing database to disk"; 3676 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3677 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3678
3565 # 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
3566 3680
3567 warn "flushing outstanding aio requests"; 3681 warn "flushing outstanding aio requests";
3568 for (;;) {
3569 BDB::flush;
3570 IO::AIO::flush;
3571 Coro::cede_notself;
3572 last unless IO::AIO::nreqs || BDB::nreqs; 3682 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3683 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3574 }
3575
3576 ++$RELOAD;
3577
3578 warn "cancelling all extension coros";
3579 $_->cancel for values %EXT_CORO;
3580 %EXT_CORO = ();
3581
3582 warn "removing commands";
3583 %COMMAND = ();
3584
3585 warn "removing ext/exti commands";
3586 %EXTCMD = ();
3587 %EXTICMD = ();
3588
3589 warn "unloading/nuking all extensions";
3590 for my $pkg (@EXTS) {
3591 warn "... unloading $pkg";
3592
3593 if (my $cb = $pkg->can ("unload")) {
3594 eval {
3595 $cb->($pkg);
3596 1
3597 } or warn "$pkg unloaded, but with errors: $@";
3598 } 3684 }
3599 3685
3600 warn "... nuking $pkg"; 3686 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3687 $_->cancel for values %EXT_CORO;
3602 } 3688 %EXT_CORO = ();
3603 3689
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3690 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3691 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3692
3693 warn "removing ext/exti commands";
3694 %EXTCMD = ();
3695 %EXTICMD = ();
3696
3697 warn "unloading/nuking all extensions";
3698 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3699 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3700
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3701 if (my $cb = $pkg->can ("unload")) {
3702 eval {
3615 $cb->(); 3703 $cb->($pkg);
3704 1
3705 } or warn "$pkg unloaded, but with errors: $@";
3706 }
3707
3708 warn "... clearing $pkg";
3709 clear_package $pkg;
3616 } 3710 }
3617 3711
3618 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;
3619 } 3727 }
3620 3728
3621 warn "getting rid of safe::, as good as possible"; 3729 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3730 clear_package "safe::$_"
3623 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);
3624 3732
3625 warn "unloading cf.pm \"a bit\""; 3733 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3734 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3735 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3736
3629 # don't, removes xs symbols, too, 3737 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3738 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3739 #clear_package __PACKAGE__;
3632 3740
3633 warn "unload completed, starting to reload now"; 3741 warn "unload completed, starting to reload now";
3634 3742
3635 warn "reloading cf.pm"; 3743 warn "reloading cf.pm";
3636 require cf; 3744 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3745 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3746
3639 warn "loading config and database again"; 3747 warn "loading config and database again";
3640 cf::reload_config; 3748 cf::reload_config;
3641 3749
3642 warn "loading extensions"; 3750 warn "loading extensions";
3643 cf::load_extensions; 3751 cf::load_extensions;
3644 3752
3753 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3754 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3755 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3756 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3757 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3758 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3759 reattach $_ for values %PLAYER;
3760 }
3651 3761
3762 warn "running post_init jobs";
3763 (pop @POST_INIT)->(1) while @POST_INIT;
3764
3652 warn "leaving sync_job"; 3765 warn "leaving sync_job";
3653 3766
3654 1 3767 1
3655 } or do { 3768 } or do {
3656 warn $@; 3769 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3770 cf::cleanup "error while reloading, exiting.";
3658 }; 3771 };
3659 3772
3660 warn "reloaded"; 3773 warn "reloaded";
3774 --$RELOAD;
3775 }
3776
3777 $t1 = EV::time - $t1;
3778 warn "reload completed in ${t1}s\n";
3661}; 3779};
3662 3780
3663our $RELOAD_WATCHER; # used only during reload 3781our $RELOAD_WATCHER; # used only during reload
3664 3782
3665sub reload_perl() { 3783sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3784 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3785 # coro crashes during coro_state_free->destroy here.
3668 3786
3787 $RELOAD_WATCHER ||= cf::async {
3788 Coro::AIO::aio_wait cache_extensions;
3789
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3790 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3791 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3792 undef $RELOAD_WATCHER;
3793 };
3672 }; 3794 };
3673} 3795}
3674 3796
3675register_command "reload" => sub { 3797register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3798 my ($who, $arg) = @_;
3690 3812
3691our @WAIT_FOR_TICK; 3813our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3814our @WAIT_FOR_TICK_BEGIN;
3693 3815
3694sub wait_for_tick { 3816sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3817 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3818
3698 my $signal = new Coro::Signal; 3819 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3820 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3821 $signal->wait;
3701} 3822}
3702 3823
3703sub wait_for_tick_begin { 3824sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3825 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3826
3707 my $signal = new Coro::Signal; 3827 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3828 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3829 $signal->wait;
3710} 3830}
3749{ 3869{
3750 # configure BDB 3870 # configure BDB
3751 3871
3752 BDB::min_parallel 8; 3872 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3873 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3874 $AnyEvent::BDB::WATCHER->priority (1);
3755 3875
3756 unless ($DB_ENV) { 3876 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3877 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3878 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | 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;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3881 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3882 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3883
3763 cf::sync_job { 3884 cf::sync_job {
3764 eval { 3885 eval {
3790{ 3911{
3791 # configure IO::AIO 3912 # configure IO::AIO
3792 3913
3793 IO::AIO::min_parallel 8; 3914 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3915 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3916 undef $AnyEvent::AIO::WATCHER;
3796} 3917}
3797 3918
3798my $_log_backtrace; 3919my $_log_backtrace;
3799 3920
3800sub _log_backtrace { 3921sub _log_backtrace {
3803 $msg =~ s/\n//; 3924 $msg =~ s/\n//;
3804 3925
3805 # limit the # of concurrent backtraces 3926 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3927 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3928 ++$_log_backtrace;
3929 my $perl_bt = Carp::longmess $msg;
3808 async { 3930 async {
3809 $Coro::current->{desc} = "abt $msg"; 3931 $Coro::current->{desc} = "abt $msg";
3810 3932
3811 my @bt = fork_call { 3933 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3934 @addr = map { sprintf "%x", $_ } @addr;
3823 } 3945 }
3824 3946
3825 @funcs 3947 @funcs
3826 }; 3948 };
3827 3949
3828 LOG llevInfo, "[ABT] $msg\n"; 3950 LOG llevInfo, "[ABT] $perl_bt\n";
3951 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3952 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3953 --$_log_backtrace;
3831 }; 3954 };
3832 } else { 3955 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3956 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 3957 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 3958 }
3836} 3959}
3837 3960
3838# load additional modules 3961# load additional modules
3839use cf::pod; 3962require "cf/$_.pm" for @EXTRA_MODULES;
3840 3963
3841END { cf::emergency_save } 3964END { cf::emergency_save }
3842 3965
38431 39661
3844 3967

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines