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.419 by root, Sun Apr 13 01:34:09 2008 UTC vs.
Revision 1.480 by root, Thu Oct 8 05:09:43 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}
173
174# this is decidedly evil
175$REFLECT{object}{flags} = [grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"}];
140 176
141############################################################################# 177#############################################################################
142 178
143=head2 GLOBAL VARIABLES 179=head2 GLOBAL VARIABLES
144 180
195 231
196This array contains the results of the last C<invoke ()> call. When 232This 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 233C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 234that call.
199 235
236=item %cf::REFLECT
237
238Contains, for each (C++) class name, a hash reference with information
239about object members (methods, scalars, arrays and flags) and other
240metadata, which is useful for introspection.
241
200=back 242=back
201 243
202=cut 244=cut
203 245
204BEGIN { 246$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 247 my $msg = join "", @_;
207 248
208 $msg .= "\n" 249 $msg .= "\n"
209 unless $msg =~ /\n$/; 250 unless $msg =~ /\n$/;
210 251
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 252 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 253
213 LOG llevError, $msg; 254 LOG llevError, $msg;
214 }; 255};
215}
216 256
217$Coro::State::DIEHOOK = sub { 257$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 258 return unless $^S eq 0; # "eq", not "=="
259
260 warn Carp::longmess $_[0];
219 261
220 if ($Coro::current == $Coro::main) {#d# 262 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 263 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 264 return;#d#
223 }#d# 265 }#d#
224 266
225 # kill coroutine otherwise 267 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 268 Coro::terminate
228}; 269};
229
230$SIG{__DIE__} = sub { }; #d#?
231 270
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 271@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 272@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 273@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 274@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
242for my $pkg (qw( 281for my $pkg (qw(
243 cf::global cf::attachable 282 cf::global cf::attachable
244 cf::object cf::object::player 283 cf::object cf::object::player
245 cf::client cf::player 284 cf::client cf::player
246 cf::arch cf::living 285 cf::arch cf::living
286 cf::map cf::mapspace
247 cf::map cf::party cf::region 287 cf::party cf::region
248)) { 288)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 289 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 290}
252 291
253$EV::DIED = sub { 292$EV::DIED = sub {
254 warn "error in event callback: @_"; 293 warn "error in event callback: @_";
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 335our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 336
298sub encode_json($) { $json_coder->encode ($_[0]) } 337sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 338sub decode_json($) { $json_coder->decode ($_[0]) }
300 339
340=item cf::post_init { BLOCK }
341
342Execute the given codeblock, I<after> all extensions have been (re-)loaded,
343but I<before> the server starts ticking again.
344
345The cdoeblock will have a single boolean argument to indicate whether this
346is a reload or not.
347
348=cut
349
350sub post_init(&) {
351 push @POST_INIT, shift;
352}
353
301=item cf::lock_wait $string 354=item cf::lock_wait $string
302 355
303Wait until the given lock is available. See cf::lock_acquire. 356Wait until the given lock is available. See cf::lock_acquire.
304 357
305=item my $lock = cf::lock_acquire $string 358=item my $lock = cf::lock_acquire $string
306 359
307Wait until the given lock is available and then acquires it and returns 360Wait 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, 361a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 362for example when the coroutine gets canceled), the lock is automatically
310returned. 363returned.
311 364
312Locks are *not* recursive, locking from the same coro twice results in a 365Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 366deadlocked coro.
319 372
320Return true if the lock is currently active, i.e. somebody has locked it. 373Return true if the lock is currently active, i.e. somebody has locked it.
321 374
322=cut 375=cut
323 376
324our %LOCK; 377our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 378
327sub lock_wait($) { 379sub lock_wait($) {
328 my ($key) = @_; 380 $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} 381}
341 382
342sub lock_acquire($) { 383sub lock_acquire($) {
343 my ($key) = @_; 384 $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} 385}
357 386
358sub lock_active($) { 387sub lock_active($) {
359 my ($key) = @_; 388 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 389}
363 390
364sub freeze_mainloop { 391sub freeze_mainloop {
365 tick_inhibit_inc; 392 tick_inhibit_inc;
366 393
367 Coro::guard \&tick_inhibit_dec; 394 &Guard::guard (\&tick_inhibit_dec);
368} 395}
369 396
370=item cf::periodic $interval, $cb 397=item cf::periodic $interval, $cb
371 398
372Like EV::periodic, but randomly selects a starting point so that the actions 399Like EV::periodic, but randomly selects a starting point so that the actions
427 } 454 }
428 } 455 }
429}; 456};
430 457
431sub get_slot($;$$) { 458sub get_slot($;$$) {
459 return if tick_inhibit || $Coro::current == $Coro::main;
460
432 my ($time, $pri, $name) = @_; 461 my ($time, $pri, $name) = @_;
433 462
434 $time = $TICK * .6 if $time > $TICK * .6; 463 $time = $TICK * .6 if $time > $TICK * .6;
435 my $sig = new Coro::Signal; 464 my $sig = new Coro::Signal;
436 465
722 751
723############################################################################# 752#############################################################################
724 753
725=head2 ATTACHABLE OBJECTS 754=head2 ATTACHABLE OBJECTS
726 755
727Many objects in crossfire are so-called attachable objects. That means you can 756Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 757attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 758to it. All such attachable objects support the following methods.
730 759
731In the following description, CLASS can be any of C<global>, C<object> 760In the following description, CLASS can be any of C<global>, C<object>
732C<player>, C<client> or C<map> (i.e. the attachable objects in 761C<player>, C<client> or C<map> (i.e. the attachable objects in
782=item cf::CLASS::attachment $name, ... 811=item cf::CLASS::attachment $name, ...
783 812
784Register an attachment by C<$name> through which attachable objects of the 813Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 814given CLASS can refer to this attachment.
786 815
787Some classes such as crossfire maps and objects can specify attachments 816Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 817that are attached at load/instantiate time, thus the need for a name.
789 818
790These calls expect any number of the following handler/hook descriptions: 819These calls expect any number of the following handler/hook descriptions:
791 820
792=over 4 821=over 4
1083 1112
1084sub reattach { 1113sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1114 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1115 my ($obj) = @_;
1087 1116
1117 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1118 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1119
1090 my $registry = $obj->registry; 1120 my $registry = $obj->registry;
1091 1121
1092 @$registry = (); 1122 @$registry = ();
1093 1123
1139 utf8::decode (my $decname = $filename); 1169 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1170 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1171 $decname, length $$rdata, scalar @$objs;
1142 1172
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1173 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1174 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1175 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1176 if ($cf::USE_FSYNC) {
1177 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;
1178 aio_fsync $fh;
1179 }
1147 close $fh; 1180 aio_close $fh;
1148 1181
1149 if (@$objs) { 1182 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1183 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1184 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1185 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1186 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1187 if ($cf::USE_FSYNC) {
1188 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;
1189 aio_fsync $fh;
1190 }
1155 close $fh; 1191 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1192 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1193 }
1158 } else { 1194 } else {
1159 aio_unlink "$filename.pst"; 1195 aio_unlink "$filename.pst";
1160 } 1196 }
1161 1197
1162 aio_rename "$filename~", $filename; 1198 aio_rename "$filename~", $filename;
1199
1200 $filename =~ s%/[^/]+$%%;
1201 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1202 } else {
1164 warn "FATAL: $filename~: $!\n"; 1203 warn "unable to save objects: $filename~: $!\n";
1165 } 1204 }
1166 } else { 1205 } else {
1167 aio_unlink $filename; 1206 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1207 aio_unlink "$filename.pst";
1169 } 1208 }
1260 my ($name, $cb) = @_; 1299 my ($name, $cb) = @_;
1261 1300
1262 $EXTICMD{$name} = $cb; 1301 $EXTICMD{$name} = $cb;
1263} 1302}
1264 1303
1304use File::Glob ();
1305
1265cf::player->attach ( 1306cf::player->attach (
1266 on_command => sub { 1307 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1308 my ($pl, $name, $params) = @_;
1268 1309
1269 my $cb = $COMMAND{$name} 1310 my $cb = $COMMAND{$name}
1301 1342
1302 cf::override; 1343 cf::override;
1303 }, 1344 },
1304); 1345);
1305 1346
1347# "readahead" all extensions
1348sub cache_extensions {
1349 my $grp = IO::AIO::aio_group;
1350
1351 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1352 for (grep /\.ext$/, @{$_[0]}) {
1353 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1354 }
1355 };
1356
1357 $grp
1358}
1359
1306sub load_extensions { 1360sub load_extensions {
1307 cf::sync_job { 1361 cf::sync_job {
1308 my %todo; 1362 my %todo;
1309 1363
1310 for my $path (<$LIBDIR/*.ext>) { 1364 for my $path (<$LIBDIR/*.ext>) {
1329 1383
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1384 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1385 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1386
1333 $ext{source} = 1387 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1388 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1389 . "#line 1 \"$path\"\n{\n"
1336 . $source 1390 . $source
1337 . "\n};\n1"; 1391 . "\n};\n1";
1338 1392
1339 $todo{$base} = \%ext; 1393 $todo{$base} = \%ext;
1379 1433
1380=back 1434=back
1381 1435
1382=head2 CORE EXTENSIONS 1436=head2 CORE EXTENSIONS
1383 1437
1384Functions and methods that extend core crossfire objects. 1438Functions and methods that extend core deliantra objects.
1385 1439
1386=cut 1440=cut
1387 1441
1388package cf::player; 1442package cf::player;
1389 1443
1432 1486
1433sub exists($) { 1487sub exists($) {
1434 my ($login) = @_; 1488 my ($login) = @_;
1435 1489
1436 $cf::PLAYER{$login} 1490 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1491 or !aio_stat path $login
1438} 1492}
1439 1493
1440sub find($) { 1494sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1495 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1496 my $login = $_[0];
1454 my $f = new_from_file cf::object::thawer path $login 1508 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1509 or return;
1456 1510
1457 my $pl = cf::player::load_pl $f 1511 my $pl = cf::player::load_pl $f
1458 or return; 1512 or return;
1513
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1514 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1515 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1516 $cf::PLAYER{$login} = $pl
1462 } 1517 }
1463 } 1518 }
1473 1528
1474 return if $pl->{deny_save}; 1529 return if $pl->{deny_save};
1475 1530
1476 aio_mkdir playerdir $pl, 0770; 1531 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1532 $pl->{last_save} = $cf::RUNTIME;
1533
1534 cf::get_slot 0.01;
1478 1535
1479 $pl->save_pl ($path); 1536 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1537 cf::cede_to_tick;
1481} 1538}
1482 1539
1514 my ($pl) = @_; 1571 my ($pl) = @_;
1515 1572
1516 my $name = $pl->ob->name; 1573 my $name = $pl->ob->name;
1517 1574
1518 $pl->{deny_save} = 1; 1575 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1576 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1577
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1578 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1579 $pl->deactivate;
1580 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1581 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1582 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1583 $pl->ns->destroy if $pl->ns;
1525 1584
1526 my $path = playerdir $pl; 1585 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1586 my $temp = "$path~$cf::RUNTIME~deleting~";
1566 1625
1567 for my $login (@$dirs) { 1626 for my $login (@$dirs) {
1568 my $path = path $login; 1627 my $path = path $login;
1569 1628
1570 # a .pst is a dead give-away for a valid player 1629 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1630 # if no pst file found, open and chekc for blocked users
1631 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1632 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1633 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1634 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1635 }
1576 1636
1607 } 1667 }
1608 1668
1609 \@paths 1669 \@paths
1610} 1670}
1611 1671
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1672=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1673
1614Expand crossfire pod fragments into protocol xml. 1674Expand deliantra pod fragments into protocol xml.
1615
1616=cut
1617
1618use re 'eval';
1619
1620my $group;
1621my $interior; $interior = qr{
1622 # match a pod interior sequence sans C<< >>
1623 (?:
1624 \ (.*?)\ (?{ $group = $^N })
1625 | < (??{$interior}) >
1626 )
1627}x;
1628
1629sub expand_cfpod {
1630 my ($self, $pod) = @_;
1631
1632 my $xml;
1633
1634 while () {
1635 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?!<) )+ )/xgcs) {
1636 $group = $1;
1637
1638 $group =~ s/&/&amp;/g;
1639 $group =~ s/</&lt;/g;
1640
1641 $xml .= $group;
1642 } elsif ($pod =~ m%\G
1643 ([BCGHITU])
1644 <
1645 (?:
1646 ([^<>]*) (?{ $group = $^N })
1647 | < $interior >
1648 )
1649 >
1650 %gcsx
1651 ) {
1652 my ($code, $data) = ($1, $group);
1653
1654 if ($code eq "B") {
1655 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1656 } elsif ($code eq "I") {
1657 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1658 } elsif ($code eq "U") {
1659 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1660 } elsif ($code eq "C") {
1661 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1662 } elsif ($code eq "T") {
1663 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1664 } elsif ($code eq "G") {
1665 my ($male, $female) = split /\|/, $data;
1666 $data = $self->gender ? $female : $male;
1667 $xml .= expand_cfpod ($self, $data);
1668 } elsif ($code eq "H") {
1669 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1670 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1671 "")
1672 [$self->{hintmode}];
1673 } else {
1674 $xml .= "error processing '$code($data)' directive";
1675 }
1676 } else {
1677 if ($pod =~ /\G(.+)/) {
1678 warn "parse error while expanding $pod (at $1)";
1679 }
1680 last;
1681 }
1682 }
1683
1684 for ($xml) {
1685 # create single paragraphs (very hackish)
1686 s/(?<=\S)\n(?=\w)/ /g;
1687
1688 # compress some whitespace
1689 s/\s+\n/\n/g; # ws line-ends
1690 s/\n\n+/\n/g; # double lines
1691 s/^\n+//; # beginning lines
1692 s/\n+$//; # ending lines
1693 }
1694
1695 $xml
1696}
1697
1698no re 'eval';
1699
1700sub hintmode {
1701 $_[0]{hintmode} = $_[1] if @_ > 1;
1702 $_[0]{hintmode}
1703}
1704 1675
1705=item $player->ext_reply ($msgid, @msg) 1676=item $player->ext_reply ($msgid, @msg)
1706 1677
1707Sends an ext reply to the player. 1678Sends an ext reply to the player.
1708 1679
1921 1892
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1924} 1895}
1925 1896
1926# and all this just because we cannot iterate over
1927# all maps in C++...
1928sub change_all_map_light {
1929 my ($change) = @_;
1930
1931 $_->change_map_light ($change)
1932 for grep $_->outdoor, values %cf::MAP;
1933}
1934
1935sub decay_objects { 1897sub decay_objects {
1936 my ($self) = @_; 1898 my ($self) = @_;
1937 1899
1938 return if $self->{deny_reset}; 1900 return if $self->{deny_reset};
1939 1901
2021sub find { 1983sub find {
2022 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
2023 1985
2024 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
2025 1987
2026 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
2028 1990
2029 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
2030 my $guard1 = cf::lock_acquire "map_find:$path";
2031 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2032
2033 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
2034 or return; 1993 or return;
2035 1994
2036 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
2037 1996
2039 or return; 1998 or return;
2040 1999
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
2044 undef $guard1; 2004 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2005 $map->reset;
2047 return find $path; 2006 return find $path;
2048 } 2007 }
2049 2008
2050 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2037 $f->skip_block;
2079 $self->_load_objects ($f) 2038 $self->_load_objects ($f)
2080 or return; 2039 or return;
2081 2040
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
2083 if delete $self->{load_original}; 2042 if delete $self->{load_original};
2084 2043
2085 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2045 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2046 unless (aio_stat $uniq) {
2105 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2065 $self->decay_objects;
2107 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2108 $self->update_buttons; 2067 $self->update_buttons;
2109 cf::cede_to_tick; 2068 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2069 $self->activate;
2113 } 2070 }
2114 2071
2115 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
2117 2074
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2076 }
2120 2077
2121 $self->post_load; 2078 $self->post_load;
2122} 2079}
2123 2080
2181 my ($path, $origin, $load) = @_; 2138 my ($path, $origin, $load) = @_;
2182 2139
2183 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
2184 2141
2185 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2144 }
2188 2145
2189 $MAP_PREFETCH{$path} |= $load; 2146 $MAP_PREFETCH{$path} |= $load;
2190 2147
2191 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2228 cf::async { 2185 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2186 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
2231 }; 2188 };
2232 2189
2190 cf::get_slot 0.02;
2191
2233 if ($uniq) { 2192 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2195 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2196 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2245 $self->save; 2204 $self->save;
2246 2205
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2207
2249 return if $self->players; 2208 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2252 2211
2253 $self->in_memory (cf::MAP_SWAPPED); 2212 $self->in_memory (cf::MAP_SWAPPED);
2254 2213
2255 $self->deactivate; 2214 $self->deactivate;
2280 2239
2281 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282 2241
2283 return if $self->players; 2242 return if $self->players;
2284 2243
2285 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2286 2245
2287 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2288 2247
2289 # need to save uniques path 2248 # need to save uniques path
2290 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
2451can be C<undef>. Does the right thing when the player is currently in a 2410can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2411dialogue with the given NPC character.
2453 2412
2454=cut 2413=cut
2455 2414
2415our $SAY_CHANNEL = {
2416 id => "say",
2417 title => "Map",
2418 reply => "say ",
2419 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2420};
2421
2422our $CHAT_CHANNEL = {
2423 id => "chat",
2424 title => "Chat",
2425 reply => "chat ",
2426 tooltip => "Player chat and shouts, global to the server.",
2427};
2428
2456# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2430# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2431#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2433 my ($self, $npc, $msg, $flags) = @_;
2471 my $dialog = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2445 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2446
2474 } else { 2447 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2450 }
2478 } 2451 }
2479} 2452}
2480 2453
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2506 2479
2507=item $player_object->enter_link 2480=item $player_object->enter_link
2508 2481
2509Freezes the player and moves him/her to a special map (C<{link}>). 2482Freezes the player and moves him/her to a special map (C<{link}>).
2510 2483
2511The player should be reasonably safe there for short amounts of time. You 2484The player should be reasonably safe there for short amounts of time (e.g.
2512I<MUST> call C<leave_link> as soon as possible, though. 2485for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2486though, as the palyer cannot control the character while it is on the link
2487map.
2513 2488
2514Will never block. 2489Will never block.
2515 2490
2516=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2517 2492
2575 2550
2576 $map->load; 2551 $map->load;
2577 $map->load_neighbours; 2552 $map->load_neighbours;
2578 2553
2579 return unless $self->contr->active; 2554 return unless $self->contr->active;
2580 $self->activate_recursive;
2581 2555
2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2583 $self->enter_map ($map, $x, $y); 2557 $self->enter_map ($map, $x, $y);
2558
2559 # only activate afterwards, to support waiting in hooks
2560 $self->activate_recursive;
2584} 2561}
2585 2562
2586=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2587 2564
2588Moves the player to the given map-path and coordinates by first freezing 2565Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2567that has to return the map if sucecssful, and then unfreezes the player on
2591the new (success) or old (failed) map position. In either case, $done will 2568the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2569be called at the end of this process.
2570
2571Note that $check will be called with a potentially non-loaded map, so if
2572it needs a loaded map it has to call C<< ->load >>.
2593 2573
2594=cut 2574=cut
2595 2575
2596our $GOTOGEN; 2576our $GOTOGEN;
2597 2577
2676} 2656}
2677 2657
2678sub prepare_random_map { 2658sub prepare_random_map {
2679 my ($exit) = @_; 2659 my ($exit) = @_;
2680 2660
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2663 # that depends on the exit object
2686 2664
2687 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
2689 if ($exit->map) { 2667 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2694 } 2674 }
2695 2675
2696 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2697 2677
2698 my $data = cf::encode_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2701 2681
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2684 undef $fh;
2705 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2706 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2709 } 2693 }
2710} 2694}
2711 2695
2712sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2714 2698
2715 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2716 2700
2717 if ($exit->slaying eq "/!") {
2718 #TODO: this should de-fi-ni-te-ly not be a sync-job
2719 # the problem is that $exit might not survive long enough
2720 # so it needs to be done right now, right here
2721 cf::sync_job { prepare_random_map $exit };
2722 }
2723
2724 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2725 my $hp = $exit->stats->hp;
2726 my $sp = $exit->stats->sp;
2727
2728 $self->enter_link; 2701 $self->enter_link;
2729 2702
2730 # if exit is damned, update players death & WoR home-position
2731 $self->contr->savebed ($slaying, $hp, $sp)
2732 if $exit->flag (FLAG_DAMNED);
2733
2734 (async { 2703 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2704 $Coro::current->{desc} = "enter_exit";
2736 2705
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2706 unless (eval {
2707 $self->deactivate_recursive; # just to be sure
2708
2709 # random map handling
2710 {
2711 my $guard = cf::lock_acquire "exit_prepare:$exit";
2712
2713 prepare_random_map $exit
2714 if $exit->slaying eq "/!";
2715 }
2716
2717 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2718 my $x = $exit->stats->hp;
2719 my $y = $exit->stats->sp;
2720
2739 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2740 2722
2723 # if exit is damned, update players death & WoR home-position
2724 $self->contr->savebed ($map, $x, $y)
2725 if $exit->flag (cf::FLAG_DAMNED);
2726
2741 1; 2727 1
2742 }) { 2728 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2744 . "I'll try to bring you back to the map you were before. " 2730 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2747 2733
2748 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
2814 id => "infobox", 2800 id => "infobox",
2815 title => "Body Parts", 2801 title => "Body Parts",
2816 reply => undef, 2802 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2818 }, 2804 },
2805 "c/statistics" => {
2806 id => "infobox",
2807 title => "Statistics",
2808 reply => undef,
2809 tooltip => "Shows your primary statistics",
2810 },
2811 "c/skills" => {
2812 id => "infobox",
2813 title => "Skills",
2814 reply => undef,
2815 tooltip => "Shows your experience per skill and item power",
2816 },
2817 "c/shopitems" => {
2818 id => "infobox",
2819 title => "Shop Items",
2820 reply => undef,
2821 tooltip => "Shows the items currently for sale in this shop",
2822 },
2823 "c/resistances" => {
2824 id => "infobox",
2825 title => "Resistances",
2826 reply => undef,
2827 tooltip => "Shows your resistances",
2828 },
2829 "c/pets" => {
2830 id => "infobox",
2831 title => "Pets",
2832 reply => undef,
2833 tooltip => "Shows information abotu your pets/a specific pet",
2834 },
2835 "c/perceiveself" => {
2836 id => "infobox",
2837 title => "Perceive Self",
2838 reply => undef,
2839 tooltip => "You gained detailed knowledge about yourself",
2840 },
2819 "c/uptime" => { 2841 "c/uptime" => {
2820 id => "infobox", 2842 id => "infobox",
2821 title => "Uptime", 2843 title => "Uptime",
2822 reply => undef, 2844 reply => undef,
2823 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
2826 id => "infobox", 2848 id => "infobox",
2827 title => "Map Info", 2849 title => "Map Info",
2828 reply => undef, 2850 reply => undef,
2829 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2830 }, 2852 },
2853 "c/party" => {
2854 id => "party",
2855 title => "Party",
2856 reply => "gsay ",
2857 tooltip => "Messages and chat related to your party",
2858 },
2859 "c/death" => {
2860 id => "death",
2861 title => "Death",
2862 reply => undef,
2863 tooltip => "Reason for and more info about your most recent death",
2864 },
2865 "c/say" => $SAY_CHANNEL,
2866 "c/chat" => $CHAT_CHANNEL,
2831); 2867);
2832 2868
2833sub cf::client::send_msg { 2869sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2871
2836 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2837 2874
2838 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2839 2876
2840 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2843 2880
2844 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2848 2883
2849 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2850 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2851 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2852 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2853 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2854 if $self->can_msg;
2855 } 2889 }
2856 2890
2857 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2858 } 2892 }
2859 2893
2860 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2861 2895
2862 if ($self->can_msg) {
2863 # default colour, mask it out 2896 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2866 2899
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2869 } else { 2903 );
2870 if ($color >= 0) {
2871 # replace some tags by gcfclient-compatible ones
2872 for ($msg) {
2873 1 while
2874 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2875 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2876 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2877 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2878 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2879 }
2880 2904
2881 $color &= cf::NDI_COLOR_MASK; 2905 # try lzf for large packets
2906 $pkt = "lzf " . Compress::LZF::compress $pkt
2907 if 1024 <= length $pkt and $self->{can_lzf};
2882 2908
2883 utf8::encode $msg; 2909 # split very large packets
2884 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2885 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2886 # COMMAND/INFO 2912 $pkt = "frag";
2887 $self->send_packet ("drawextinfo $color 10 8 $msg")
2888 } else {
2889 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2890 $self->send_packet ("drawinfo $color $msg")
2891 }
2892 }
2893 } 2913 }
2914
2915 $self->send_packet ($pkt);
2894} 2916}
2895 2917
2896=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2897 2919
2898Sends an ext event to the client. 2920Sends an ext event to the client.
3072 3094
3073The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3074 3096
3075 cf::object 3097 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3098 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3100 value
3078 3101
3079 cf::object::player 3102 cf::object::player
3080 player 3103 player
3081 3104
3082 cf::player 3105 cf::player
3087 3110
3088=cut 3111=cut
3089 3112
3090for ( 3113for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3114 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3094 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3096 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3097) { 3120) {
3098 no strict 'refs'; 3121 no strict 'refs';
3099 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3100 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3117 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3118 3141
3119 my $qcode = $code; 3142 my $qcode = $code;
3120 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3121 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3122 3147
3123 local $_; 3148 local $_;
3124 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3125 3150
3126 my $eval = 3151 my $eval =
3306 while (my ($k, $v) = each %$want) { 3331 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3332 $ns->fx_want ($k, $v);
3308 } 3333 }
3309}; 3334};
3310 3335
3336sub load_resource_file($) {
3337 my $guard = lock_acquire "load_resource_file";
3338
3339 my $status = load_resource_file_ $_[0];
3340 get_slot 0.1, 100;
3341 cf::arch::commit_load;
3342
3343 $status
3344}
3345
3311sub reload_regions { 3346sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3347 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3348 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3350
3328} 3363}
3329 3364
3330sub reload_archetypes { 3365sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3367 or die "unable to load archetypes\n";
3333 #d# NEED to laod twice to resolve forward references
3334 # this really needs to be done in an extra post-pass
3335 # (which needs to be synchronous, so solve it differently)
3336 load_resource_file "$DATADIR/archetypes"
3337 or die "unable to load archetypes\n";
3338} 3368}
3339 3369
3340sub reload_treasures { 3370sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
3343} 3373}
3344 3374
3345sub reload_resources { 3375sub reload_resources {
3346 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
3347 3377
3378 reload_facedata;
3379 reload_archetypes;
3348 reload_regions; 3380 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3381 reload_treasures;
3353 3382
3354 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3355}
3356
3357sub init {
3358 reload_resources;
3359} 3384}
3360 3385
3361sub reload_config { 3386sub reload_config {
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3363 or return; 3388 or return;
3377 }; 3402 };
3378 warn $@ if $@; 3403 warn $@ if $@;
3379 } 3404 }
3380} 3405}
3381 3406
3407sub pidfile() {
3408 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3409 or die "$PIDFILE: $!";
3410 flock $fh, &Fcntl::LOCK_EX
3411 or die "$PIDFILE: flock: $!";
3412 $fh
3413}
3414
3415# make sure only one server instance is running at any one time
3416sub atomic {
3417 my $fh = pidfile;
3418
3419 my $pid = <$fh>;
3420 kill 9, $pid if $pid > 0;
3421
3422 seek $fh, 0, 0;
3423 print $fh $$;
3424}
3425
3426sub main_loop {
3427 warn "EV::loop starting\n";
3428 if (1) {
3429 EV::loop;
3430 }
3431 warn "EV::loop returned\n";
3432 goto &main_loop unless $REALLY_UNLOOP;
3433}
3434
3382sub main { 3435sub main {
3436 cf::init_globals; # initialise logging
3437
3438 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3439 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3440 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3441 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3442
3443 cf::init_experience;
3444 cf::init_anim;
3445 cf::init_attackmess;
3446 cf::init_dynamic;
3447
3448 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3449
3383 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3452 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3453 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3390 }; 3457 };
3391 3458
3392 reload_config;
3393 db_init;
3394 load_extensions;
3395
3396 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3397 evthread_start IO::AIO::poll_fileno; 3459 evthread_start IO::AIO::poll_fileno;
3398 EV::loop; 3460
3461 cf::sync_job {
3462 reload_resources;
3463 reload_config;
3464 db_init;
3465
3466 cf::load_settings;
3467 cf::load_materials;
3468 cf::init_uuid;
3469 cf::init_signals;
3470 cf::init_commands;
3471 cf::init_skills;
3472
3473 cf::init_beforeplay;
3474
3475 atomic;
3476
3477 load_extensions;
3478
3479 utime time, time, $RUNTIMEFILE;
3480
3481 # no (long-running) fork's whatsoever before this point(!)
3482 use POSIX ();
3483 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3484
3485 (pop @POST_INIT)->(0) while @POST_INIT;
3486 };
3487
3488 main_loop;
3399} 3489}
3400 3490
3401############################################################################# 3491#############################################################################
3402# initialisation and cleanup 3492# initialisation and cleanup
3403 3493
3410 }; 3500 };
3411 } 3501 }
3412} 3502}
3413 3503
3414sub write_runtime_sync { 3504sub write_runtime_sync {
3415 my $runtime = "$LOCALDIR/runtime";
3416
3417 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3418 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3419 3507
3420 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3421 3509
3422 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3423 3511
3424 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3425 or return; 3513 or return;
3426 3514
3427 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3428 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3429 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
3439 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3440 3528
3441 close $fh 3529 close $fh
3442 or return; 3530 or return;
3443 3531
3444 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3445 and return; 3533 and return;
3446 3534
3447 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3448 3536
3449 1 3537 1
3461 my $uuid = "$LOCALDIR/uuid"; 3549 my $uuid = "$LOCALDIR/uuid";
3462 3550
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return; 3552 or return;
3465 3553
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3554 my $value = uuid_seq uuid_cur;
3555
3556 unless ($value) {
3557 warn "cowardly refusing to write zero uuid value!\n";
3558 return;
3559 }
3560
3561 my $value = uuid_str $value + $uuid_skip;
3467 $uuid_skip = 0; 3562 $uuid_skip = 0;
3468 3563
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return; 3565 and return;
3471 3566
3493} 3588}
3494 3589
3495sub emergency_save() { 3590sub emergency_save() {
3496 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3497 3592
3498 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3499 3594
3500 cf::sync_job { 3595 cf::sync_job {
3596 # this is a trade-off: we want to be very quick here, so
3597 # save all maps without fsync, and later call a global sync
3598 # (which in turn might be very very slow)
3599 local $USE_FSYNC = 0;
3600
3501 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3502 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3503 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3504 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3505 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3506 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3507 $pl->valid or next; 3607 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3509 $pl->save; 3609 $pl->save;
3510 } 3610 }
3511 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3512 3612
3513 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3514 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3515 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3516 $map->valid or next; 3616 $map->valid or next;
3517 $map->save; 3617 $map->save;
3518 } 3618 }
3519 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3520 3620
3521 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3522 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3523 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3524 3624
3525 warn "begin write uuid\n"; 3625 warn "emergency_perl_save: begin write uuid\n";
3526 write_uuid_sync 1; 3626 write_uuid_sync 1;
3527 warn "end write uuid\n"; 3627 warn "emergency_perl_save: end write uuid\n";
3528 }; 3628 };
3529 3629
3630 warn "emergency_perl_save: starting sync()\n";
3631 IO::AIO::aio_sync sub {
3632 warn "emergency_perl_save: finished sync()\n";
3633 };
3634
3530 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3531} 3636}
3532 3637
3533sub post_cleanup { 3638sub post_cleanup {
3534 my ($make_core) = @_; 3639 my ($make_core) = @_;
3535 3640
3536 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3642 if $make_core;
3643
3644 my $fh = pidfile;
3645 unlink $PIDFILE if <$fh> == $$;
3646}
3647
3648# a safer delete_package, copied from Symbol
3649sub clear_package($) {
3650 my $pkg = shift;
3651
3652 # expand to full symbol table name if needed
3653 unless ($pkg =~ /^main::.*::$/) {
3654 $pkg = "main$pkg" if $pkg =~ /^::/;
3655 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3656 $pkg .= '::' unless $pkg =~ /::$/;
3657 }
3658
3659 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3660 my $stem_symtab = *{$stem}{HASH};
3661
3662 defined $stem_symtab and exists $stem_symtab->{$leaf}
3663 or return;
3664
3665 # clear all symbols
3666 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3667 for my $name (keys %$leaf_symtab) {
3668 _gv_clear *{"$pkg$name"};
3669# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3670 }
3671 warn "cleared package $pkg\n";#d#
3538} 3672}
3539 3673
3540sub do_reload_perl() { 3674sub do_reload_perl() {
3541 # can/must only be called in main 3675 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3544 return; 3678 return;
3545 } 3679 }
3546 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3547 warn "reloading..."; 3686 warn "reloading...";
3548 3687
3549 warn "entering sync_job"; 3688 warn "entering sync_job";
3550 3689
3551 cf::sync_job { 3690 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3692 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3555 3694
3556 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3697
3559 # if anything goes wrong in here, we should simply crash as we already saved 3698 # if anything goes wrong in here, we should simply crash as we already saved
3560 3699
3561 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3562 for (;;) {
3563 BDB::flush;
3564 IO::AIO::flush;
3565 Coro::cede_notself;
3566 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3568 }
3569
3570 ++$RELOAD;
3571
3572 warn "cancelling all extension coros";
3573 $_->cancel for values %EXT_CORO;
3574 %EXT_CORO = ();
3575
3576 warn "removing commands";
3577 %COMMAND = ();
3578
3579 warn "removing ext/exti commands";
3580 %EXTCMD = ();
3581 %EXTICMD = ();
3582
3583 warn "unloading/nuking all extensions";
3584 for my $pkg (@EXTS) {
3585 warn "... unloading $pkg";
3586
3587 if (my $cb = $pkg->can ("unload")) {
3588 eval {
3589 $cb->($pkg);
3590 1
3591 } or warn "$pkg unloaded, but with errors: $@";
3592 } 3703 }
3593 3704
3594 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3596 } 3707 %EXT_CORO = ();
3597 3708
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3719
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3609 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3610 } 3729 }
3611 3730
3612 Symbol::delete_package $k; 3731 warn "unloading all perl modules loaded from $LIBDIR";
3732 while (my ($k, $v) = each %INC) {
3733 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3734
3735 warn "... unloading $k";
3736 delete $INC{$k};
3737
3738 $k =~ s/\.pm$//;
3739 $k =~ s/\//::/g;
3740
3741 if (my $cb = $k->can ("unload_module")) {
3742 $cb->();
3743 }
3744
3745 clear_package $k;
3613 } 3746 }
3614 3747
3615 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3750 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3751
3619 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3622 3755
3623 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3757 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3626 3759
3627 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3628 3761
3629 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3630 require cf; 3763 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3632 3765
3633 warn "loading config and database again"; 3766 warn "loading config and database again";
3634 cf::reload_config; 3767 cf::reload_config;
3635 3768
3636 warn "loading extensions"; 3769 warn "loading extensions";
3637 cf::load_extensions; 3770 cf::load_extensions;
3638 3771
3772 if ($REATTACH_ON_RELOAD) {
3639 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3645 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3646 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3647 3785
3648 1 3786 1
3649 } or do { 3787 } or do {
3650 warn $@; 3788 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3652 }; 3790 };
3653 3791
3654 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3655}; 3798};
3656 3799
3657our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3658 3801
3659sub reload_perl() { 3802sub reload_perl() {
3660 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3661 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3662 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3664 do_reload_perl; 3810 do_reload_perl;
3665 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3666 }; 3813 };
3667} 3814}
3668 3815
3669register_command "reload" => sub { 3816register_command "reload" => sub {
3670 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3684 3831
3685our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3687 3834
3688sub wait_for_tick { 3835sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3691 3837
3692 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3840 $signal->wait;
3695} 3841}
3696 3842
3697sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3700 3845
3701 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3848 $signal->wait;
3704} 3849}
3743{ 3888{
3744 # configure BDB 3889 # configure BDB
3745 3890
3746 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3892 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3893 $AnyEvent::BDB::WATCHER->priority (1);
3749 3894
3750 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3898 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3899 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3902
3757 cf::sync_job { 3903 cf::sync_job {
3758 eval { 3904 eval {
3784{ 3930{
3785 # configure IO::AIO 3931 # configure IO::AIO
3786 3932
3787 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 3935 undef $AnyEvent::AIO::WATCHER;
3790} 3936}
3791 3937
3792my $_log_backtrace; 3938my $_log_backtrace;
3793 3939
3794sub _log_backtrace { 3940sub _log_backtrace {
3797 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3798 3944
3799 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3800 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3801 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3802 async { 3949 async {
3803 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3804 3951
3805 my @bt = fork_call { 3952 my @bt = fork_call {
3806 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3817 } 3964 }
3818 3965
3819 @funcs 3966 @funcs
3820 }; 3967 };
3821 3968
3822 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3823 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3824 --$_log_backtrace; 3972 --$_log_backtrace;
3825 }; 3973 };
3826 } else { 3974 } else {
3827 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3828 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3829 } 3977 }
3830} 3978}
3831 3979
3832# load additional modules 3980# load additional modules
3833use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3834 3982
3835END { cf::emergency_save } 3983END { cf::emergency_save }
3836 3984
38371 39851
3838 3986

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines