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.420 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.479 by root, Thu Oct 8 05:04:27 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;
93our @REFLECT; # set by XS
94our %REFLECT; # set by us
80 95
81our $CONFDIR = confdir; 96our $CONFDIR = confdir;
82our $DATADIR = datadir; 97our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 98our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 99our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 100our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 101our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 102our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 103our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 104our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 105our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 106our $BDBDIR = "$LOCALDIR/db";
107our $PIDFILE = "$LOCALDIR/pid";
108our $RUNTIMEFILE = "$LOCALDIR/runtime";
109
92our %RESOURCE; 110our %RESOURCE;
93 111
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 112our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 113our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 114our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 115our $USE_FSYNC = 1; # use fsync to write maps - default on
99 116
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 117our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 118our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 119our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 120our $DB_ENV;
105 121
122our @EXTRA_MODULES = qw(pod mapscript);
123
106our %CFG; 124our %CFG;
107 125
108our $UPTIME; $UPTIME ||= time; 126our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 127our $RUNTIME;
110our $NOW; 128our $NOW;
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 137our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 138our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 139our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 140our $TICK_START; # for load detecting purposes
123 141
142our @POST_INIT;
143
144our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
145our $REALLY_UNLOOP; # never set to true, please :)
146
124binmode STDOUT; 147binmode STDOUT;
125binmode STDERR; 148binmode STDERR;
126 149
127# read virtual server time, if available 150# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 151unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 152 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 153 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 154 $RUNTIME = <$fh> + 0.;
132} 155}
156
157eval "sub TICK() { $TICK } 1" or die;
133 158
134mkdir $_ 159mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 160 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 161
137our $EMERGENCY_POSITION; 162our $EMERGENCY_POSITION;
138 163
139sub cf::map::normalise; 164sub cf::map::normalise;
165
166#############################################################################
167
168%REFLECT = ();
169for (@REFLECT) {
170 my $reflect = JSON::XS::decode_json $_;
171 $REFLECT{$reflect->{class}} = $reflect;
172}
140 173
141############################################################################# 174#############################################################################
142 175
143=head2 GLOBAL VARIABLES 176=head2 GLOBAL VARIABLES
144 177
195 228
196This array contains the results of the last C<invoke ()> call. When 229This array contains the results of the last C<invoke ()> call. When
197C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 230C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 231that call.
199 232
233=item %cf::REFLECT
234
235Contains, for each (C++) class name, a hash reference with information
236about object members (methods, scalars and arrays) and other metadata,
237which is useful for introspection.
238
200=back 239=back
201 240
202=cut 241=cut
203 242
204BEGIN { 243$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 244 my $msg = join "", @_;
207 245
208 $msg .= "\n" 246 $msg .= "\n"
209 unless $msg =~ /\n$/; 247 unless $msg =~ /\n$/;
210 248
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 249 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 250
213 LOG llevError, $msg; 251 LOG llevError, $msg;
214 }; 252};
215}
216 253
217$Coro::State::DIEHOOK = sub { 254$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 255 return unless $^S eq 0; # "eq", not "=="
256
257 warn Carp::longmess $_[0];
219 258
220 if ($Coro::current == $Coro::main) {#d# 259 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 260 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 261 return;#d#
223 }#d# 262 }#d#
224 263
225 # kill coroutine otherwise 264 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 265 Coro::terminate
228}; 266};
229
230$SIG{__DIE__} = sub { }; #d#?
231 267
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 268@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 269@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 270@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 271@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 278for my $pkg (qw(
243 cf::global cf::attachable 279 cf::global cf::attachable
244 cf::object cf::object::player 280 cf::object cf::object::player
245 cf::client cf::player 281 cf::client cf::player
246 cf::arch cf::living 282 cf::arch cf::living
283 cf::map cf::mapspace
247 cf::map cf::party cf::region 284 cf::party cf::region
248)) { 285)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 286 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 287}
252 288
253$EV::DIED = sub { 289$EV::DIED = sub {
254 warn "error in event callback: @_"; 290 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 332our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 333
298sub encode_json($) { $json_coder->encode ($_[0]) } 334sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 335sub decode_json($) { $json_coder->decode ($_[0]) }
300 336
337=item cf::post_init { BLOCK }
338
339Execute the given codeblock, I<after> all extensions have been (re-)loaded,
340but I<before> the server starts ticking again.
341
342The cdoeblock will have a single boolean argument to indicate whether this
343is a reload or not.
344
345=cut
346
347sub post_init(&) {
348 push @POST_INIT, shift;
349}
350
301=item cf::lock_wait $string 351=item cf::lock_wait $string
302 352
303Wait until the given lock is available. See cf::lock_acquire. 353Wait until the given lock is available. See cf::lock_acquire.
304 354
305=item my $lock = cf::lock_acquire $string 355=item my $lock = cf::lock_acquire $string
306 356
307Wait until the given lock is available and then acquires it and returns 357Wait 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, 358a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 359for example when the coroutine gets canceled), the lock is automatically
310returned. 360returned.
311 361
312Locks are *not* recursive, locking from the same coro twice results in a 362Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 363deadlocked coro.
319 369
320Return true if the lock is currently active, i.e. somebody has locked it. 370Return true if the lock is currently active, i.e. somebody has locked it.
321 371
322=cut 372=cut
323 373
324our %LOCK; 374our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 375
327sub lock_wait($) { 376sub lock_wait($) {
328 my ($key) = @_; 377 $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} 378}
341 379
342sub lock_acquire($) { 380sub lock_acquire($) {
343 my ($key) = @_; 381 $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} 382}
357 383
358sub lock_active($) { 384sub lock_active($) {
359 my ($key) = @_; 385 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 386}
363 387
364sub freeze_mainloop { 388sub freeze_mainloop {
365 tick_inhibit_inc; 389 tick_inhibit_inc;
366 390
367 Coro::guard \&tick_inhibit_dec; 391 &Guard::guard (\&tick_inhibit_dec);
368} 392}
369 393
370=item cf::periodic $interval, $cb 394=item cf::periodic $interval, $cb
371 395
372Like EV::periodic, but randomly selects a starting point so that the actions 396Like EV::periodic, but randomly selects a starting point so that the actions
427 } 451 }
428 } 452 }
429}; 453};
430 454
431sub get_slot($;$$) { 455sub get_slot($;$$) {
432 return if tick_inhibit; 456 return if tick_inhibit || $Coro::current == $Coro::main;
433 457
434 my ($time, $pri, $name) = @_; 458 my ($time, $pri, $name) = @_;
435 459
436 $time = $TICK * .6 if $time > $TICK * .6; 460 $time = $TICK * .6 if $time > $TICK * .6;
437 my $sig = new Coro::Signal; 461 my $sig = new Coro::Signal;
724 748
725############################################################################# 749#############################################################################
726 750
727=head2 ATTACHABLE OBJECTS 751=head2 ATTACHABLE OBJECTS
728 752
729Many objects in crossfire are so-called attachable objects. That means you can 753Many objects in deliantra are so-called attachable objects. That means you can
730attach callbacks/event handlers (a collection of which is called an "attachment") 754attach callbacks/event handlers (a collection of which is called an "attachment")
731to it. All such attachable objects support the following methods. 755to it. All such attachable objects support the following methods.
732 756
733In the following description, CLASS can be any of C<global>, C<object> 757In 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 758C<player>, C<client> or C<map> (i.e. the attachable objects in
784=item cf::CLASS::attachment $name, ... 808=item cf::CLASS::attachment $name, ...
785 809
786Register an attachment by C<$name> through which attachable objects of the 810Register an attachment by C<$name> through which attachable objects of the
787given CLASS can refer to this attachment. 811given CLASS can refer to this attachment.
788 812
789Some classes such as crossfire maps and objects can specify attachments 813Some classes such as deliantra maps and objects can specify attachments
790that are attached at load/instantiate time, thus the need for a name. 814that are attached at load/instantiate time, thus the need for a name.
791 815
792These calls expect any number of the following handler/hook descriptions: 816These calls expect any number of the following handler/hook descriptions:
793 817
794=over 4 818=over 4
1085 1109
1086sub reattach { 1110sub reattach {
1087 # basically do the same as instantiate, without calling instantiate 1111 # basically do the same as instantiate, without calling instantiate
1088 my ($obj) = @_; 1112 my ($obj) = @_;
1089 1113
1114 # no longer needed after getting rid of delete_package?
1090 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1115 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1091 1116
1092 my $registry = $obj->registry; 1117 my $registry = $obj->registry;
1093 1118
1094 @$registry = (); 1119 @$registry = ();
1095 1120
1141 utf8::decode (my $decname = $filename); 1166 utf8::decode (my $decname = $filename);
1142 warn sprintf "saving %s (%d,%d)\n", 1167 warn sprintf "saving %s (%d,%d)\n",
1143 $decname, length $$rdata, scalar @$objs; 1168 $decname, length $$rdata, scalar @$objs;
1144 1169
1145 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1170 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1146 chmod SAVE_MODE, $fh; 1171 aio_chmod $fh, SAVE_MODE;
1147 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1172 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1148 aio_fsync $fh if $cf::USE_FSYNC; 1173 if ($cf::USE_FSYNC) {
1174 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;
1175 aio_fsync $fh;
1176 }
1149 close $fh; 1177 aio_close $fh;
1150 1178
1151 if (@$objs) { 1179 if (@$objs) {
1152 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1180 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1153 chmod SAVE_MODE, $fh; 1181 aio_chmod $fh, SAVE_MODE;
1154 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1182 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1155 aio_write $fh, 0, (length $data), $data, 0; 1183 aio_write $fh, 0, (length $data), $data, 0;
1156 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 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;
1186 aio_fsync $fh;
1187 }
1157 close $fh; 1188 aio_close $fh;
1158 aio_rename "$filename.pst~", "$filename.pst"; 1189 aio_rename "$filename.pst~", "$filename.pst";
1159 } 1190 }
1160 } else { 1191 } else {
1161 aio_unlink "$filename.pst"; 1192 aio_unlink "$filename.pst";
1162 } 1193 }
1163 1194
1164 aio_rename "$filename~", $filename; 1195 aio_rename "$filename~", $filename;
1196
1197 $filename =~ s%/[^/]+$%%;
1198 aio_pathsync $filename if $cf::USE_FSYNC;
1165 } else { 1199 } else {
1166 warn "FATAL: $filename~: $!\n"; 1200 warn "unable to save objects: $filename~: $!\n";
1167 } 1201 }
1168 } else { 1202 } else {
1169 aio_unlink $filename; 1203 aio_unlink $filename;
1170 aio_unlink "$filename.pst"; 1204 aio_unlink "$filename.pst";
1171 } 1205 }
1262 my ($name, $cb) = @_; 1296 my ($name, $cb) = @_;
1263 1297
1264 $EXTICMD{$name} = $cb; 1298 $EXTICMD{$name} = $cb;
1265} 1299}
1266 1300
1301use File::Glob ();
1302
1267cf::player->attach ( 1303cf::player->attach (
1268 on_command => sub { 1304 on_command => sub {
1269 my ($pl, $name, $params) = @_; 1305 my ($pl, $name, $params) = @_;
1270 1306
1271 my $cb = $COMMAND{$name} 1307 my $cb = $COMMAND{$name}
1303 1339
1304 cf::override; 1340 cf::override;
1305 }, 1341 },
1306); 1342);
1307 1343
1344# "readahead" all extensions
1345sub cache_extensions {
1346 my $grp = IO::AIO::aio_group;
1347
1348 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1349 for (grep /\.ext$/, @{$_[0]}) {
1350 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1351 }
1352 };
1353
1354 $grp
1355}
1356
1308sub load_extensions { 1357sub load_extensions {
1309 cf::sync_job { 1358 cf::sync_job {
1310 my %todo; 1359 my %todo;
1311 1360
1312 for my $path (<$LIBDIR/*.ext>) { 1361 for my $path (<$LIBDIR/*.ext>) {
1331 1380
1332 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1381 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1333 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1382 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1334 1383
1335 $ext{source} = 1384 $ext{source} =
1336 "package $pkg; use strict; use utf8;\n" 1385 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1337 . "#line 1 \"$path\"\n{\n" 1386 . "#line 1 \"$path\"\n{\n"
1338 . $source 1387 . $source
1339 . "\n};\n1"; 1388 . "\n};\n1";
1340 1389
1341 $todo{$base} = \%ext; 1390 $todo{$base} = \%ext;
1381 1430
1382=back 1431=back
1383 1432
1384=head2 CORE EXTENSIONS 1433=head2 CORE EXTENSIONS
1385 1434
1386Functions and methods that extend core crossfire objects. 1435Functions and methods that extend core deliantra objects.
1387 1436
1388=cut 1437=cut
1389 1438
1390package cf::player; 1439package cf::player;
1391 1440
1434 1483
1435sub exists($) { 1484sub exists($) {
1436 my ($login) = @_; 1485 my ($login) = @_;
1437 1486
1438 $cf::PLAYER{$login} 1487 $cf::PLAYER{$login}
1439 or cf::sync_job { !aio_stat path $login } 1488 or !aio_stat path $login
1440} 1489}
1441 1490
1442sub find($) { 1491sub find($) {
1443 return $cf::PLAYER{$_[0]} || do { 1492 return $cf::PLAYER{$_[0]} || do {
1444 my $login = $_[0]; 1493 my $login = $_[0];
1456 my $f = new_from_file cf::object::thawer path $login 1505 my $f = new_from_file cf::object::thawer path $login
1457 or return; 1506 or return;
1458 1507
1459 my $pl = cf::player::load_pl $f 1508 my $pl = cf::player::load_pl $f
1460 or return; 1509 or return;
1510
1461 local $cf::PLAYER_LOADING{$login} = $pl; 1511 local $cf::PLAYER_LOADING{$login} = $pl;
1462 $f->resolve_delayed_derefs; 1512 $f->resolve_delayed_derefs;
1463 $cf::PLAYER{$login} = $pl 1513 $cf::PLAYER{$login} = $pl
1464 } 1514 }
1465 } 1515 }
1518 my ($pl) = @_; 1568 my ($pl) = @_;
1519 1569
1520 my $name = $pl->ob->name; 1570 my $name = $pl->ob->name;
1521 1571
1522 $pl->{deny_save} = 1; 1572 $pl->{deny_save} = 1;
1523 $pl->password ("*"); # this should lock out the player until we nuked the dir 1573 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1524 1574
1525 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1575 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1526 $pl->deactivate; 1576 $pl->deactivate;
1577 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1578 $pl->ob->check_score;
1527 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1579 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1528 $pl->ns->destroy if $pl->ns; 1580 $pl->ns->destroy if $pl->ns;
1529 1581
1530 my $path = playerdir $pl; 1582 my $path = playerdir $pl;
1531 my $temp = "$path~$cf::RUNTIME~deleting~"; 1583 my $temp = "$path~$cf::RUNTIME~deleting~";
1570 1622
1571 for my $login (@$dirs) { 1623 for my $login (@$dirs) {
1572 my $path = path $login; 1624 my $path = path $login;
1573 1625
1574 # a .pst is a dead give-away for a valid player 1626 # a .pst is a dead give-away for a valid player
1575 unless (-e "$path.pst") { 1627 # if no pst file found, open and chekc for blocked users
1628 if (aio_stat "$path.pst") {
1576 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1629 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1577 aio_read $fh, 0, 512, my $buf, 0 or next; 1630 aio_read $fh, 0, 512, my $buf, 0 or next;
1578 $buf !~ /^password -------------$/m or next; # official not-valid tag 1631 $buf !~ /^password -------------$/m or next; # official not-valid tag
1579 } 1632 }
1580 1633
1611 } 1664 }
1612 1665
1613 \@paths 1666 \@paths
1614} 1667}
1615 1668
1616=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1669=item $protocol_xml = $player->expand_cfpod ($cfpod)
1617 1670
1618Expand crossfire pod fragments into protocol xml. 1671Expand 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 1672
1709=item $player->ext_reply ($msgid, @msg) 1673=item $player->ext_reply ($msgid, @msg)
1710 1674
1711Sends an ext reply to the player. 1675Sends an ext reply to the player.
1712 1676
1925 1889
1926 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1890 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1927 "$UNIQUEDIR/$path" 1891 "$UNIQUEDIR/$path"
1928} 1892}
1929 1893
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 { 1894sub decay_objects {
1940 my ($self) = @_; 1895 my ($self) = @_;
1941 1896
1942 return if $self->{deny_reset}; 1897 return if $self->{deny_reset};
1943 1898
2025sub find { 1980sub find {
2026 my ($path, $origin) = @_; 1981 my ($path, $origin) = @_;
2027 1982
2028 $path = normalise $path, $origin && $origin->path; 1983 $path = normalise $path, $origin && $origin->path;
2029 1984
2030 cf::lock_wait "map_data:$path";#d#remove 1985 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2031 cf::lock_wait "map_find:$path"; 1986 my $guard2 = cf::lock_acquire "map_find:$path";
2032 1987
2033 $cf::MAP{$path} || do { 1988 $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 1989 my $map = new_from_path cf::map $path
2038 or return; 1990 or return;
2039 1991
2040 $map->{last_save} = $cf::RUNTIME; 1992 $map->{last_save} = $cf::RUNTIME;
2041 1993
2043 or return; 1995 or return;
2044 1996
2045 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 1997 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2046 # doing this can freeze the server in a sync job, obviously 1998 # doing this can freeze the server in a sync job, obviously
2047 #$cf::WAIT_FOR_TICK->wait; 1999 #$cf::WAIT_FOR_TICK->wait;
2000 undef $guard2;
2048 undef $guard1; 2001 undef $guard1;
2049 undef $guard2;
2050 $map->reset; 2002 $map->reset;
2051 return find $path; 2003 return find $path;
2052 } 2004 }
2053 2005
2054 $cf::MAP{$path} = $map 2006 $cf::MAP{$path} = $map
2081 my $f = new_from_file cf::object::thawer $self->{load_path}; 2033 my $f = new_from_file cf::object::thawer $self->{load_path};
2082 $f->skip_block; 2034 $f->skip_block;
2083 $self->_load_objects ($f) 2035 $self->_load_objects ($f)
2084 or return; 2036 or return;
2085 2037
2086 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2038 $self->post_load_original
2087 if delete $self->{load_original}; 2039 if delete $self->{load_original};
2088 2040
2089 if (my $uniq = $self->uniq_path) { 2041 if (my $uniq = $self->uniq_path) {
2090 utf8::encode $uniq; 2042 utf8::encode $uniq;
2091 unless (aio_stat $uniq) { 2043 unless (aio_stat $uniq) {
2109 unless ($self->{deny_activate}) { 2061 unless ($self->{deny_activate}) {
2110 $self->decay_objects; 2062 $self->decay_objects;
2111 $self->fix_auto_apply; 2063 $self->fix_auto_apply;
2112 $self->update_buttons; 2064 $self->update_buttons;
2113 cf::cede_to_tick; 2065 cf::cede_to_tick;
2114 $self->set_darkness_map;
2115 cf::cede_to_tick;
2116 $self->activate; 2066 $self->activate;
2117 } 2067 }
2118 2068
2119 $self->{last_save} = $cf::RUNTIME; 2069 $self->{last_save} = $cf::RUNTIME;
2120 $self->last_access ($cf::RUNTIME); 2070 $self->last_access ($cf::RUNTIME);
2286 2236
2287 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2237 my $lock = cf::lock_acquire "map_data:$self->{path}";
2288 2238
2289 return if $self->players; 2239 return if $self->players;
2290 2240
2291 warn "resetting map ", $self->path; 2241 warn "resetting map ", $self->path, "\n";
2292 2242
2293 $self->in_memory (cf::MAP_SWAPPED); 2243 $self->in_memory (cf::MAP_SWAPPED);
2294 2244
2295 # need to save uniques path 2245 # need to save uniques path
2296 unless ($self->{deny_save}) { 2246 unless ($self->{deny_save}) {
2457can be C<undef>. Does the right thing when the player is currently in a 2407can be C<undef>. Does the right thing when the player is currently in a
2458dialogue with the given NPC character. 2408dialogue with the given NPC character.
2459 2409
2460=cut 2410=cut
2461 2411
2412our $SAY_CHANNEL = {
2413 id => "say",
2414 title => "Map",
2415 reply => "say ",
2416 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2417};
2418
2419our $CHAT_CHANNEL = {
2420 id => "chat",
2421 title => "Chat",
2422 reply => "chat ",
2423 tooltip => "Player chat and shouts, global to the server.",
2424};
2425
2462# rough implementation of a future "reply" method that works 2426# rough implementation of a future "reply" method that works
2463# with dialog boxes. 2427# with dialog boxes.
2464#TODO: the first argument must go, split into a $npc->reply_to ( method 2428#TODO: the first argument must go, split into a $npc->reply_to ( method
2465sub cf::object::player::reply($$$;$) { 2429sub cf::object::player::reply($$$;$) {
2466 my ($self, $npc, $msg, $flags) = @_; 2430 my ($self, $npc, $msg, $flags) = @_;
2477 my $dialog = $pl->{npc_dialog}; 2441 my $dialog = $pl->{npc_dialog};
2478 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2442 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2479 2443
2480 } else { 2444 } else {
2481 $msg = $npc->name . " says: $msg" if $npc; 2445 $msg = $npc->name . " says: $msg" if $npc;
2482 $self->message ($msg, $flags); 2446 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2483 } 2447 }
2484 } 2448 }
2485} 2449}
2486 2450
2487=item $object->send_msg ($channel, $msg, $color, [extra...]) 2451=item $object->send_msg ($channel, $msg, $color, [extra...])
2512 2476
2513=item $player_object->enter_link 2477=item $player_object->enter_link
2514 2478
2515Freezes the player and moves him/her to a special map (C<{link}>). 2479Freezes the player and moves him/her to a special map (C<{link}>).
2516 2480
2517The player should be reasonably safe there for short amounts of time. You 2481The player should be reasonably safe there for short amounts of time (e.g.
2518I<MUST> call C<leave_link> as soon as possible, though. 2482for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2483though, as the palyer cannot control the character while it is on the link
2484map.
2519 2485
2520Will never block. 2486Will never block.
2521 2487
2522=item $player_object->leave_link ($map, $x, $y) 2488=item $player_object->leave_link ($map, $x, $y)
2523 2489
2581 2547
2582 $map->load; 2548 $map->load;
2583 $map->load_neighbours; 2549 $map->load_neighbours;
2584 2550
2585 return unless $self->contr->active; 2551 return unless $self->contr->active;
2586 $self->activate_recursive;
2587 2552
2588 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2553 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2589 $self->enter_map ($map, $x, $y); 2554 $self->enter_map ($map, $x, $y);
2555
2556 # only activate afterwards, to support waiting in hooks
2557 $self->activate_recursive;
2590} 2558}
2591 2559
2592=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2560=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2593 2561
2594Moves the player to the given map-path and coordinates by first freezing 2562Moves the player to the given map-path and coordinates by first freezing
2595her, loading and preparing them map, calling the provided $check callback 2563her, loading and preparing them map, calling the provided $check callback
2596that has to return the map if sucecssful, and then unfreezes the player on 2564that 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 2565the new (success) or old (failed) map position. In either case, $done will
2598be called at the end of this process. 2566be called at the end of this process.
2567
2568Note that $check will be called with a potentially non-loaded map, so if
2569it needs a loaded map it has to call C<< ->load >>.
2599 2570
2600=cut 2571=cut
2601 2572
2602our $GOTOGEN; 2573our $GOTOGEN;
2603 2574
2682} 2653}
2683 2654
2684sub prepare_random_map { 2655sub prepare_random_map {
2685 my ($exit) = @_; 2656 my ($exit) = @_;
2686 2657
2687 my $guard = cf::lock_acquire "exit_prepare:$exit";
2688
2689 # all this does is basically replace the /! path by 2658 # all this does is basically replace the /! path by
2690 # a new random map path (?random/...) with a seed 2659 # a new random map path (?random/...) with a seed
2691 # that depends on the exit object 2660 # that depends on the exit object
2692 2661
2693 my $rmp = parse_random_map_params $exit->msg; 2662 my $rmp = parse_random_map_params $exit->msg;
2695 if ($exit->map) { 2664 if ($exit->map) {
2696 $rmp->{region} = $exit->region->name; 2665 $rmp->{region} = $exit->region->name;
2697 $rmp->{origin_map} = $exit->map->path; 2666 $rmp->{origin_map} = $exit->map->path;
2698 $rmp->{origin_x} = $exit->x; 2667 $rmp->{origin_x} = $exit->x;
2699 $rmp->{origin_y} = $exit->y; 2668 $rmp->{origin_y} = $exit->y;
2669
2670 $exit->map->touch;
2700 } 2671 }
2701 2672
2702 $rmp->{random_seed} ||= $exit->random_seed; 2673 $rmp->{random_seed} ||= $exit->random_seed;
2703 2674
2704 my $data = cf::encode_json $rmp; 2675 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2705 my $md5 = Digest::MD5::md5_hex $data; 2676 my $md5 = Digest::MD5::md5_hex $data;
2706 my $meta = "$RANDOMDIR/$md5.meta"; 2677 my $meta = "$RANDOMDIR/$md5.meta";
2707 2678
2708 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2679 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2709 aio_write $fh, 0, (length $data), $data, 0; 2680 aio_write $fh, 0, (length $data), $data, 0;
2710 undef $fh; 2681 undef $fh;
2711 aio_rename "$meta~", $meta; 2682 aio_rename "$meta~", $meta;
2712 2683
2684 my $slaying = "?random/$md5";
2685
2686 if ($exit->valid) {
2713 $exit->slaying ("?random/$md5"); 2687 $exit->slaying ("?random/$md5");
2714 $exit->msg (undef); 2688 $exit->msg (undef);
2689 }
2715 } 2690 }
2716} 2691}
2717 2692
2718sub cf::object::player::enter_exit { 2693sub cf::object::player::enter_exit {
2719 my ($self, $exit) = @_; 2694 my ($self, $exit) = @_;
2720 2695
2721 return unless $self->type == cf::PLAYER; 2696 return unless $self->type == cf::PLAYER;
2722 2697
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; 2698 $self->enter_link;
2735 2699
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 { 2700 (async {
2741 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2701 $Coro::current->{desc} = "enter_exit";
2742 2702
2743 $self->deactivate_recursive; # just to be sure
2744 unless (eval { 2703 unless (eval {
2704 $self->deactivate_recursive; # just to be sure
2705
2706 # random map handling
2707 {
2708 my $guard = cf::lock_acquire "exit_prepare:$exit";
2709
2710 prepare_random_map $exit
2711 if $exit->slaying eq "/!";
2712 }
2713
2714 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2715 my $x = $exit->stats->hp;
2716 my $y = $exit->stats->sp;
2717
2745 $self->goto ($slaying, $hp, $sp); 2718 $self->goto ($map, $x, $y);
2746 2719
2720 # if exit is damned, update players death & WoR home-position
2721 $self->contr->savebed ($map, $x, $y)
2722 if $exit->flag (cf::FLAG_DAMNED);
2723
2747 1; 2724 1
2748 }) { 2725 }) {
2749 $self->message ("Something went wrong deep within the crossfire server. " 2726 $self->message ("Something went wrong deep within the deliantra server. "
2750 . "I'll try to bring you back to the map you were before. " 2727 . "I'll try to bring you back to the map you were before. "
2751 . "Please report this to the dungeon master!", 2728 . "Please report this to the dungeon master!",
2752 cf::NDI_UNIQUE | cf::NDI_RED); 2729 cf::NDI_UNIQUE | cf::NDI_RED);
2753 2730
2754 warn "ERROR in enter_exit: $@"; 2731 warn "ERROR in enter_exit: $@";
2820 id => "infobox", 2797 id => "infobox",
2821 title => "Body Parts", 2798 title => "Body Parts",
2822 reply => undef, 2799 reply => undef,
2823 tooltip => "Shows which body parts you posess and are available", 2800 tooltip => "Shows which body parts you posess and are available",
2824 }, 2801 },
2802 "c/statistics" => {
2803 id => "infobox",
2804 title => "Statistics",
2805 reply => undef,
2806 tooltip => "Shows your primary statistics",
2807 },
2808 "c/skills" => {
2809 id => "infobox",
2810 title => "Skills",
2811 reply => undef,
2812 tooltip => "Shows your experience per skill and item power",
2813 },
2814 "c/shopitems" => {
2815 id => "infobox",
2816 title => "Shop Items",
2817 reply => undef,
2818 tooltip => "Shows the items currently for sale in this shop",
2819 },
2820 "c/resistances" => {
2821 id => "infobox",
2822 title => "Resistances",
2823 reply => undef,
2824 tooltip => "Shows your resistances",
2825 },
2826 "c/pets" => {
2827 id => "infobox",
2828 title => "Pets",
2829 reply => undef,
2830 tooltip => "Shows information abotu your pets/a specific pet",
2831 },
2832 "c/perceiveself" => {
2833 id => "infobox",
2834 title => "Perceive Self",
2835 reply => undef,
2836 tooltip => "You gained detailed knowledge about yourself",
2837 },
2825 "c/uptime" => { 2838 "c/uptime" => {
2826 id => "infobox", 2839 id => "infobox",
2827 title => "Uptime", 2840 title => "Uptime",
2828 reply => undef, 2841 reply => undef,
2829 tooltip => "How long the server has been running since last restart", 2842 tooltip => "How long the server has been running since last restart",
2832 id => "infobox", 2845 id => "infobox",
2833 title => "Map Info", 2846 title => "Map Info",
2834 reply => undef, 2847 reply => undef,
2835 tooltip => "Information related to the maps", 2848 tooltip => "Information related to the maps",
2836 }, 2849 },
2850 "c/party" => {
2851 id => "party",
2852 title => "Party",
2853 reply => "gsay ",
2854 tooltip => "Messages and chat related to your party",
2855 },
2856 "c/death" => {
2857 id => "death",
2858 title => "Death",
2859 reply => undef,
2860 tooltip => "Reason for and more info about your most recent death",
2861 },
2862 "c/say" => $SAY_CHANNEL,
2863 "c/chat" => $CHAT_CHANNEL,
2837); 2864);
2838 2865
2839sub cf::client::send_msg { 2866sub cf::client::send_msg {
2840 my ($self, $channel, $msg, $color, @extra) = @_; 2867 my ($self, $channel, $msg, $color, @extra) = @_;
2841 2868
2842 $msg = $self->pl->expand_cfpod ($msg); 2869 $msg = $self->pl->expand_cfpod ($msg)
2870 unless $color & cf::NDI_VERBATIM;
2843 2871
2844 $color &= cf::NDI_CLIENT_MASK; # just in case... 2872 $color &= cf::NDI_CLIENT_MASK; # just in case...
2845 2873
2846 # check predefined channels, for the benefit of C 2874 # check predefined channels, for the benefit of C
2847 if ($CHANNEL{$channel}) { 2875 if ($CHANNEL{$channel}) {
2848 $channel = $CHANNEL{$channel}; 2876 $channel = $CHANNEL{$channel};
2849 2877
2850 $self->ext_msg (channel_info => $channel) 2878 $self->ext_msg (channel_info => $channel);
2851 if $self->can_msg;
2852
2853 $channel = $channel->{id}; 2879 $channel = $channel->{id};
2854 2880
2855 } elsif (ref $channel) { 2881 } elsif (ref $channel) {
2856 # send meta info to client, if not yet sent 2882 # send meta info to client, if not yet sent
2857 unless (exists $self->{channel}{$channel->{id}}) { 2883 unless (exists $self->{channel}{$channel->{id}}) {
2858 $self->{channel}{$channel->{id}} = $channel; 2884 $self->{channel}{$channel->{id}} = $channel;
2859 $self->ext_msg (channel_info => $channel) 2885 $self->ext_msg (channel_info => $channel);
2860 if $self->can_msg;
2861 } 2886 }
2862 2887
2863 $channel = $channel->{id}; 2888 $channel = $channel->{id};
2864 } 2889 }
2865 2890
2866 return unless @extra || length $msg; 2891 return unless @extra || length $msg;
2867 2892
2868 if ($self->can_msg) {
2869 # default colour, mask it out 2893 # default colour, mask it out
2870 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2894 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2871 if $color & cf::NDI_DEF; 2895 if $color & cf::NDI_DEF;
2872 2896
2873 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2897 my $pkt = "msg "
2898 . $self->{json_coder}->encode (
2874 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2899 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2875 } else { 2900 );
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 2901
2887 $color &= cf::NDI_COLOR_MASK; 2902 # try lzf for large packets
2903 $pkt = "lzf " . Compress::LZF::compress $pkt
2904 if 1024 <= length $pkt and $self->{can_lzf};
2888 2905
2889 utf8::encode $msg; 2906 # split very large packets
2890 2907 if (8192 < length $pkt and $self->{can_lzf}) {
2891 if (0 && $msg =~ /\[/) { 2908 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2892 # COMMAND/INFO 2909 $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 } 2910 }
2911
2912 $self->send_packet ($pkt);
2900} 2913}
2901 2914
2902=item $client->ext_msg ($type, @msg) 2915=item $client->ext_msg ($type, @msg)
2903 2916
2904Sends an ext event to the client. 2917Sends an ext event to the client.
3078 3091
3079The following functions and methods are available within a safe environment: 3092The following functions and methods are available within a safe environment:
3080 3093
3081 cf::object 3094 cf::object
3082 contr pay_amount pay_player map x y force_find force_add destroy 3095 contr pay_amount pay_player map x y force_find force_add destroy
3083 insert remove name archname title slaying race decrease_ob_nr 3096 insert remove name archname title slaying race decrease split
3097 value
3084 3098
3085 cf::object::player 3099 cf::object::player
3086 player 3100 player
3087 3101
3088 cf::player 3102 cf::player
3093 3107
3094=cut 3108=cut
3095 3109
3096for ( 3110for (
3097 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3111 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3098 insert remove inv name archname title slaying race 3112 insert remove inv nrof name archname title slaying race
3099 decrease_ob_nr destroy)], 3113 decrease split destroy change_exp value msg lore send_msg)],
3100 ["cf::object::player" => qw(player)], 3114 ["cf::object::player" => qw(player)],
3101 ["cf::player" => qw(peaceful)], 3115 ["cf::player" => qw(peaceful send_msg)],
3102 ["cf::map" => qw(trigger)], 3116 ["cf::map" => qw(trigger)],
3103) { 3117) {
3104 no strict 'refs'; 3118 no strict 'refs';
3105 my ($pkg, @funs) = @$_; 3119 my ($pkg, @funs) = @$_;
3106 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3120 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3123 my ($code, %vars) = @_; 3137 my ($code, %vars) = @_;
3124 3138
3125 my $qcode = $code; 3139 my $qcode = $code;
3126 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3140 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3127 $qcode =~ s/\n/\\n/g; 3141 $qcode =~ s/\n/\\n/g;
3142
3143 %vars = (_dummy => 0) unless %vars;
3128 3144
3129 local $_; 3145 local $_;
3130 local @safe::cf::_safe_eval_args = values %vars; 3146 local @safe::cf::_safe_eval_args = values %vars;
3131 3147
3132 my $eval = 3148 my $eval =
3312 while (my ($k, $v) = each %$want) { 3328 while (my ($k, $v) = each %$want) {
3313 $ns->fx_want ($k, $v); 3329 $ns->fx_want ($k, $v);
3314 } 3330 }
3315}; 3331};
3316 3332
3333sub load_resource_file($) {
3334 my $guard = lock_acquire "load_resource_file";
3335
3336 my $status = load_resource_file_ $_[0];
3337 get_slot 0.1, 100;
3338 cf::arch::commit_load;
3339
3340 $status
3341}
3342
3317sub reload_regions { 3343sub reload_regions {
3318 # HACK to clear player env face cache, we need some signal framework 3344 # HACK to clear player env face cache, we need some signal framework
3319 # for this (global event?) 3345 # for this (global event?)
3320 %ext::player_env::MUSIC_FACE_CACHE = (); 3346 %ext::player_env::MUSIC_FACE_CACHE = ();
3321 3347
3334} 3360}
3335 3361
3336sub reload_archetypes { 3362sub reload_archetypes {
3337 load_resource_file "$DATADIR/archetypes" 3363 load_resource_file "$DATADIR/archetypes"
3338 or die "unable to load archetypes\n"; 3364 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} 3365}
3345 3366
3346sub reload_treasures { 3367sub reload_treasures {
3347 load_resource_file "$DATADIR/treasures" 3368 load_resource_file "$DATADIR/treasures"
3348 or die "unable to load treasurelists\n"; 3369 or die "unable to load treasurelists\n";
3349} 3370}
3350 3371
3351sub reload_resources { 3372sub reload_resources {
3352 warn "reloading resource files...\n"; 3373 warn "reloading resource files...\n";
3353 3374
3375 reload_facedata;
3376 reload_archetypes;
3354 reload_regions; 3377 reload_regions;
3355 reload_facedata;
3356 #reload_archetypes;#d#
3357 reload_archetypes;
3358 reload_treasures; 3378 reload_treasures;
3359 3379
3360 warn "finished reloading resource files\n"; 3380 warn "finished reloading resource files\n";
3361}
3362
3363sub init {
3364 reload_resources;
3365} 3381}
3366 3382
3367sub reload_config { 3383sub reload_config {
3368 open my $fh, "<:utf8", "$CONFDIR/config" 3384 open my $fh, "<:utf8", "$CONFDIR/config"
3369 or return; 3385 or return;
3383 }; 3399 };
3384 warn $@ if $@; 3400 warn $@ if $@;
3385 } 3401 }
3386} 3402}
3387 3403
3404sub pidfile() {
3405 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3406 or die "$PIDFILE: $!";
3407 flock $fh, &Fcntl::LOCK_EX
3408 or die "$PIDFILE: flock: $!";
3409 $fh
3410}
3411
3412# make sure only one server instance is running at any one time
3413sub atomic {
3414 my $fh = pidfile;
3415
3416 my $pid = <$fh>;
3417 kill 9, $pid if $pid > 0;
3418
3419 seek $fh, 0, 0;
3420 print $fh $$;
3421}
3422
3423sub main_loop {
3424 warn "EV::loop starting\n";
3425 if (1) {
3426 EV::loop;
3427 }
3428 warn "EV::loop returned\n";
3429 goto &main_loop unless $REALLY_UNLOOP;
3430}
3431
3388sub main { 3432sub main {
3433 cf::init_globals; # initialise logging
3434
3435 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3436 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3437 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3438 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3439
3440 cf::init_experience;
3441 cf::init_anim;
3442 cf::init_attackmess;
3443 cf::init_dynamic;
3444
3445 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3446
3389 # we must not ever block the main coroutine 3447 # we must not ever block the main coroutine
3390 local $Coro::idle = sub { 3448 local $Coro::idle = sub {
3391 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3449 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3392 (async { 3450 (async {
3393 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3451 $Coro::current->{desc} = "IDLE BUG HANDLER";
3394 EV::loop EV::LOOP_ONESHOT; 3452 EV::loop EV::LOOP_ONESHOT;
3395 })->prio (Coro::PRIO_MAX); 3453 })->prio (Coro::PRIO_MAX);
3396 }; 3454 };
3397 3455
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; 3456 evthread_start IO::AIO::poll_fileno;
3404 EV::loop; 3457
3458 cf::sync_job {
3459 reload_resources;
3460 reload_config;
3461 db_init;
3462
3463 cf::load_settings;
3464 cf::load_materials;
3465 cf::init_uuid;
3466 cf::init_signals;
3467 cf::init_commands;
3468 cf::init_skills;
3469
3470 cf::init_beforeplay;
3471
3472 atomic;
3473
3474 load_extensions;
3475
3476 utime time, time, $RUNTIMEFILE;
3477
3478 # no (long-running) fork's whatsoever before this point(!)
3479 use POSIX ();
3480 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3481
3482 (pop @POST_INIT)->(0) while @POST_INIT;
3483 };
3484
3485 main_loop;
3405} 3486}
3406 3487
3407############################################################################# 3488#############################################################################
3408# initialisation and cleanup 3489# initialisation and cleanup
3409 3490
3416 }; 3497 };
3417 } 3498 }
3418} 3499}
3419 3500
3420sub write_runtime_sync { 3501sub write_runtime_sync {
3421 my $runtime = "$LOCALDIR/runtime";
3422
3423 # first touch the runtime file to show we are still running: 3502 # first touch the runtime file to show we are still running:
3424 # the fsync below can take a very very long time. 3503 # the fsync below can take a very very long time.
3425 3504
3426 IO::AIO::aio_utime $runtime, undef, undef; 3505 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3427 3506
3428 my $guard = cf::lock_acquire "write_runtime"; 3507 my $guard = cf::lock_acquire "write_runtime";
3429 3508
3430 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3509 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3431 or return; 3510 or return;
3432 3511
3433 my $value = $cf::RUNTIME + 90 + 10; 3512 my $value = $cf::RUNTIME + 90 + 10;
3434 # 10 is the runtime save interval, for a monotonic clock 3513 # 10 is the runtime save interval, for a monotonic clock
3435 # 60 allows for the watchdog to kill the server. 3514 # 60 allows for the watchdog to kill the server.
3445 aio_utime $fh, undef, undef; 3524 aio_utime $fh, undef, undef;
3446 3525
3447 close $fh 3526 close $fh
3448 or return; 3527 or return;
3449 3528
3450 aio_rename "$runtime~", $runtime 3529 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3451 and return; 3530 and return;
3452 3531
3453 warn "runtime file written.\n"; 3532 warn "runtime file written.\n";
3454 3533
3455 1 3534 1
3467 my $uuid = "$LOCALDIR/uuid"; 3546 my $uuid = "$LOCALDIR/uuid";
3468 3547
3469 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3548 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3470 or return; 3549 or return;
3471 3550
3472 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3551 my $value = uuid_seq uuid_cur;
3552
3553 unless ($value) {
3554 warn "cowardly refusing to write zero uuid value!\n";
3555 return;
3556 }
3557
3558 my $value = uuid_str $value + $uuid_skip;
3473 $uuid_skip = 0; 3559 $uuid_skip = 0;
3474 3560
3475 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3561 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3476 and return; 3562 and return;
3477 3563
3499} 3585}
3500 3586
3501sub emergency_save() { 3587sub emergency_save() {
3502 my $freeze_guard = cf::freeze_mainloop; 3588 my $freeze_guard = cf::freeze_mainloop;
3503 3589
3504 warn "enter emergency perl save\n"; 3590 warn "emergency_perl_save: enter\n";
3505 3591
3506 cf::sync_job { 3592 cf::sync_job {
3593 # this is a trade-off: we want to be very quick here, so
3594 # save all maps without fsync, and later call a global sync
3595 # (which in turn might be very very slow)
3596 local $USE_FSYNC = 0;
3597
3507 # use a peculiar iteration method to avoid tripping on perl 3598 # use a peculiar iteration method to avoid tripping on perl
3508 # refcount bugs in for. also avoids problems with players 3599 # refcount bugs in for. also avoids problems with players
3509 # and maps saved/destroyed asynchronously. 3600 # and maps saved/destroyed asynchronously.
3510 warn "begin emergency player save\n"; 3601 warn "emergency_perl_save: begin player save\n";
3511 for my $login (keys %cf::PLAYER) { 3602 for my $login (keys %cf::PLAYER) {
3512 my $pl = $cf::PLAYER{$login} or next; 3603 my $pl = $cf::PLAYER{$login} or next;
3513 $pl->valid or next; 3604 $pl->valid or next;
3514 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3605 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3515 $pl->save; 3606 $pl->save;
3516 } 3607 }
3517 warn "end emergency player save\n"; 3608 warn "emergency_perl_save: end player save\n";
3518 3609
3519 warn "begin emergency map save\n"; 3610 warn "emergency_perl_save: begin map save\n";
3520 for my $path (keys %cf::MAP) { 3611 for my $path (keys %cf::MAP) {
3521 my $map = $cf::MAP{$path} or next; 3612 my $map = $cf::MAP{$path} or next;
3522 $map->valid or next; 3613 $map->valid or next;
3523 $map->save; 3614 $map->save;
3524 } 3615 }
3525 warn "end emergency map save\n"; 3616 warn "emergency_perl_save: end map save\n";
3526 3617
3527 warn "begin emergency database checkpoint\n"; 3618 warn "emergency_perl_save: begin database checkpoint\n";
3528 BDB::db_env_txn_checkpoint $DB_ENV; 3619 BDB::db_env_txn_checkpoint $DB_ENV;
3529 warn "end emergency database checkpoint\n"; 3620 warn "emergency_perl_save: end database checkpoint\n";
3530 3621
3531 warn "begin write uuid\n"; 3622 warn "emergency_perl_save: begin write uuid\n";
3532 write_uuid_sync 1; 3623 write_uuid_sync 1;
3533 warn "end write uuid\n"; 3624 warn "emergency_perl_save: end write uuid\n";
3534 }; 3625 };
3535 3626
3627 warn "emergency_perl_save: starting sync()\n";
3628 IO::AIO::aio_sync sub {
3629 warn "emergency_perl_save: finished sync()\n";
3630 };
3631
3536 warn "leave emergency perl save\n"; 3632 warn "emergency_perl_save: leave\n";
3537} 3633}
3538 3634
3539sub post_cleanup { 3635sub post_cleanup {
3540 my ($make_core) = @_; 3636 my ($make_core) = @_;
3541 3637
3542 warn Carp::longmess "post_cleanup backtrace" 3638 warn Carp::longmess "post_cleanup backtrace"
3543 if $make_core; 3639 if $make_core;
3640
3641 my $fh = pidfile;
3642 unlink $PIDFILE if <$fh> == $$;
3643}
3644
3645# a safer delete_package, copied from Symbol
3646sub clear_package($) {
3647 my $pkg = shift;
3648
3649 # expand to full symbol table name if needed
3650 unless ($pkg =~ /^main::.*::$/) {
3651 $pkg = "main$pkg" if $pkg =~ /^::/;
3652 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3653 $pkg .= '::' unless $pkg =~ /::$/;
3654 }
3655
3656 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3657 my $stem_symtab = *{$stem}{HASH};
3658
3659 defined $stem_symtab and exists $stem_symtab->{$leaf}
3660 or return;
3661
3662 # clear all symbols
3663 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3664 for my $name (keys %$leaf_symtab) {
3665 _gv_clear *{"$pkg$name"};
3666# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3667 }
3668 warn "cleared package $pkg\n";#d#
3544} 3669}
3545 3670
3546sub do_reload_perl() { 3671sub do_reload_perl() {
3547 # can/must only be called in main 3672 # can/must only be called in main
3548 if ($Coro::current != $Coro::main) { 3673 if ($Coro::current != $Coro::main) {
3549 warn "can only reload from main coroutine"; 3674 warn "can only reload from main coroutine";
3550 return; 3675 return;
3551 } 3676 }
3552 3677
3678 return if $RELOAD++;
3679
3680 my $t1 = EV::time;
3681
3682 while ($RELOAD) {
3553 warn "reloading..."; 3683 warn "reloading...";
3554 3684
3555 warn "entering sync_job"; 3685 warn "entering sync_job";
3556 3686
3557 cf::sync_job { 3687 cf::sync_job {
3558 cf::write_runtime_sync; # external watchdog should not bark 3688 cf::write_runtime_sync; # external watchdog should not bark
3559 cf::emergency_save; 3689 cf::emergency_save;
3560 cf::write_runtime_sync; # external watchdog should not bark 3690 cf::write_runtime_sync; # external watchdog should not bark
3561 3691
3562 warn "syncing database to disk"; 3692 warn "syncing database to disk";
3563 BDB::db_env_txn_checkpoint $DB_ENV; 3693 BDB::db_env_txn_checkpoint $DB_ENV;
3564 3694
3565 # if anything goes wrong in here, we should simply crash as we already saved 3695 # if anything goes wrong in here, we should simply crash as we already saved
3566 3696
3567 warn "flushing outstanding aio requests"; 3697 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; 3698 while (IO::AIO::nreqs || BDB::nreqs) {
3573 warn "iterate..."; 3699 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 } 3700 }
3599 3701
3600 warn "... nuking $pkg"; 3702 warn "cancelling all extension coros";
3601 Symbol::delete_package $pkg; 3703 $_->cancel for values %EXT_CORO;
3602 } 3704 %EXT_CORO = ();
3603 3705
3604 warn "unloading all perl modules loaded from $LIBDIR"; 3706 warn "removing commands";
3605 while (my ($k, $v) = each %INC) { 3707 %COMMAND = ();
3606 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3607 3708
3709 warn "removing ext/exti commands";
3710 %EXTCMD = ();
3711 %EXTICMD = ();
3712
3713 warn "unloading/nuking all extensions";
3714 for my $pkg (@EXTS) {
3608 warn "... unloading $k"; 3715 warn "... unloading $pkg";
3609 delete $INC{$k};
3610 3716
3611 $k =~ s/\.pm$//;
3612 $k =~ s/\//::/g;
3613
3614 if (my $cb = $k->can ("unload_module")) { 3717 if (my $cb = $pkg->can ("unload")) {
3718 eval {
3615 $cb->(); 3719 $cb->($pkg);
3720 1
3721 } or warn "$pkg unloaded, but with errors: $@";
3722 }
3723
3724 warn "... clearing $pkg";
3725 clear_package $pkg;
3616 } 3726 }
3617 3727
3618 Symbol::delete_package $k; 3728 warn "unloading all perl modules loaded from $LIBDIR";
3729 while (my ($k, $v) = each %INC) {
3730 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3731
3732 warn "... unloading $k";
3733 delete $INC{$k};
3734
3735 $k =~ s/\.pm$//;
3736 $k =~ s/\//::/g;
3737
3738 if (my $cb = $k->can ("unload_module")) {
3739 $cb->();
3740 }
3741
3742 clear_package $k;
3619 } 3743 }
3620 3744
3621 warn "getting rid of safe::, as good as possible"; 3745 warn "getting rid of safe::, as good as possible";
3622 Symbol::delete_package "safe::$_" 3746 clear_package "safe::$_"
3623 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3747 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3624 3748
3625 warn "unloading cf.pm \"a bit\""; 3749 warn "unloading cf.pm \"a bit\"";
3626 delete $INC{"cf.pm"}; 3750 delete $INC{"cf.pm"};
3627 delete $INC{"cf/pod.pm"}; 3751 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3628 3752
3629 # don't, removes xs symbols, too, 3753 # don't, removes xs symbols, too,
3630 # and global variables created in xs 3754 # and global variables created in xs
3631 #Symbol::delete_package __PACKAGE__; 3755 #clear_package __PACKAGE__;
3632 3756
3633 warn "unload completed, starting to reload now"; 3757 warn "unload completed, starting to reload now";
3634 3758
3635 warn "reloading cf.pm"; 3759 warn "reloading cf.pm";
3636 require cf; 3760 require cf;
3637 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3761 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3638 3762
3639 warn "loading config and database again"; 3763 warn "loading config and database again";
3640 cf::reload_config; 3764 cf::reload_config;
3641 3765
3642 warn "loading extensions"; 3766 warn "loading extensions";
3643 cf::load_extensions; 3767 cf::load_extensions;
3644 3768
3769 if ($REATTACH_ON_RELOAD) {
3645 warn "reattaching attachments to objects/players"; 3770 warn "reattaching attachments to objects/players";
3646 _global_reattach; # objects, sockets 3771 _global_reattach; # objects, sockets
3647 warn "reattaching attachments to maps"; 3772 warn "reattaching attachments to maps";
3648 reattach $_ for values %MAP; 3773 reattach $_ for values %MAP;
3649 warn "reattaching attachments to players"; 3774 warn "reattaching attachments to players";
3650 reattach $_ for values %PLAYER; 3775 reattach $_ for values %PLAYER;
3776 }
3651 3777
3778 warn "running post_init jobs";
3779 (pop @POST_INIT)->(1) while @POST_INIT;
3780
3652 warn "leaving sync_job"; 3781 warn "leaving sync_job";
3653 3782
3654 1 3783 1
3655 } or do { 3784 } or do {
3656 warn $@; 3785 warn $@;
3657 cf::cleanup "error while reloading, exiting."; 3786 cf::cleanup "error while reloading, exiting.";
3658 }; 3787 };
3659 3788
3660 warn "reloaded"; 3789 warn "reloaded";
3790 --$RELOAD;
3791 }
3792
3793 $t1 = EV::time - $t1;
3794 warn "reload completed in ${t1}s\n";
3661}; 3795};
3662 3796
3663our $RELOAD_WATCHER; # used only during reload 3797our $RELOAD_WATCHER; # used only during reload
3664 3798
3665sub reload_perl() { 3799sub reload_perl() {
3666 # doing reload synchronously and two reloads happen back-to-back, 3800 # doing reload synchronously and two reloads happen back-to-back,
3667 # coro crashes during coro_state_free->destroy here. 3801 # coro crashes during coro_state_free->destroy here.
3668 3802
3803 $RELOAD_WATCHER ||= cf::async {
3804 Coro::AIO::aio_wait cache_extensions;
3805
3669 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3806 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3670 do_reload_perl; 3807 do_reload_perl;
3671 undef $RELOAD_WATCHER; 3808 undef $RELOAD_WATCHER;
3809 };
3672 }; 3810 };
3673} 3811}
3674 3812
3675register_command "reload" => sub { 3813register_command "reload" => sub {
3676 my ($who, $arg) = @_; 3814 my ($who, $arg) = @_;
3690 3828
3691our @WAIT_FOR_TICK; 3829our @WAIT_FOR_TICK;
3692our @WAIT_FOR_TICK_BEGIN; 3830our @WAIT_FOR_TICK_BEGIN;
3693 3831
3694sub wait_for_tick { 3832sub wait_for_tick {
3695 return if tick_inhibit;
3696 return if $Coro::current == $Coro::main; 3833 return if tick_inhibit || $Coro::current == $Coro::main;
3697 3834
3698 my $signal = new Coro::Signal; 3835 my $signal = new Coro::Signal;
3699 push @WAIT_FOR_TICK, $signal; 3836 push @WAIT_FOR_TICK, $signal;
3700 $signal->wait; 3837 $signal->wait;
3701} 3838}
3702 3839
3703sub wait_for_tick_begin { 3840sub wait_for_tick_begin {
3704 return if tick_inhibit;
3705 return if $Coro::current == $Coro::main; 3841 return if tick_inhibit || $Coro::current == $Coro::main;
3706 3842
3707 my $signal = new Coro::Signal; 3843 my $signal = new Coro::Signal;
3708 push @WAIT_FOR_TICK_BEGIN, $signal; 3844 push @WAIT_FOR_TICK_BEGIN, $signal;
3709 $signal->wait; 3845 $signal->wait;
3710} 3846}
3749{ 3885{
3750 # configure BDB 3886 # configure BDB
3751 3887
3752 BDB::min_parallel 8; 3888 BDB::min_parallel 8;
3753 BDB::max_poll_reqs $TICK * 0.1; 3889 BDB::max_poll_reqs $TICK * 0.1;
3754 $Coro::BDB::WATCHER->priority (1); 3890 $AnyEvent::BDB::WATCHER->priority (1);
3755 3891
3756 unless ($DB_ENV) { 3892 unless ($DB_ENV) {
3757 $DB_ENV = BDB::db_env_create; 3893 $DB_ENV = BDB::db_env_create;
3758 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3894 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3759 | BDB::LOG_AUTOREMOVE, 1); 3895 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3896 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3760 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3897 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3761 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3898 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3762 3899
3763 cf::sync_job { 3900 cf::sync_job {
3764 eval { 3901 eval {
3790{ 3927{
3791 # configure IO::AIO 3928 # configure IO::AIO
3792 3929
3793 IO::AIO::min_parallel 8; 3930 IO::AIO::min_parallel 8;
3794 IO::AIO::max_poll_time $TICK * 0.1; 3931 IO::AIO::max_poll_time $TICK * 0.1;
3795 $Coro::AIO::WATCHER->priority (1); 3932 undef $AnyEvent::AIO::WATCHER;
3796} 3933}
3797 3934
3798my $_log_backtrace; 3935my $_log_backtrace;
3799 3936
3800sub _log_backtrace { 3937sub _log_backtrace {
3803 $msg =~ s/\n//; 3940 $msg =~ s/\n//;
3804 3941
3805 # limit the # of concurrent backtraces 3942 # limit the # of concurrent backtraces
3806 if ($_log_backtrace < 2) { 3943 if ($_log_backtrace < 2) {
3807 ++$_log_backtrace; 3944 ++$_log_backtrace;
3945 my $perl_bt = Carp::longmess $msg;
3808 async { 3946 async {
3809 $Coro::current->{desc} = "abt $msg"; 3947 $Coro::current->{desc} = "abt $msg";
3810 3948
3811 my @bt = fork_call { 3949 my @bt = fork_call {
3812 @addr = map { sprintf "%x", $_ } @addr; 3950 @addr = map { sprintf "%x", $_ } @addr;
3823 } 3961 }
3824 3962
3825 @funcs 3963 @funcs
3826 }; 3964 };
3827 3965
3828 LOG llevInfo, "[ABT] $msg\n"; 3966 LOG llevInfo, "[ABT] $perl_bt\n";
3967 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3829 LOG llevInfo, "[ABT] $_\n" for @bt; 3968 LOG llevInfo, "[ABT] $_\n" for @bt;
3830 --$_log_backtrace; 3969 --$_log_backtrace;
3831 }; 3970 };
3832 } else { 3971 } else {
3833 LOG llevInfo, "[ABT] $msg\n"; 3972 LOG llevInfo, "[ABT] $msg\n";
3834 LOG llevInfo, "[ABT] [suppressed]\n"; 3973 LOG llevInfo, "[ABT] [suppressed]\n";
3835 } 3974 }
3836} 3975}
3837 3976
3838# load additional modules 3977# load additional modules
3839use cf::pod; 3978require "cf/$_.pm" for @EXTRA_MODULES;
3840 3979
3841END { cf::emergency_save } 3980END { cf::emergency_save }
3842 3981
38431 39821
3844 3983

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines