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.417 by root, Fri Apr 11 14:09:57 2008 UTC vs.
Revision 1.482 by root, Sun Oct 11 05:31:54 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 match 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} = { map +($_ => undef), 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
1775our $MAX_RESET = 3600; 1746our $MAX_RESET = 3600;
1776our $DEFAULT_RESET = 3000; 1747our $DEFAULT_RESET = 3000;
1777 1748
1778sub generate_random_map { 1749sub generate_random_map {
1779 my ($self, $rmp) = @_; 1750 my ($self, $rmp) = @_;
1751
1752 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1753
1780 # mit "rum" bekleckern, nicht 1754 # mit "rum" bekleckern, nicht
1781 $self->_create_random_map ( 1755 $self->_create_random_map (
1782 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1756 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1783 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1757 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle},
1784 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1758 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1906 1880
1907# the temporary/swap location 1881# the temporary/swap location
1908sub save_path { 1882sub save_path {
1909 my ($self) = @_; 1883 my ($self) = @_;
1910 1884
1911 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1885 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1912 "$TMPDIR/$path.map" 1886 "$TMPDIR/$path.map"
1913} 1887}
1914 1888
1915# the unique path, undef == no special unique path 1889# the unique path, undef == no special unique path
1916sub uniq_path { 1890sub uniq_path {
1917 my ($self) = @_; 1891 my ($self) = @_;
1918 1892
1919 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1893 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1920 "$UNIQUEDIR/$path" 1894 "$UNIQUEDIR/$path"
1921}
1922
1923# and all this just because we cannot iterate over
1924# all maps in C++...
1925sub change_all_map_light {
1926 my ($change) = @_;
1927
1928 $_->change_map_light ($change)
1929 for grep $_->outdoor, values %cf::MAP;
1930} 1895}
1931 1896
1932sub decay_objects { 1897sub decay_objects {
1933 my ($self) = @_; 1898 my ($self) = @_;
1934 1899
2018sub find { 1983sub find {
2019 my ($path, $origin) = @_; 1984 my ($path, $origin) = @_;
2020 1985
2021 $path = normalise $path, $origin && $origin->path; 1986 $path = normalise $path, $origin && $origin->path;
2022 1987
2023 cf::lock_wait "map_data:$path";#d#remove 1988 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2024 cf::lock_wait "map_find:$path"; 1989 my $guard2 = cf::lock_acquire "map_find:$path";
2025 1990
2026 $cf::MAP{$path} || do { 1991 $cf::MAP{$path} || do {
2027 my $guard1 = cf::lock_acquire "map_find:$path";
2028 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
2029
2030 my $map = new_from_path cf::map $path 1992 my $map = new_from_path cf::map $path
2031 or return; 1993 or return;
2032 1994
2033 $map->{last_save} = $cf::RUNTIME; 1995 $map->{last_save} = $cf::RUNTIME;
2034 1996
2036 or return; 1998 or return;
2037 1999
2038 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2000 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2039 # doing this can freeze the server in a sync job, obviously 2001 # doing this can freeze the server in a sync job, obviously
2040 #$cf::WAIT_FOR_TICK->wait; 2002 #$cf::WAIT_FOR_TICK->wait;
2003 undef $guard2;
2041 undef $guard1; 2004 undef $guard1;
2042 undef $guard2;
2043 $map->reset; 2005 $map->reset;
2044 return find $path; 2006 return find $path;
2045 } 2007 }
2046 2008
2047 $cf::MAP{$path} = $map 2009 $cf::MAP{$path} = $map
2074 my $f = new_from_file cf::object::thawer $self->{load_path}; 2036 my $f = new_from_file cf::object::thawer $self->{load_path};
2075 $f->skip_block; 2037 $f->skip_block;
2076 $self->_load_objects ($f) 2038 $self->_load_objects ($f)
2077 or return; 2039 or return;
2078 2040
2079 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2041 $self->post_load_original
2080 if delete $self->{load_original}; 2042 if delete $self->{load_original};
2081 2043
2082 if (my $uniq = $self->uniq_path) { 2044 if (my $uniq = $self->uniq_path) {
2083 utf8::encode $uniq; 2045 utf8::encode $uniq;
2084 unless (aio_stat $uniq) { 2046 unless (aio_stat $uniq) {
2102 unless ($self->{deny_activate}) { 2064 unless ($self->{deny_activate}) {
2103 $self->decay_objects; 2065 $self->decay_objects;
2104 $self->fix_auto_apply; 2066 $self->fix_auto_apply;
2105 $self->update_buttons; 2067 $self->update_buttons;
2106 cf::cede_to_tick; 2068 cf::cede_to_tick;
2107 $self->set_darkness_map;
2108 cf::cede_to_tick;
2109 $self->activate; 2069 $self->activate;
2110 } 2070 }
2111 2071
2112 $self->{last_save} = $cf::RUNTIME; 2072 $self->{last_save} = $cf::RUNTIME;
2113 $self->last_access ($cf::RUNTIME); 2073 $self->last_access ($cf::RUNTIME);
2114 2074
2115 $self->in_memory (cf::MAP_IN_MEMORY); 2075 $self->in_memory (cf::MAP_ACTIVE);
2116 } 2076 }
2117 2077
2118 $self->post_load; 2078 $self->post_load;
2119} 2079}
2120 2080
2178 my ($path, $origin, $load) = @_; 2138 my ($path, $origin, $load) = @_;
2179 2139
2180 $path = normalise $path, $origin && $origin->{path}; 2140 $path = normalise $path, $origin && $origin->{path};
2181 2141
2182 if (my $map = $cf::MAP{$path}) { 2142 if (my $map = $cf::MAP{$path}) {
2183 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2143 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2184 } 2144 }
2185 2145
2186 $MAP_PREFETCH{$path} |= $load; 2146 $MAP_PREFETCH{$path} |= $load;
2187 2147
2188 $MAP_PREFETCHER ||= cf::async { 2148 $MAP_PREFETCHER ||= cf::async {
2225 cf::async { 2185 cf::async {
2226 $Coro::current->{desc} = "map player save"; 2186 $Coro::current->{desc} = "map player save";
2227 $_->contr->save for $self->players; 2187 $_->contr->save for $self->players;
2228 }; 2188 };
2229 2189
2190 cf::get_slot 0.02;
2191
2230 if ($uniq) { 2192 if ($uniq) {
2231 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2193 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2232 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2194 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2233 } else { 2195 } else {
2234 $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);
2242 $self->save; 2204 $self->save;
2243 2205
2244 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2206 my $lock = cf::lock_acquire "map_data:$self->{path}";
2245 2207
2246 return if $self->players; 2208 return if $self->players;
2247 return if $self->in_memory != cf::MAP_IN_MEMORY; 2209 return if $self->in_memory != cf::MAP_ACTIVE;
2248 return if $self->{deny_save}; 2210 return if $self->{deny_save};
2249 2211
2250 $self->in_memory (cf::MAP_SWAPPED); 2212 $self->in_memory (cf::MAP_SWAPPED);
2251 2213
2252 $self->deactivate; 2214 $self->deactivate;
2277 2239
2278 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2240 my $lock = cf::lock_acquire "map_data:$self->{path}";
2279 2241
2280 return if $self->players; 2242 return if $self->players;
2281 2243
2282 warn "resetting map ", $self->path; 2244 warn "resetting map ", $self->path, "\n";
2283 2245
2284 $self->in_memory (cf::MAP_SWAPPED); 2246 $self->in_memory (cf::MAP_SWAPPED);
2285 2247
2286 # need to save uniques path 2248 # need to save uniques path
2287 unless ($self->{deny_save}) { 2249 unless ($self->{deny_save}) {
2370 2332
2371sub unique_maps() { 2333sub unique_maps() {
2372 [ 2334 [
2373 map { 2335 map {
2374 utf8::decode $_; 2336 utf8::decode $_;
2375 /\.map$/ 2337 s/\.map$//; # TODO future compatibility hack
2338 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2339 ? ()
2376 ? normalise $_ 2340 : normalise $_
2377 : ()
2378 } @{ aio_readdir $UNIQUEDIR or [] } 2341 } @{ aio_readdir $UNIQUEDIR or [] }
2379 ] 2342 ]
2380} 2343}
2381 2344
2382=back 2345=back
2389 2352
2390=over 4 2353=over 4
2391 2354
2392=item $ob->inv_recursive 2355=item $ob->inv_recursive
2393 2356
2394Returns the inventory of the object _and_ their inventories, recursively. 2357Returns the inventory of the object I<and> their inventories, recursively,
2358but I<not> the object itself.
2395 2359
2396=cut 2360=cut
2397 2361
2398sub inv_recursive_; 2362sub inv_recursive_;
2399sub inv_recursive_ { 2363sub inv_recursive_ {
2404 inv_recursive_ inv $_[0] 2368 inv_recursive_ inv $_[0]
2405} 2369}
2406 2370
2407=item $ref = $ob->ref 2371=item $ref = $ob->ref
2408 2372
2409creates and returns a persistent reference to an objetc that can be stored as a string. 2373Creates and returns a persistent reference to an object that can be stored as a string.
2410 2374
2411=item $ob = cf::object::deref ($refstring) 2375=item $ob = cf::object::deref ($refstring)
2412 2376
2413returns the objetc referenced by refstring. may return undef when it cnanot find the object, 2377returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2414even if the object actually exists. May block. 2378even if the object actually exists. May block.
2446can 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
2447dialogue with the given NPC character. 2411dialogue with the given NPC character.
2448 2412
2449=cut 2413=cut
2450 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
2451# rough implementation of a future "reply" method that works 2429# rough implementation of a future "reply" method that works
2452# with dialog boxes. 2430# with dialog boxes.
2453#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
2454sub cf::object::player::reply($$$;$) { 2432sub cf::object::player::reply($$$;$) {
2455 my ($self, $npc, $msg, $flags) = @_; 2433 my ($self, $npc, $msg, $flags) = @_;
2466 my $dialog = $pl->{npc_dialog}; 2444 my $dialog = $pl->{npc_dialog};
2467 $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));
2468 2446
2469 } else { 2447 } else {
2470 $msg = $npc->name . " says: $msg" if $npc; 2448 $msg = $npc->name . " says: $msg" if $npc;
2471 $self->message ($msg, $flags); 2449 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2472 } 2450 }
2473 } 2451 }
2474} 2452}
2475 2453
2476=item $object->send_msg ($channel, $msg, $color, [extra...]) 2454=item $object->send_msg ($channel, $msg, $color, [extra...])
2501 2479
2502=item $player_object->enter_link 2480=item $player_object->enter_link
2503 2481
2504Freezes 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}>).
2505 2483
2506The 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.
2507I<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.
2508 2488
2509Will never block. 2489Will never block.
2510 2490
2511=item $player_object->leave_link ($map, $x, $y) 2491=item $player_object->leave_link ($map, $x, $y)
2512 2492
2570 2550
2571 $map->load; 2551 $map->load;
2572 $map->load_neighbours; 2552 $map->load_neighbours;
2573 2553
2574 return unless $self->contr->active; 2554 return unless $self->contr->active;
2575 $self->activate_recursive;
2576 2555
2577 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2556 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2578 $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;
2579} 2561}
2580 2562
2581=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2563=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2582 2564
2583Moves 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
2584her, loading and preparing them map, calling the provided $check callback 2566her, loading and preparing them map, calling the provided $check callback
2585that 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
2586the 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
2587be 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 >>.
2588 2573
2589=cut 2574=cut
2590 2575
2591our $GOTOGEN; 2576our $GOTOGEN;
2592 2577
2671} 2656}
2672 2657
2673sub prepare_random_map { 2658sub prepare_random_map {
2674 my ($exit) = @_; 2659 my ($exit) = @_;
2675 2660
2676 my $guard = cf::lock_acquire "exit_prepare:$exit";
2677
2678 # all this does is basically replace the /! path by 2661 # all this does is basically replace the /! path by
2679 # a new random map path (?random/...) with a seed 2662 # a new random map path (?random/...) with a seed
2680 # that depends on the exit object 2663 # that depends on the exit object
2681 2664
2682 my $rmp = parse_random_map_params $exit->msg; 2665 my $rmp = parse_random_map_params $exit->msg;
2684 if ($exit->map) { 2667 if ($exit->map) {
2685 $rmp->{region} = $exit->region->name; 2668 $rmp->{region} = $exit->region->name;
2686 $rmp->{origin_map} = $exit->map->path; 2669 $rmp->{origin_map} = $exit->map->path;
2687 $rmp->{origin_x} = $exit->x; 2670 $rmp->{origin_x} = $exit->x;
2688 $rmp->{origin_y} = $exit->y; 2671 $rmp->{origin_y} = $exit->y;
2672
2673 $exit->map->touch;
2689 } 2674 }
2690 2675
2691 $rmp->{random_seed} ||= $exit->random_seed; 2676 $rmp->{random_seed} ||= $exit->random_seed;
2692 2677
2693 my $data = cf::encode_json $rmp; 2678 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2694 my $md5 = Digest::MD5::md5_hex $data; 2679 my $md5 = Digest::MD5::md5_hex $data;
2695 my $meta = "$RANDOMDIR/$md5.meta"; 2680 my $meta = "$RANDOMDIR/$md5.meta";
2696 2681
2697 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2682 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2698 aio_write $fh, 0, (length $data), $data, 0; 2683 aio_write $fh, 0, (length $data), $data, 0;
2699 undef $fh; 2684 undef $fh;
2700 aio_rename "$meta~", $meta; 2685 aio_rename "$meta~", $meta;
2701 2686
2687 my $slaying = "?random/$md5";
2688
2689 if ($exit->valid) {
2702 $exit->slaying ("?random/$md5"); 2690 $exit->slaying ("?random/$md5");
2703 $exit->msg (undef); 2691 $exit->msg (undef);
2692 }
2704 } 2693 }
2705} 2694}
2706 2695
2707sub cf::object::player::enter_exit { 2696sub cf::object::player::enter_exit {
2708 my ($self, $exit) = @_; 2697 my ($self, $exit) = @_;
2709 2698
2710 return unless $self->type == cf::PLAYER; 2699 return unless $self->type == cf::PLAYER;
2711 2700
2712 if ($exit->slaying eq "/!") {
2713 #TODO: this should de-fi-ni-te-ly not be a sync-job
2714 # the problem is that $exit might not survive long enough
2715 # so it needs to be done right now, right here
2716 cf::sync_job { prepare_random_map $exit };
2717 }
2718
2719 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2720 my $hp = $exit->stats->hp;
2721 my $sp = $exit->stats->sp;
2722
2723 $self->enter_link; 2701 $self->enter_link;
2724 2702
2725 # if exit is damned, update players death & WoR home-position
2726 $self->contr->savebed ($slaying, $hp, $sp)
2727 if $exit->flag (FLAG_DAMNED);
2728
2729 (async { 2703 (async {
2730 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2704 $Coro::current->{desc} = "enter_exit";
2731 2705
2732 $self->deactivate_recursive; # just to be sure
2733 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
2734 $self->goto ($slaying, $hp, $sp); 2721 $self->goto ($map, $x, $y);
2735 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
2736 1; 2727 1
2737 }) { 2728 }) {
2738 $self->message ("Something went wrong deep within the crossfire server. " 2729 $self->message ("Something went wrong deep within the deliantra server. "
2739 . "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. "
2740 . "Please report this to the dungeon master!", 2731 . "Please report this to the dungeon master!",
2741 cf::NDI_UNIQUE | cf::NDI_RED); 2732 cf::NDI_UNIQUE | cf::NDI_RED);
2742 2733
2743 warn "ERROR in enter_exit: $@"; 2734 warn "ERROR in enter_exit: $@";
2809 id => "infobox", 2800 id => "infobox",
2810 title => "Body Parts", 2801 title => "Body Parts",
2811 reply => undef, 2802 reply => undef,
2812 tooltip => "Shows which body parts you posess and are available", 2803 tooltip => "Shows which body parts you posess and are available",
2813 }, 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 },
2814 "c/uptime" => { 2841 "c/uptime" => {
2815 id => "infobox", 2842 id => "infobox",
2816 title => "Uptime", 2843 title => "Uptime",
2817 reply => undef, 2844 reply => undef,
2818 tooltip => "How long the server has been running since last restart", 2845 tooltip => "How long the server has been running since last restart",
2821 id => "infobox", 2848 id => "infobox",
2822 title => "Map Info", 2849 title => "Map Info",
2823 reply => undef, 2850 reply => undef,
2824 tooltip => "Information related to the maps", 2851 tooltip => "Information related to the maps",
2825 }, 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,
2826); 2867);
2827 2868
2828sub cf::client::send_msg { 2869sub cf::client::send_msg {
2829 my ($self, $channel, $msg, $color, @extra) = @_; 2870 my ($self, $channel, $msg, $color, @extra) = @_;
2830 2871
2831 $msg = $self->pl->expand_cfpod ($msg); 2872 $msg = $self->pl->expand_cfpod ($msg)
2873 unless $color & cf::NDI_VERBATIM;
2832 2874
2833 $color &= cf::NDI_CLIENT_MASK; # just in case... 2875 $color &= cf::NDI_CLIENT_MASK; # just in case...
2834 2876
2835 # check predefined channels, for the benefit of C 2877 # check predefined channels, for the benefit of C
2836 if ($CHANNEL{$channel}) { 2878 if ($CHANNEL{$channel}) {
2837 $channel = $CHANNEL{$channel}; 2879 $channel = $CHANNEL{$channel};
2838 2880
2839 $self->ext_msg (channel_info => $channel) 2881 $self->ext_msg (channel_info => $channel);
2840 if $self->can_msg;
2841
2842 $channel = $channel->{id}; 2882 $channel = $channel->{id};
2843 2883
2844 } elsif (ref $channel) { 2884 } elsif (ref $channel) {
2845 # send meta info to client, if not yet sent 2885 # send meta info to client, if not yet sent
2846 unless (exists $self->{channel}{$channel->{id}}) { 2886 unless (exists $self->{channel}{$channel->{id}}) {
2847 $self->{channel}{$channel->{id}} = $channel; 2887 $self->{channel}{$channel->{id}} = $channel;
2848 $self->ext_msg (channel_info => $channel) 2888 $self->ext_msg (channel_info => $channel);
2849 if $self->can_msg;
2850 } 2889 }
2851 2890
2852 $channel = $channel->{id}; 2891 $channel = $channel->{id};
2853 } 2892 }
2854 2893
2855 return unless @extra || length $msg; 2894 return unless @extra || length $msg;
2856 2895
2857 if ($self->can_msg) {
2858 # default colour, mask it out 2896 # default colour, mask it out
2859 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2897 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2860 if $color & cf::NDI_DEF; 2898 if $color & cf::NDI_DEF;
2861 2899
2862 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2900 my $pkt = "msg "
2901 . $self->{json_coder}->encode (
2863 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2902 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2864 } else { 2903 );
2865 if ($color >= 0) {
2866 # replace some tags by gcfclient-compatible ones
2867 for ($msg) {
2868 1 while
2869 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2870 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2871 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2872 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2873 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2874 }
2875 2904
2876 $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};
2877 2908
2878 utf8::encode $msg; 2909 # split very large packets
2879 2910 if (8192 < length $pkt and $self->{can_lzf}) {
2880 if (0 && $msg =~ /\[/) { 2911 $self->send_packet ("frag $_") for unpack "(a8192)*", $pkt;
2881 # COMMAND/INFO 2912 $pkt = "frag";
2882 $self->send_packet ("drawextinfo $color 10 8 $msg")
2883 } else {
2884 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2885 $self->send_packet ("drawinfo $color $msg")
2886 }
2887 }
2888 } 2913 }
2914
2915 $self->send_packet ($pkt);
2889} 2916}
2890 2917
2891=item $client->ext_msg ($type, @msg) 2918=item $client->ext_msg ($type, @msg)
2892 2919
2893Sends an ext event to the client. 2920Sends an ext event to the client.
3067 3094
3068The following functions and methods are available within a safe environment: 3095The following functions and methods are available within a safe environment:
3069 3096
3070 cf::object 3097 cf::object
3071 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
3072 insert remove name archname title slaying race decrease_ob_nr 3099 insert remove name archname title slaying race decrease split
3100 value
3073 3101
3074 cf::object::player 3102 cf::object::player
3075 player 3103 player
3076 3104
3077 cf::player 3105 cf::player
3082 3110
3083=cut 3111=cut
3084 3112
3085for ( 3113for (
3086 ["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
3087 insert remove inv name archname title slaying race 3115 insert remove inv nrof name archname title slaying race
3088 decrease_ob_nr destroy)], 3116 decrease split destroy change_exp value msg lore send_msg)],
3089 ["cf::object::player" => qw(player)], 3117 ["cf::object::player" => qw(player)],
3090 ["cf::player" => qw(peaceful)], 3118 ["cf::player" => qw(peaceful send_msg)],
3091 ["cf::map" => qw(trigger)], 3119 ["cf::map" => qw(trigger)],
3092) { 3120) {
3093 no strict 'refs'; 3121 no strict 'refs';
3094 my ($pkg, @funs) = @$_; 3122 my ($pkg, @funs) = @$_;
3095 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3123 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
3112 my ($code, %vars) = @_; 3140 my ($code, %vars) = @_;
3113 3141
3114 my $qcode = $code; 3142 my $qcode = $code;
3115 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3143 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3116 $qcode =~ s/\n/\\n/g; 3144 $qcode =~ s/\n/\\n/g;
3145
3146 %vars = (_dummy => 0) unless %vars;
3117 3147
3118 local $_; 3148 local $_;
3119 local @safe::cf::_safe_eval_args = values %vars; 3149 local @safe::cf::_safe_eval_args = values %vars;
3120 3150
3121 my $eval = 3151 my $eval =
3301 while (my ($k, $v) = each %$want) { 3331 while (my ($k, $v) = each %$want) {
3302 $ns->fx_want ($k, $v); 3332 $ns->fx_want ($k, $v);
3303 } 3333 }
3304}; 3334};
3305 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
3306sub reload_regions { 3346sub reload_regions {
3307 # 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
3308 # for this (global event?) 3348 # for this (global event?)
3309 %ext::player_env::MUSIC_FACE_CACHE = (); 3349 %ext::player_env::MUSIC_FACE_CACHE = ();
3310 3350
3323} 3363}
3324 3364
3325sub reload_archetypes { 3365sub reload_archetypes {
3326 load_resource_file "$DATADIR/archetypes" 3366 load_resource_file "$DATADIR/archetypes"
3327 or die "unable to load archetypes\n"; 3367 or die "unable to load archetypes\n";
3328 #d# NEED to laod twice to resolve forward references
3329 # this really needs to be done in an extra post-pass
3330 # (which needs to be synchronous, so solve it differently)
3331 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n";
3333} 3368}
3334 3369
3335sub reload_treasures { 3370sub reload_treasures {
3336 load_resource_file "$DATADIR/treasures" 3371 load_resource_file "$DATADIR/treasures"
3337 or die "unable to load treasurelists\n"; 3372 or die "unable to load treasurelists\n";
3338} 3373}
3339 3374
3340sub reload_resources { 3375sub reload_resources {
3341 warn "reloading resource files...\n"; 3376 warn "reloading resource files...\n";
3342 3377
3378 reload_facedata;
3379 reload_archetypes;
3343 reload_regions; 3380 reload_regions;
3344 reload_facedata;
3345 #reload_archetypes;#d#
3346 reload_archetypes;
3347 reload_treasures; 3381 reload_treasures;
3348 3382
3349 warn "finished reloading resource files\n"; 3383 warn "finished reloading resource files\n";
3350}
3351
3352sub init {
3353 reload_resources;
3354} 3384}
3355 3385
3356sub reload_config { 3386sub reload_config {
3357 open my $fh, "<:utf8", "$CONFDIR/config" 3387 open my $fh, "<:utf8", "$CONFDIR/config"
3358 or return; 3388 or return;
3372 }; 3402 };
3373 warn $@ if $@; 3403 warn $@ if $@;
3374 } 3404 }
3375} 3405}
3376 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
3377sub 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
3378 # we must not ever block the main coroutine 3450 # we must not ever block the main coroutine
3379 local $Coro::idle = sub { 3451 local $Coro::idle = sub {
3380 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#
3381 (async { 3453 (async {
3382 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3454 $Coro::current->{desc} = "IDLE BUG HANDLER";
3383 EV::loop EV::LOOP_ONESHOT; 3455 EV::loop EV::LOOP_ONESHOT;
3384 })->prio (Coro::PRIO_MAX); 3456 })->prio (Coro::PRIO_MAX);
3385 }; 3457 };
3386 3458
3387 reload_config;
3388 db_init;
3389 load_extensions;
3390
3391 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3392 evthread_start IO::AIO::poll_fileno; 3459 evthread_start IO::AIO::poll_fileno;
3393 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;
3394} 3489}
3395 3490
3396############################################################################# 3491#############################################################################
3397# initialisation and cleanup 3492# initialisation and cleanup
3398 3493
3405 }; 3500 };
3406 } 3501 }
3407} 3502}
3408 3503
3409sub write_runtime_sync { 3504sub write_runtime_sync {
3410 my $runtime = "$LOCALDIR/runtime";
3411
3412 # first touch the runtime file to show we are still running: 3505 # first touch the runtime file to show we are still running:
3413 # the fsync below can take a very very long time. 3506 # the fsync below can take a very very long time.
3414 3507
3415 IO::AIO::aio_utime $runtime, undef, undef; 3508 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3416 3509
3417 my $guard = cf::lock_acquire "write_runtime"; 3510 my $guard = cf::lock_acquire "write_runtime";
3418 3511
3419 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3512 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3420 or return; 3513 or return;
3421 3514
3422 my $value = $cf::RUNTIME + 90 + 10; 3515 my $value = $cf::RUNTIME + 90 + 10;
3423 # 10 is the runtime save interval, for a monotonic clock 3516 # 10 is the runtime save interval, for a monotonic clock
3424 # 60 allows for the watchdog to kill the server. 3517 # 60 allows for the watchdog to kill the server.
3434 aio_utime $fh, undef, undef; 3527 aio_utime $fh, undef, undef;
3435 3528
3436 close $fh 3529 close $fh
3437 or return; 3530 or return;
3438 3531
3439 aio_rename "$runtime~", $runtime 3532 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3440 and return; 3533 and return;
3441 3534
3442 warn "runtime file written.\n"; 3535 warn "runtime file written.\n";
3443 3536
3444 1 3537 1
3456 my $uuid = "$LOCALDIR/uuid"; 3549 my $uuid = "$LOCALDIR/uuid";
3457 3550
3458 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3551 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3459 or return; 3552 or return;
3460 3553
3461 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;
3462 $uuid_skip = 0; 3562 $uuid_skip = 0;
3463 3563
3464 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3564 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3465 and return; 3565 and return;
3466 3566
3488} 3588}
3489 3589
3490sub emergency_save() { 3590sub emergency_save() {
3491 my $freeze_guard = cf::freeze_mainloop; 3591 my $freeze_guard = cf::freeze_mainloop;
3492 3592
3493 warn "enter emergency perl save\n"; 3593 warn "emergency_perl_save: enter\n";
3494 3594
3495 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
3496 # use a peculiar iteration method to avoid tripping on perl 3601 # use a peculiar iteration method to avoid tripping on perl
3497 # refcount bugs in for. also avoids problems with players 3602 # refcount bugs in for. also avoids problems with players
3498 # and maps saved/destroyed asynchronously. 3603 # and maps saved/destroyed asynchronously.
3499 warn "begin emergency player save\n"; 3604 warn "emergency_perl_save: begin player save\n";
3500 for my $login (keys %cf::PLAYER) { 3605 for my $login (keys %cf::PLAYER) {
3501 my $pl = $cf::PLAYER{$login} or next; 3606 my $pl = $cf::PLAYER{$login} or next;
3502 $pl->valid or next; 3607 $pl->valid or next;
3503 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3608 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3504 $pl->save; 3609 $pl->save;
3505 } 3610 }
3506 warn "end emergency player save\n"; 3611 warn "emergency_perl_save: end player save\n";
3507 3612
3508 warn "begin emergency map save\n"; 3613 warn "emergency_perl_save: begin map save\n";
3509 for my $path (keys %cf::MAP) { 3614 for my $path (keys %cf::MAP) {
3510 my $map = $cf::MAP{$path} or next; 3615 my $map = $cf::MAP{$path} or next;
3511 $map->valid or next; 3616 $map->valid or next;
3512 $map->save; 3617 $map->save;
3513 } 3618 }
3514 warn "end emergency map save\n"; 3619 warn "emergency_perl_save: end map save\n";
3515 3620
3516 warn "begin emergency database checkpoint\n"; 3621 warn "emergency_perl_save: begin database checkpoint\n";
3517 BDB::db_env_txn_checkpoint $DB_ENV; 3622 BDB::db_env_txn_checkpoint $DB_ENV;
3518 warn "end emergency database checkpoint\n"; 3623 warn "emergency_perl_save: end database checkpoint\n";
3519 3624
3520 warn "begin write uuid\n"; 3625 warn "emergency_perl_save: begin write uuid\n";
3521 write_uuid_sync 1; 3626 write_uuid_sync 1;
3522 warn "end write uuid\n"; 3627 warn "emergency_perl_save: end write uuid\n";
3523 }; 3628 };
3524 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
3525 warn "leave emergency perl save\n"; 3635 warn "emergency_perl_save: leave\n";
3526} 3636}
3527 3637
3528sub post_cleanup { 3638sub post_cleanup {
3529 my ($make_core) = @_; 3639 my ($make_core) = @_;
3530 3640
3531 warn Carp::longmess "post_cleanup backtrace" 3641 warn Carp::longmess "post_cleanup backtrace"
3532 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#
3533} 3672}
3534 3673
3535sub do_reload_perl() { 3674sub do_reload_perl() {
3536 # can/must only be called in main 3675 # can/must only be called in main
3537 if ($Coro::current != $Coro::main) { 3676 if ($Coro::current != $Coro::main) {
3538 warn "can only reload from main coroutine"; 3677 warn "can only reload from main coroutine";
3539 return; 3678 return;
3540 } 3679 }
3541 3680
3681 return if $RELOAD++;
3682
3683 my $t1 = EV::time;
3684
3685 while ($RELOAD) {
3542 warn "reloading..."; 3686 warn "reloading...";
3543 3687
3544 warn "entering sync_job"; 3688 warn "entering sync_job";
3545 3689
3546 cf::sync_job { 3690 cf::sync_job {
3547 cf::write_runtime_sync; # external watchdog should not bark 3691 cf::write_runtime_sync; # external watchdog should not bark
3548 cf::emergency_save; 3692 cf::emergency_save;
3549 cf::write_runtime_sync; # external watchdog should not bark 3693 cf::write_runtime_sync; # external watchdog should not bark
3550 3694
3551 warn "syncing database to disk"; 3695 warn "syncing database to disk";
3552 BDB::db_env_txn_checkpoint $DB_ENV; 3696 BDB::db_env_txn_checkpoint $DB_ENV;
3553 3697
3554 # 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
3555 3699
3556 warn "flushing outstanding aio requests"; 3700 warn "flushing outstanding aio requests";
3557 for (;;) {
3558 BDB::flush;
3559 IO::AIO::flush;
3560 Coro::cede_notself;
3561 last unless IO::AIO::nreqs || BDB::nreqs; 3701 while (IO::AIO::nreqs || BDB::nreqs) {
3562 warn "iterate..."; 3702 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3563 }
3564
3565 ++$RELOAD;
3566
3567 warn "cancelling all extension coros";
3568 $_->cancel for values %EXT_CORO;
3569 %EXT_CORO = ();
3570
3571 warn "removing commands";
3572 %COMMAND = ();
3573
3574 warn "removing ext/exti commands";
3575 %EXTCMD = ();
3576 %EXTICMD = ();
3577
3578 warn "unloading/nuking all extensions";
3579 for my $pkg (@EXTS) {
3580 warn "... unloading $pkg";
3581
3582 if (my $cb = $pkg->can ("unload")) {
3583 eval {
3584 $cb->($pkg);
3585 1
3586 } or warn "$pkg unloaded, but with errors: $@";
3587 } 3703 }
3588 3704
3589 warn "... nuking $pkg"; 3705 warn "cancelling all extension coros";
3590 Symbol::delete_package $pkg; 3706 $_->cancel for values %EXT_CORO;
3591 } 3707 %EXT_CORO = ();
3592 3708
3593 warn "unloading all perl modules loaded from $LIBDIR"; 3709 warn "removing commands";
3594 while (my ($k, $v) = each %INC) { 3710 %COMMAND = ();
3595 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3596 3711
3712 warn "removing ext/exti commands";
3713 %EXTCMD = ();
3714 %EXTICMD = ();
3715
3716 warn "unloading/nuking all extensions";
3717 for my $pkg (@EXTS) {
3597 warn "... unloading $k"; 3718 warn "... unloading $pkg";
3598 delete $INC{$k};
3599 3719
3600 $k =~ s/\.pm$//;
3601 $k =~ s/\//::/g;
3602
3603 if (my $cb = $k->can ("unload_module")) { 3720 if (my $cb = $pkg->can ("unload")) {
3721 eval {
3604 $cb->(); 3722 $cb->($pkg);
3723 1
3724 } or warn "$pkg unloaded, but with errors: $@";
3725 }
3726
3727 warn "... clearing $pkg";
3728 clear_package $pkg;
3605 } 3729 }
3606 3730
3607 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;
3608 } 3746 }
3609 3747
3610 warn "getting rid of safe::, as good as possible"; 3748 warn "getting rid of safe::, as good as possible";
3611 Symbol::delete_package "safe::$_" 3749 clear_package "safe::$_"
3612 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);
3613 3751
3614 warn "unloading cf.pm \"a bit\""; 3752 warn "unloading cf.pm \"a bit\"";
3615 delete $INC{"cf.pm"}; 3753 delete $INC{"cf.pm"};
3616 delete $INC{"cf/pod.pm"}; 3754 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3617 3755
3618 # don't, removes xs symbols, too, 3756 # don't, removes xs symbols, too,
3619 # and global variables created in xs 3757 # and global variables created in xs
3620 #Symbol::delete_package __PACKAGE__; 3758 #clear_package __PACKAGE__;
3621 3759
3622 warn "unload completed, starting to reload now"; 3760 warn "unload completed, starting to reload now";
3623 3761
3624 warn "reloading cf.pm"; 3762 warn "reloading cf.pm";
3625 require cf; 3763 require cf;
3626 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3764 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
3627 3765
3628 warn "loading config and database again"; 3766 warn "loading config and database again";
3629 cf::reload_config; 3767 cf::reload_config;
3630 3768
3631 warn "loading extensions"; 3769 warn "loading extensions";
3632 cf::load_extensions; 3770 cf::load_extensions;
3633 3771
3772 if ($REATTACH_ON_RELOAD) {
3634 warn "reattaching attachments to objects/players"; 3773 warn "reattaching attachments to objects/players";
3635 _global_reattach; # objects, sockets 3774 _global_reattach; # objects, sockets
3636 warn "reattaching attachments to maps"; 3775 warn "reattaching attachments to maps";
3637 reattach $_ for values %MAP; 3776 reattach $_ for values %MAP;
3638 warn "reattaching attachments to players"; 3777 warn "reattaching attachments to players";
3639 reattach $_ for values %PLAYER; 3778 reattach $_ for values %PLAYER;
3779 }
3640 3780
3781 warn "running post_init jobs";
3782 (pop @POST_INIT)->(1) while @POST_INIT;
3783
3641 warn "leaving sync_job"; 3784 warn "leaving sync_job";
3642 3785
3643 1 3786 1
3644 } or do { 3787 } or do {
3645 warn $@; 3788 warn $@;
3646 cf::cleanup "error while reloading, exiting."; 3789 cf::cleanup "error while reloading, exiting.";
3647 }; 3790 };
3648 3791
3649 warn "reloaded"; 3792 warn "reloaded";
3793 --$RELOAD;
3794 }
3795
3796 $t1 = EV::time - $t1;
3797 warn "reload completed in ${t1}s\n";
3650}; 3798};
3651 3799
3652our $RELOAD_WATCHER; # used only during reload 3800our $RELOAD_WATCHER; # used only during reload
3653 3801
3654sub reload_perl() { 3802sub reload_perl() {
3655 # doing reload synchronously and two reloads happen back-to-back, 3803 # doing reload synchronously and two reloads happen back-to-back,
3656 # coro crashes during coro_state_free->destroy here. 3804 # coro crashes during coro_state_free->destroy here.
3657 3805
3806 $RELOAD_WATCHER ||= cf::async {
3807 Coro::AIO::aio_wait cache_extensions;
3808
3658 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3809 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3659 do_reload_perl; 3810 do_reload_perl;
3660 undef $RELOAD_WATCHER; 3811 undef $RELOAD_WATCHER;
3812 };
3661 }; 3813 };
3662} 3814}
3663 3815
3664register_command "reload" => sub { 3816register_command "reload" => sub {
3665 my ($who, $arg) = @_; 3817 my ($who, $arg) = @_;
3679 3831
3680our @WAIT_FOR_TICK; 3832our @WAIT_FOR_TICK;
3681our @WAIT_FOR_TICK_BEGIN; 3833our @WAIT_FOR_TICK_BEGIN;
3682 3834
3683sub wait_for_tick { 3835sub wait_for_tick {
3684 return if tick_inhibit;
3685 return if $Coro::current == $Coro::main; 3836 return if tick_inhibit || $Coro::current == $Coro::main;
3686 3837
3687 my $signal = new Coro::Signal; 3838 my $signal = new Coro::Signal;
3688 push @WAIT_FOR_TICK, $signal; 3839 push @WAIT_FOR_TICK, $signal;
3689 $signal->wait; 3840 $signal->wait;
3690} 3841}
3691 3842
3692sub wait_for_tick_begin { 3843sub wait_for_tick_begin {
3693 return if tick_inhibit;
3694 return if $Coro::current == $Coro::main; 3844 return if tick_inhibit || $Coro::current == $Coro::main;
3695 3845
3696 my $signal = new Coro::Signal; 3846 my $signal = new Coro::Signal;
3697 push @WAIT_FOR_TICK_BEGIN, $signal; 3847 push @WAIT_FOR_TICK_BEGIN, $signal;
3698 $signal->wait; 3848 $signal->wait;
3699} 3849}
3738{ 3888{
3739 # configure BDB 3889 # configure BDB
3740 3890
3741 BDB::min_parallel 8; 3891 BDB::min_parallel 8;
3742 BDB::max_poll_reqs $TICK * 0.1; 3892 BDB::max_poll_reqs $TICK * 0.1;
3743 $Coro::BDB::WATCHER->priority (1); 3893 $AnyEvent::BDB::WATCHER->priority (1);
3744 3894
3745 unless ($DB_ENV) { 3895 unless ($DB_ENV) {
3746 $DB_ENV = BDB::db_env_create; 3896 $DB_ENV = BDB::db_env_create;
3747 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3897 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3748 | 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;
3749 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3900 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3750 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3901 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3751 3902
3752 cf::sync_job { 3903 cf::sync_job {
3753 eval { 3904 eval {
3779{ 3930{
3780 # configure IO::AIO 3931 # configure IO::AIO
3781 3932
3782 IO::AIO::min_parallel 8; 3933 IO::AIO::min_parallel 8;
3783 IO::AIO::max_poll_time $TICK * 0.1; 3934 IO::AIO::max_poll_time $TICK * 0.1;
3784 $Coro::AIO::WATCHER->priority (1); 3935 undef $AnyEvent::AIO::WATCHER;
3785} 3936}
3786 3937
3787my $_log_backtrace; 3938my $_log_backtrace;
3788 3939
3789sub _log_backtrace { 3940sub _log_backtrace {
3792 $msg =~ s/\n//; 3943 $msg =~ s/\n//;
3793 3944
3794 # limit the # of concurrent backtraces 3945 # limit the # of concurrent backtraces
3795 if ($_log_backtrace < 2) { 3946 if ($_log_backtrace < 2) {
3796 ++$_log_backtrace; 3947 ++$_log_backtrace;
3948 my $perl_bt = Carp::longmess $msg;
3797 async { 3949 async {
3798 $Coro::current->{desc} = "abt $msg"; 3950 $Coro::current->{desc} = "abt $msg";
3799 3951
3800 my @bt = fork_call { 3952 my @bt = fork_call {
3801 @addr = map { sprintf "%x", $_ } @addr; 3953 @addr = map { sprintf "%x", $_ } @addr;
3812 } 3964 }
3813 3965
3814 @funcs 3966 @funcs
3815 }; 3967 };
3816 3968
3817 LOG llevInfo, "[ABT] $msg\n"; 3969 LOG llevInfo, "[ABT] $perl_bt\n";
3970 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3818 LOG llevInfo, "[ABT] $_\n" for @bt; 3971 LOG llevInfo, "[ABT] $_\n" for @bt;
3819 --$_log_backtrace; 3972 --$_log_backtrace;
3820 }; 3973 };
3821 } else { 3974 } else {
3822 LOG llevInfo, "[ABT] $msg\n"; 3975 LOG llevInfo, "[ABT] $msg\n";
3823 LOG llevInfo, "[ABT] [suppressed]\n"; 3976 LOG llevInfo, "[ABT] [suppressed]\n";
3824 } 3977 }
3825} 3978}
3826 3979
3827# load additional modules 3980# load additional modules
3828use cf::pod; 3981require "cf/$_.pm" for @EXTRA_MODULES;
3829 3982
3830END { cf::emergency_save } 3983END { cf::emergency_save }
3831 3984
38321 39851
3833 3986

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines