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.502 by root, Sat Jan 23 20:24:50 2010 UTC

1# 1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG. 2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3# 3#
4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4# Copyright (©) 2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5# 5#
6# Deliantra is free software: you can redistribute it and/or modify 6# Deliantra is free software: you can redistribute it and/or modify it under
7# it under the terms of the GNU General Public License as published by 7# the terms of the Affero GNU General Public License as published by the
8# the Free Software Foundation, either version 3 of the License, or 8# Free Software Foundation, either version 3 of the License, or (at your
9# (at your option) any later version. 9# option) any later version.
10# 10#
11# This program is distributed in the hope that it will be useful, 11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of 12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details. 14# GNU General Public License for more details.
15# 15#
16# You should have received a copy of the GNU General Public License 16# You should have received a copy of the Affero GNU General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>. 17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
18# 19#
19# The authors can be reached via e-mail to <support@deliantra.net> 20# The authors can be reached via e-mail to <support@deliantra.net>
20# 21#
21 22
22package cf; 23package cf;
23 24
25use 5.10.0;
24use utf8; 26use utf8;
25use strict; 27use strict qw(vars subs);
26 28
27use Symbol; 29use Symbol;
28use List::Util; 30use List::Util;
29use Socket; 31use Socket;
30use EV 3.2; 32use EV;
31use Opcode; 33use Opcode;
32use Safe; 34use Safe;
33use Safe::Hole; 35use Safe::Hole;
34use Storable (); 36use Storable ();
37use Carp ();
35 38
39use Guard ();
36use Coro 4.50 (); 40use Coro ();
37use Coro::State; 41use Coro::State;
38use Coro::Handle; 42use Coro::Handle;
39use Coro::EV; 43use Coro::EV;
44use Coro::AnyEvent;
40use Coro::Timer; 45use Coro::Timer;
41use Coro::Signal; 46use Coro::Signal;
42use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
43use Coro::AIO; 50use Coro::AIO;
44use Coro::BDB; 51use Coro::BDB 1.6;
45use Coro::Storable; 52use Coro::Storable;
46use Coro::Util (); 53use Coro::Util ();
47 54
48use JSON::XS 2.01 (); 55use JSON::XS 2.01 ();
49use BDB (); 56use BDB ();
50use Data::Dumper; 57use Data::Dumper;
51use Digest::MD5;
52use Fcntl; 58use Fcntl;
53use YAML (); 59use YAML::XS ();
54use IO::AIO 2.51 (); 60use IO::AIO ();
55use Time::HiRes; 61use Time::HiRes;
56use Compress::LZF; 62use Compress::LZF;
57use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
58 66
59# configure various modules to our taste 67# configure various modules to our taste
60# 68#
61$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
62Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 70Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
71
72$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
73
74# make sure c-lzf reinitialises itself
75Compress::LZF::set_serializer "Storable", "Storable::net_mstore", "Storable::mretrieve";
63Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 76Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
64 77
65$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 78# strictly for debugging
79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
66 80
67sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
68 82
69our %COMMAND = (); 83our %COMMAND = ();
70our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
73our %EXTCMD = (); 87our %EXTCMD = ();
74our %EXTICMD = (); 88our %EXTICMD = ();
75our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
76our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
77 91
78our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
79our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
80 96
81our $CONFDIR = confdir; 97our $CONFDIR = confdir;
82our $DATADIR = datadir; 98our $DATADIR = datadir;
83our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
84our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
85our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
86our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
87our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
88our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
89our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
90our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
91our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
92our %RESOURCE; 111our %RESOURCE;
93 112
94our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 113our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
95our $AIO_POLL_WATCHER;
96our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 114our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
97our $NEXT_TICK; 115our $NEXT_TICK;
98our $USE_FSYNC = 1; # use fsync to write maps - default off 116our $USE_FSYNC = 1; # use fsync to write maps - default on
99 117
100our $BDB_POLL_WATCHER;
101our $BDB_DEADLOCK_WATCHER; 118our $BDB_DEADLOCK_WATCHER;
102our $BDB_CHECKPOINT_WATCHER; 119our $BDB_CHECKPOINT_WATCHER;
103our $BDB_TRICKLE_WATCHER; 120our $BDB_TRICKLE_WATCHER;
104our $DB_ENV; 121our $DB_ENV;
105 122
123our @EXTRA_MODULES = qw(pod match mapscript);
124
106our %CFG; 125our %CFG;
107 126
108our $UPTIME; $UPTIME ||= time; 127our $UPTIME; $UPTIME ||= time;
109our $RUNTIME; 128our $RUNTIME;
110our $NOW; 129our $NOW;
… …
119our $LOAD; # a number between 0 (idle) and 1 (too many objects) 138our $LOAD; # a number between 0 (idle) and 1 (too many objects)
120our $LOADAVG; # same thing, but with alpha-smoothing 139our $LOADAVG; # same thing, but with alpha-smoothing
121our $JITTER; # average jitter 140our $JITTER; # average jitter
122our $TICK_START; # for load detecting purposes 141our $TICK_START; # for load detecting purposes
123 142
143our @POST_INIT;
144
145our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
146our $REALLY_UNLOOP; # never set to true, please :)
147
124binmode STDOUT; 148binmode STDOUT;
125binmode STDERR; 149binmode STDERR;
126 150
127# read virtual server time, if available 151# read virtual server time, if available
128unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 152unless ($RUNTIME || !-e $RUNTIMEFILE) {
129 open my $fh, "<", "$LOCALDIR/runtime" 153 open my $fh, "<", $RUNTIMEFILE
130 or die "unable to read runtime file: $!"; 154 or die "unable to read $RUNTIMEFILE file: $!";
131 $RUNTIME = <$fh> + 0.; 155 $RUNTIME = <$fh> + 0.;
132} 156}
157
158eval "sub TICK() { $TICK } 1" or die;
133 159
134mkdir $_ 160mkdir $_
135 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 161 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
136 162
137our $EMERGENCY_POSITION; 163our $EMERGENCY_POSITION;
138 164
139sub cf::map::normalise; 165sub cf::map::normalise;
166
167#############################################################################
168
169%REFLECT = ();
170for (@REFLECT) {
171 my $reflect = JSON::XS::decode_json $_;
172 $REFLECT{$reflect->{class}} = $reflect;
173}
174
175# this is decidedly evil
176$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
140 177
141############################################################################# 178#############################################################################
142 179
143=head2 GLOBAL VARIABLES 180=head2 GLOBAL VARIABLES
144 181
… …
191returns directly I<after> the tick processing (and consequently, can only wake one process 228returns directly I<after> the tick processing (and consequently, can only wake one process
192per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 229per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
193 230
194=item @cf::INVOKE_RESULTS 231=item @cf::INVOKE_RESULTS
195 232
196This array contains the results of the last C<invoke ()> call. When 233This 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 234C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
198that call. 235that call.
199 236
237=item %cf::REFLECT
238
239Contains, for each (C++) class name, a hash reference with information
240about object members (methods, scalars, arrays and flags) and other
241metadata, which is useful for introspection.
242
200=back 243=back
201 244
202=cut 245=cut
203 246
204BEGIN { 247$Coro::State::WARNHOOK = sub {
205 *CORE::GLOBAL::warn = sub {
206 my $msg = join "", @_; 248 my $msg = join "", @_;
207 249
208 $msg .= "\n" 250 $msg .= "\n"
209 unless $msg =~ /\n$/; 251 unless $msg =~ /\n$/;
210 252
211 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 253 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
212 254
213 LOG llevError, $msg; 255 LOG llevError, $msg;
214 }; 256};
215}
216 257
217$Coro::State::DIEHOOK = sub { 258$Coro::State::DIEHOOK = sub {
218 return unless $^S eq 0; # "eq", not "==" 259 return unless $^S eq 0; # "eq", not "=="
260
261 warn Carp::longmess $_[0];
219 262
220 if ($Coro::current == $Coro::main) {#d# 263 if ($Coro::current == $Coro::main) {#d#
221 warn "DIEHOOK called in main context, Coro bug?\n";#d# 264 warn "DIEHOOK called in main context, Coro bug?\n";#d#
222 return;#d# 265 return;#d#
223 }#d# 266 }#d#
224 267
225 # kill coroutine otherwise 268 # kill coroutine otherwise
226 warn Carp::longmess $_[0];
227 Coro::terminate 269 Coro::terminate
228}; 270};
229
230$SIG{__DIE__} = sub { }; #d#?
231 271
232@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 272@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
233@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 273@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
234@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 274@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
235@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 275@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
242for my $pkg (qw( 282for my $pkg (qw(
243 cf::global cf::attachable 283 cf::global cf::attachable
244 cf::object cf::object::player 284 cf::object cf::object::player
245 cf::client cf::player 285 cf::client cf::player
246 cf::arch cf::living 286 cf::arch cf::living
287 cf::map cf::mapspace
247 cf::map cf::party cf::region 288 cf::party cf::region
248)) { 289)) {
249 no strict 'refs';
250 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 290 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
251} 291}
252 292
253$EV::DIED = sub { 293$EV::DIED = sub {
254 warn "error in event callback: @_"; 294 Carp::cluck "error in event callback: @_";
255}; 295};
256 296
257############################################################################# 297#############################################################################
258 298
259=head2 UTILITY FUNCTIONS 299=head2 UTILITY FUNCTIONS
… …
296our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 336our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
297 337
298sub encode_json($) { $json_coder->encode ($_[0]) } 338sub encode_json($) { $json_coder->encode ($_[0]) }
299sub decode_json($) { $json_coder->decode ($_[0]) } 339sub decode_json($) { $json_coder->decode ($_[0]) }
300 340
341=item cf::post_init { BLOCK }
342
343Execute the given codeblock, I<after> all extensions have been (re-)loaded,
344but I<before> the server starts ticking again.
345
346The cdoeblock will have a single boolean argument to indicate whether this
347is a reload or not.
348
349=cut
350
351sub post_init(&) {
352 push @POST_INIT, shift;
353}
354
301=item cf::lock_wait $string 355=item cf::lock_wait $string
302 356
303Wait until the given lock is available. See cf::lock_acquire. 357Wait until the given lock is available. See cf::lock_acquire.
304 358
305=item my $lock = cf::lock_acquire $string 359=item my $lock = cf::lock_acquire $string
306 360
307Wait until the given lock is available and then acquires it and returns 361Wait 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, 362a L<Guard> object. If the guard object gets destroyed (goes out of scope,
309for example when the coroutine gets canceled), the lock is automatically 363for example when the coroutine gets canceled), the lock is automatically
310returned. 364returned.
311 365
312Locks are *not* recursive, locking from the same coro twice results in a 366Locks are *not* recursive, locking from the same coro twice results in a
313deadlocked coro. 367deadlocked coro.
… …
319 373
320Return true if the lock is currently active, i.e. somebody has locked it. 374Return true if the lock is currently active, i.e. somebody has locked it.
321 375
322=cut 376=cut
323 377
324our %LOCK; 378our $LOCKS = new Coro::SemaphoreSet;
325our %LOCKER;#d#
326 379
327sub lock_wait($) { 380sub lock_wait($) {
328 my ($key) = @_; 381 $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} 382}
341 383
342sub lock_acquire($) { 384sub lock_acquire($) {
343 my ($key) = @_; 385 $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} 386}
357 387
358sub lock_active($) { 388sub lock_active($) {
359 my ($key) = @_; 389 $LOCKS->count ($_[0]) < 1
360
361 ! ! $LOCK{$key}
362} 390}
363 391
364sub freeze_mainloop { 392sub freeze_mainloop {
365 tick_inhibit_inc; 393 tick_inhibit_inc;
366 394
367 Coro::guard \&tick_inhibit_dec; 395 &Guard::guard (\&tick_inhibit_dec);
368} 396}
369 397
370=item cf::periodic $interval, $cb 398=item cf::periodic $interval, $cb
371 399
372Like EV::periodic, but randomly selects a starting point so that the actions 400Like EV::periodic, but randomly selects a starting point so that the actions
… …
395 423
396=cut 424=cut
397 425
398our @SLOT_QUEUE; 426our @SLOT_QUEUE;
399our $SLOT_QUEUE; 427our $SLOT_QUEUE;
428our $SLOT_DECAY = 0.9;
400 429
401$SLOT_QUEUE->cancel if $SLOT_QUEUE; 430$SLOT_QUEUE->cancel if $SLOT_QUEUE;
402$SLOT_QUEUE = Coro::async { 431$SLOT_QUEUE = Coro::async {
403 $Coro::current->desc ("timeslot manager"); 432 $Coro::current->desc ("timeslot manager");
404 433
405 my $signal = new Coro::Signal; 434 my $signal = new Coro::Signal;
435 my $busy;
406 436
407 while () { 437 while () {
408 next_job: 438 next_job:
439
409 my $avail = cf::till_tick; 440 my $avail = cf::till_tick;
410 if ($avail > 0.01) { 441
411 for (0 .. $#SLOT_QUEUE) { 442 for (0 .. $#SLOT_QUEUE) {
412 if ($SLOT_QUEUE[$_][0] < $avail) { 443 if ($SLOT_QUEUE[$_][0] <= $avail) {
444 $busy = 0;
413 my $job = splice @SLOT_QUEUE, $_, 1, (); 445 my $job = splice @SLOT_QUEUE, $_, 1, ();
414 $job->[2]->send; 446 $job->[2]->send;
415 Coro::cede; 447 Coro::cede;
416 goto next_job; 448 goto next_job;
417 } 449 } else {
450 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
418 } 451 }
419 } 452 }
420 453
421 if (@SLOT_QUEUE) { 454 if (@SLOT_QUEUE) {
422 # we do not use wait_for_tick() as it returns immediately when tick is inactive 455 # we do not use wait_for_tick() as it returns immediately when tick is inactive
423 push @cf::WAIT_FOR_TICK, $signal; 456 push @cf::WAIT_FOR_TICK, $signal;
424 $signal->wait; 457 $signal->wait;
425 } else { 458 } else {
459 $busy = 0;
426 Coro::schedule; 460 Coro::schedule;
427 } 461 }
428 } 462 }
429}; 463};
430 464
431sub get_slot($;$$) { 465sub get_slot($;$$) {
466 return if tick_inhibit || $Coro::current == $Coro::main;
467
432 my ($time, $pri, $name) = @_; 468 my ($time, $pri, $name) = @_;
433 469
434 $time = $TICK * .6 if $time > $TICK * .6; 470 $time = clamp $time, 0.01, $TICK * .6;
471
435 my $sig = new Coro::Signal; 472 my $sig = new Coro::Signal;
436 473
437 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 474 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
438 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 475 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
439 $SLOT_QUEUE->ready; 476 $SLOT_QUEUE->ready;
… …
722 759
723############################################################################# 760#############################################################################
724 761
725=head2 ATTACHABLE OBJECTS 762=head2 ATTACHABLE OBJECTS
726 763
727Many objects in crossfire are so-called attachable objects. That means you can 764Many objects in deliantra are so-called attachable objects. That means you can
728attach callbacks/event handlers (a collection of which is called an "attachment") 765attach callbacks/event handlers (a collection of which is called an "attachment")
729to it. All such attachable objects support the following methods. 766to it. All such attachable objects support the following methods.
730 767
731In the following description, CLASS can be any of C<global>, C<object> 768In 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 769C<player>, C<client> or C<map> (i.e. the attachable objects in
… …
782=item cf::CLASS::attachment $name, ... 819=item cf::CLASS::attachment $name, ...
783 820
784Register an attachment by C<$name> through which attachable objects of the 821Register an attachment by C<$name> through which attachable objects of the
785given CLASS can refer to this attachment. 822given CLASS can refer to this attachment.
786 823
787Some classes such as crossfire maps and objects can specify attachments 824Some classes such as deliantra maps and objects can specify attachments
788that are attached at load/instantiate time, thus the need for a name. 825that are attached at load/instantiate time, thus the need for a name.
789 826
790These calls expect any number of the following handler/hook descriptions: 827These calls expect any number of the following handler/hook descriptions:
791 828
792=over 4 829=over 4
… …
1083 1120
1084sub reattach { 1121sub reattach {
1085 # basically do the same as instantiate, without calling instantiate 1122 # basically do the same as instantiate, without calling instantiate
1086 my ($obj) = @_; 1123 my ($obj) = @_;
1087 1124
1125 # no longer needed after getting rid of delete_package?
1088 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1126 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
1089 1127
1090 my $registry = $obj->registry; 1128 my $registry = $obj->registry;
1091 1129
1092 @$registry = (); 1130 @$registry = ();
1093 1131
… …
1139 utf8::decode (my $decname = $filename); 1177 utf8::decode (my $decname = $filename);
1140 warn sprintf "saving %s (%d,%d)\n", 1178 warn sprintf "saving %s (%d,%d)\n",
1141 $decname, length $$rdata, scalar @$objs; 1179 $decname, length $$rdata, scalar @$objs;
1142 1180
1143 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1181 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1144 chmod SAVE_MODE, $fh; 1182 aio_chmod $fh, SAVE_MODE;
1145 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1183 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1146 aio_fsync $fh if $cf::USE_FSYNC; 1184 if ($cf::USE_FSYNC) {
1185 aio_sync_file_range $fh, 0, 0, IO::AIO::SYNC_FILE_RANGE_WAIT_BEFORE | IO::AIO::SYNC_FILE_RANGE_WRITE | IO::AIO::SYNC_FILE_RANGE_WAIT_AFTER;
1186 aio_fsync $fh;
1187 }
1147 close $fh; 1188 aio_close $fh;
1148 1189
1149 if (@$objs) { 1190 if (@$objs) {
1150 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1191 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1151 chmod SAVE_MODE, $fh; 1192 aio_chmod $fh, SAVE_MODE;
1152 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs }; 1193 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1153 aio_write $fh, 0, (length $data), $data, 0; 1194 aio_write $fh, 0, (length $data), $data, 0;
1154 aio_fsync $fh if $cf::USE_FSYNC; 1195 if ($cf::USE_FSYNC) {
1196 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;
1197 aio_fsync $fh;
1198 }
1155 close $fh; 1199 aio_close $fh;
1156 aio_rename "$filename.pst~", "$filename.pst"; 1200 aio_rename "$filename.pst~", "$filename.pst";
1157 } 1201 }
1158 } else { 1202 } else {
1159 aio_unlink "$filename.pst"; 1203 aio_unlink "$filename.pst";
1160 } 1204 }
1161 1205
1162 aio_rename "$filename~", $filename; 1206 aio_rename "$filename~", $filename;
1207
1208 $filename =~ s%/[^/]+$%%;
1209 aio_pathsync $filename if $cf::USE_FSYNC;
1163 } else { 1210 } else {
1164 warn "FATAL: $filename~: $!\n"; 1211 warn "unable to save objects: $filename~: $!\n";
1165 } 1212 }
1166 } else { 1213 } else {
1167 aio_unlink $filename; 1214 aio_unlink $filename;
1168 aio_unlink "$filename.pst"; 1215 aio_unlink "$filename.pst";
1169 } 1216 }
… …
1260 my ($name, $cb) = @_; 1307 my ($name, $cb) = @_;
1261 1308
1262 $EXTICMD{$name} = $cb; 1309 $EXTICMD{$name} = $cb;
1263} 1310}
1264 1311
1312use File::Glob ();
1313
1265cf::player->attach ( 1314cf::player->attach (
1266 on_command => sub { 1315 on_command => sub {
1267 my ($pl, $name, $params) = @_; 1316 my ($pl, $name, $params) = @_;
1268 1317
1269 my $cb = $COMMAND{$name} 1318 my $cb = $COMMAND{$name}
… …
1301 1350
1302 cf::override; 1351 cf::override;
1303 }, 1352 },
1304); 1353);
1305 1354
1355# "readahead" all extensions
1356sub cache_extensions {
1357 my $grp = IO::AIO::aio_group;
1358
1359 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1360 for (grep /\.ext$/, @{$_[0]}) {
1361 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1362 }
1363 };
1364
1365 $grp
1366}
1367
1306sub load_extensions { 1368sub load_extensions {
1307 cf::sync_job { 1369 cf::sync_job {
1308 my %todo; 1370 my %todo;
1309 1371
1310 for my $path (<$LIBDIR/*.ext>) { 1372 for my $path (<$LIBDIR/*.ext>) {
… …
1329 1391
1330 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1392 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1331 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1393 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1332 1394
1333 $ext{source} = 1395 $ext{source} =
1334 "package $pkg; use strict; use utf8;\n" 1396 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1335 . "#line 1 \"$path\"\n{\n" 1397 . "#line 1 \"$path\"\n{\n"
1336 . $source 1398 . $source
1337 . "\n};\n1"; 1399 . "\n};\n1";
1338 1400
1339 $todo{$base} = \%ext; 1401 $todo{$base} = \%ext;
… …
1379 1441
1380=back 1442=back
1381 1443
1382=head2 CORE EXTENSIONS 1444=head2 CORE EXTENSIONS
1383 1445
1384Functions and methods that extend core crossfire objects. 1446Functions and methods that extend core deliantra objects.
1385 1447
1386=cut 1448=cut
1387 1449
1388package cf::player; 1450package cf::player;
1389 1451
… …
1432 1494
1433sub exists($) { 1495sub exists($) {
1434 my ($login) = @_; 1496 my ($login) = @_;
1435 1497
1436 $cf::PLAYER{$login} 1498 $cf::PLAYER{$login}
1437 or cf::sync_job { !aio_stat path $login } 1499 or !aio_stat path $login
1438} 1500}
1439 1501
1440sub find($) { 1502sub find($) {
1441 return $cf::PLAYER{$_[0]} || do { 1503 return $cf::PLAYER{$_[0]} || do {
1442 my $login = $_[0]; 1504 my $login = $_[0];
… …
1454 my $f = new_from_file cf::object::thawer path $login 1516 my $f = new_from_file cf::object::thawer path $login
1455 or return; 1517 or return;
1456 1518
1457 my $pl = cf::player::load_pl $f 1519 my $pl = cf::player::load_pl $f
1458 or return; 1520 or return;
1521
1459 local $cf::PLAYER_LOADING{$login} = $pl; 1522 local $cf::PLAYER_LOADING{$login} = $pl;
1460 $f->resolve_delayed_derefs; 1523 $f->resolve_delayed_derefs;
1461 $cf::PLAYER{$login} = $pl 1524 $cf::PLAYER{$login} = $pl
1462 } 1525 }
1463 } 1526 }
… …
1473 1536
1474 return if $pl->{deny_save}; 1537 return if $pl->{deny_save};
1475 1538
1476 aio_mkdir playerdir $pl, 0770; 1539 aio_mkdir playerdir $pl, 0770;
1477 $pl->{last_save} = $cf::RUNTIME; 1540 $pl->{last_save} = $cf::RUNTIME;
1541
1542 cf::get_slot 0.01;
1478 1543
1479 $pl->save_pl ($path); 1544 $pl->save_pl ($path);
1480 cf::cede_to_tick; 1545 cf::cede_to_tick;
1481} 1546}
1482 1547
… …
1514 my ($pl) = @_; 1579 my ($pl) = @_;
1515 1580
1516 my $name = $pl->ob->name; 1581 my $name = $pl->ob->name;
1517 1582
1518 $pl->{deny_save} = 1; 1583 $pl->{deny_save} = 1;
1519 $pl->password ("*"); # this should lock out the player until we nuked the dir 1584 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1520 1585
1521 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1586 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1522 $pl->deactivate; 1587 $pl->deactivate;
1588 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1589 $pl->ob->check_score;
1523 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1590 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1524 $pl->ns->destroy if $pl->ns; 1591 $pl->ns->destroy if $pl->ns;
1525 1592
1526 my $path = playerdir $pl; 1593 my $path = playerdir $pl;
1527 my $temp = "$path~$cf::RUNTIME~deleting~"; 1594 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1566 1633
1567 for my $login (@$dirs) { 1634 for my $login (@$dirs) {
1568 my $path = path $login; 1635 my $path = path $login;
1569 1636
1570 # a .pst is a dead give-away for a valid player 1637 # a .pst is a dead give-away for a valid player
1571 unless (-e "$path.pst") { 1638 # if no pst file found, open and chekc for blocked users
1639 if (aio_stat "$path.pst") {
1572 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next; 1640 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1573 aio_read $fh, 0, 512, my $buf, 0 or next; 1641 aio_read $fh, 0, 512, my $buf, 0 or next;
1574 $buf !~ /^password -------------$/m or next; # official not-valid tag 1642 $buf !~ /^password -------------$/m or next; # official not-valid tag
1575 } 1643 }
1576 1644
… …
1607 } 1675 }
1608 1676
1609 \@paths 1677 \@paths
1610} 1678}
1611 1679
1612=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1680=item $protocol_xml = $player->expand_cfpod ($cfpod)
1613 1681
1614Expand crossfire pod fragments into protocol xml. 1682Expand 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 1683
1705=item $player->ext_reply ($msgid, @msg) 1684=item $player->ext_reply ($msgid, @msg)
1706 1685
1707Sends an ext reply to the player. 1686Sends an ext reply to the player.
1708 1687
… …
1921 1900
1922 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go; 1901 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1923 "$UNIQUEDIR/$path" 1902 "$UNIQUEDIR/$path"
1924} 1903}
1925 1904
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 { 1905sub decay_objects {
1936 my ($self) = @_; 1906 my ($self) = @_;
1937 1907
1938 return if $self->{deny_reset}; 1908 return if $self->{deny_reset};
1939 1909
… …
2021sub find { 1991sub find {
2022 my ($path, $origin) = @_; 1992 my ($path, $origin) = @_;
2023 1993
2024 $path = normalise $path, $origin && $origin->path; 1994 $path = normalise $path, $origin && $origin->path;
2025 1995
2026 cf::lock_wait "map_data:$path";#d#remove 1996 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
2027 cf::lock_wait "map_find:$path"; 1997 my $guard2 = cf::lock_acquire "map_find:$path";
2028 1998
2029 $cf::MAP{$path} || do { 1999 $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 2000 my $map = new_from_path cf::map $path
2034 or return; 2001 or return;
2035 2002
2036 $map->{last_save} = $cf::RUNTIME; 2003 $map->{last_save} = $cf::RUNTIME;
2037 2004
… …
2039 or return; 2006 or return;
2040 2007
2041 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2008 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
2042 # doing this can freeze the server in a sync job, obviously 2009 # doing this can freeze the server in a sync job, obviously
2043 #$cf::WAIT_FOR_TICK->wait; 2010 #$cf::WAIT_FOR_TICK->wait;
2011 undef $guard2;
2044 undef $guard1; 2012 undef $guard1;
2045 undef $guard2;
2046 $map->reset; 2013 $map->reset;
2047 return find $path; 2014 return find $path;
2048 } 2015 }
2049 2016
2050 $cf::MAP{$path} = $map 2017 $cf::MAP{$path} = $map
2051 } 2018 }
2052} 2019}
2053 2020
2054sub pre_load { } 2021sub pre_load { }
2055sub post_load { } 2022#sub post_load { } # XS
2056 2023
2057sub load { 2024sub load {
2058 my ($self) = @_; 2025 my ($self) = @_;
2059 2026
2060 local $self->{deny_reset} = 1; # loading can take a long time 2027 local $self->{deny_reset} = 1; # loading can take a long time
… …
2077 my $f = new_from_file cf::object::thawer $self->{load_path}; 2044 my $f = new_from_file cf::object::thawer $self->{load_path};
2078 $f->skip_block; 2045 $f->skip_block;
2079 $self->_load_objects ($f) 2046 $self->_load_objects ($f)
2080 or return; 2047 or return;
2081 2048
2082 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2049 $self->post_load_original
2083 if delete $self->{load_original}; 2050 if delete $self->{load_original};
2084 2051
2085 if (my $uniq = $self->uniq_path) { 2052 if (my $uniq = $self->uniq_path) {
2086 utf8::encode $uniq; 2053 utf8::encode $uniq;
2087 unless (aio_stat $uniq) { 2054 unless (aio_stat $uniq) {
… …
2105 unless ($self->{deny_activate}) { 2072 unless ($self->{deny_activate}) {
2106 $self->decay_objects; 2073 $self->decay_objects;
2107 $self->fix_auto_apply; 2074 $self->fix_auto_apply;
2108 $self->update_buttons; 2075 $self->update_buttons;
2109 cf::cede_to_tick; 2076 cf::cede_to_tick;
2110 $self->set_darkness_map;
2111 cf::cede_to_tick;
2112 $self->activate; 2077 $self->activate;
2113 } 2078 }
2114 2079
2115 $self->{last_save} = $cf::RUNTIME; 2080 $self->{last_save} = $cf::RUNTIME;
2116 $self->last_access ($cf::RUNTIME); 2081 $self->last_access ($cf::RUNTIME);
2117 2082
2118 $self->in_memory (cf::MAP_IN_MEMORY); 2083 $self->in_memory (cf::MAP_ACTIVE);
2119 } 2084 }
2120 2085
2121 $self->post_load; 2086 $self->post_load;
2122} 2087}
2123 2088
… …
2181 my ($path, $origin, $load) = @_; 2146 my ($path, $origin, $load) = @_;
2182 2147
2183 $path = normalise $path, $origin && $origin->{path}; 2148 $path = normalise $path, $origin && $origin->{path};
2184 2149
2185 if (my $map = $cf::MAP{$path}) { 2150 if (my $map = $cf::MAP{$path}) {
2186 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY; 2151 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
2187 } 2152 }
2188 2153
2189 $MAP_PREFETCH{$path} |= $load; 2154 $MAP_PREFETCH{$path} |= $load;
2190 2155
2191 $MAP_PREFETCHER ||= cf::async { 2156 $MAP_PREFETCHER ||= cf::async {
… …
2228 cf::async { 2193 cf::async {
2229 $Coro::current->{desc} = "map player save"; 2194 $Coro::current->{desc} = "map player save";
2230 $_->contr->save for $self->players; 2195 $_->contr->save for $self->players;
2231 }; 2196 };
2232 2197
2198 cf::get_slot 0.02;
2199
2233 if ($uniq) { 2200 if ($uniq) {
2234 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2201 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2235 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2202 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2236 } else { 2203 } else {
2237 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2204 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
… …
2245 $self->save; 2212 $self->save;
2246 2213
2247 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2214 my $lock = cf::lock_acquire "map_data:$self->{path}";
2248 2215
2249 return if $self->players; 2216 return if $self->players;
2250 return if $self->in_memory != cf::MAP_IN_MEMORY; 2217 return if $self->in_memory != cf::MAP_ACTIVE;
2251 return if $self->{deny_save}; 2218 return if $self->{deny_save};
2252 2219
2253 $self->in_memory (cf::MAP_SWAPPED); 2220 $self->in_memory (cf::MAP_SWAPPED);
2254 2221
2255 $self->deactivate; 2222 $self->deactivate;
… …
2280 2247
2281 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2248 my $lock = cf::lock_acquire "map_data:$self->{path}";
2282 2249
2283 return if $self->players; 2250 return if $self->players;
2284 2251
2285 warn "resetting map ", $self->path; 2252 warn "resetting map ", $self->path, "\n";
2286 2253
2287 $self->in_memory (cf::MAP_SWAPPED); 2254 $self->in_memory (cf::MAP_SWAPPED);
2288 2255
2289 # need to save uniques path 2256 # need to save uniques path
2290 unless ($self->{deny_save}) { 2257 unless ($self->{deny_save}) {
… …
2381 : normalise $_ 2348 : normalise $_
2382 } @{ aio_readdir $UNIQUEDIR or [] } 2349 } @{ aio_readdir $UNIQUEDIR or [] }
2383 ] 2350 ]
2384} 2351}
2385 2352
2353=item cf::map::static_maps
2354
2355Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2356file in the shared directory excluding F</styles> and F</editor>). May
2357block.
2358
2359=cut
2360
2361sub static_maps() {
2362 my @dirs = "";
2363 my @maps;
2364
2365 while (@dirs) {
2366 my $dir = shift @dirs;
2367
2368 next if $dir eq "/styles" || $dir eq "/editor";
2369
2370 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2371 or return;
2372
2373 for (@$files) {
2374 s/\.map$// or next;
2375 utf8::decode $_;
2376 push @maps, "$dir/$_";
2377 }
2378
2379 push @dirs, map "$dir/$_", @$dirs;
2380 }
2381
2382 \@maps
2383}
2384
2386=back 2385=back
2387 2386
2388=head3 cf::object 2387=head3 cf::object
2389 2388
2390=cut 2389=cut
… …
2451can be C<undef>. Does the right thing when the player is currently in a 2450can be C<undef>. Does the right thing when the player is currently in a
2452dialogue with the given NPC character. 2451dialogue with the given NPC character.
2453 2452
2454=cut 2453=cut
2455 2454
2455our $SAY_CHANNEL = {
2456 id => "say",
2457 title => "Map",
2458 reply => "say ",
2459 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2460};
2461
2462our $CHAT_CHANNEL = {
2463 id => "chat",
2464 title => "Chat",
2465 reply => "chat ",
2466 tooltip => "Player chat and shouts, global to the server.",
2467};
2468
2456# rough implementation of a future "reply" method that works 2469# rough implementation of a future "reply" method that works
2457# with dialog boxes. 2470# with dialog boxes.
2458#TODO: the first argument must go, split into a $npc->reply_to ( method 2471#TODO: the first argument must go, split into a $npc->reply_to ( method
2459sub cf::object::player::reply($$$;$) { 2472sub cf::object::player::reply($$$;$) {
2460 my ($self, $npc, $msg, $flags) = @_; 2473 my ($self, $npc, $msg, $flags) = @_;
… …
2471 my $dialog = $pl->{npc_dialog}; 2484 my $dialog = $pl->{npc_dialog};
2472 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2485 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2473 2486
2474 } else { 2487 } else {
2475 $msg = $npc->name . " says: $msg" if $npc; 2488 $msg = $npc->name . " says: $msg" if $npc;
2476 $self->message ($msg, $flags); 2489 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2477 } 2490 }
2478 } 2491 }
2479} 2492}
2480 2493
2481=item $object->send_msg ($channel, $msg, $color, [extra...]) 2494=item $object->send_msg ($channel, $msg, $color, [extra...])
… …
2506 2519
2507=item $player_object->enter_link 2520=item $player_object->enter_link
2508 2521
2509Freezes the player and moves him/her to a special map (C<{link}>). 2522Freezes the player and moves him/her to a special map (C<{link}>).
2510 2523
2511The player should be reasonably safe there for short amounts of time. You 2524The player should be reasonably safe there for short amounts of time (e.g.
2512I<MUST> call C<leave_link> as soon as possible, though. 2525for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2526though, as the palyer cannot control the character while it is on the link
2527map.
2513 2528
2514Will never block. 2529Will never block.
2515 2530
2516=item $player_object->leave_link ($map, $x, $y) 2531=item $player_object->leave_link ($map, $x, $y)
2517 2532
… …
2569 ($x, $y) = (-1, -1) 2584 ($x, $y) = (-1, -1)
2570 unless (defined $x) && (defined $y); 2585 unless (defined $x) && (defined $y);
2571 2586
2572 # use -1 or undef as default coordinates, not 0, 0 2587 # use -1 or undef as default coordinates, not 0, 0
2573 ($x, $y) = ($map->enter_x, $map->enter_y) 2588 ($x, $y) = ($map->enter_x, $map->enter_y)
2574 if $x <=0 && $y <= 0; 2589 if $x <= 0 && $y <= 0;
2575 2590
2576 $map->load; 2591 $map->load;
2577 $map->load_neighbours; 2592 $map->load_neighbours;
2578 2593
2579 return unless $self->contr->active; 2594 return unless $self->contr->active;
2580 $self->activate_recursive;
2581 2595
2582 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2596 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2583 $self->enter_map ($map, $x, $y); 2597 $self->enter_map ($map, $x, $y);
2598
2599 # only activate afterwards, to support waiting in hooks
2600 $self->activate_recursive;
2584} 2601}
2585 2602
2586=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2603=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2587 2604
2588Moves the player to the given map-path and coordinates by first freezing 2605Moves the player to the given map-path and coordinates by first freezing
2589her, loading and preparing them map, calling the provided $check callback 2606her, loading and preparing them map, calling the provided $check callback
2590that has to return the map if sucecssful, and then unfreezes the player on 2607that 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 2608the new (success) or old (failed) map position. In either case, $done will
2592be called at the end of this process. 2609be called at the end of this process.
2610
2611Note that $check will be called with a potentially non-loaded map, so if
2612it needs a loaded map it has to call C<< ->load >>.
2593 2613
2594=cut 2614=cut
2595 2615
2596our $GOTOGEN; 2616our $GOTOGEN;
2597 2617
… …
2676} 2696}
2677 2697
2678sub prepare_random_map { 2698sub prepare_random_map {
2679 my ($exit) = @_; 2699 my ($exit) = @_;
2680 2700
2681 my $guard = cf::lock_acquire "exit_prepare:$exit";
2682
2683 # all this does is basically replace the /! path by 2701 # all this does is basically replace the /! path by
2684 # a new random map path (?random/...) with a seed 2702 # a new random map path (?random/...) with a seed
2685 # that depends on the exit object 2703 # that depends on the exit object
2686 2704
2687 my $rmp = parse_random_map_params $exit->msg; 2705 my $rmp = parse_random_map_params $exit->msg;
… …
2689 if ($exit->map) { 2707 if ($exit->map) {
2690 $rmp->{region} = $exit->region->name; 2708 $rmp->{region} = $exit->region->name;
2691 $rmp->{origin_map} = $exit->map->path; 2709 $rmp->{origin_map} = $exit->map->path;
2692 $rmp->{origin_x} = $exit->x; 2710 $rmp->{origin_x} = $exit->x;
2693 $rmp->{origin_y} = $exit->y; 2711 $rmp->{origin_y} = $exit->y;
2712
2713 $exit->map->touch;
2694 } 2714 }
2695 2715
2696 $rmp->{random_seed} ||= $exit->random_seed; 2716 $rmp->{random_seed} ||= $exit->random_seed;
2697 2717
2698 my $data = cf::encode_json $rmp; 2718 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2699 my $md5 = Digest::MD5::md5_hex $data; 2719 my $md5 = Digest::MD5::md5_hex $data;
2700 my $meta = "$RANDOMDIR/$md5.meta"; 2720 my $meta = "$RANDOMDIR/$md5.meta";
2701 2721
2702 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2722 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2703 aio_write $fh, 0, (length $data), $data, 0; 2723 aio_write $fh, 0, (length $data), $data, 0;
2704 undef $fh; 2724 undef $fh;
2705 aio_rename "$meta~", $meta; 2725 aio_rename "$meta~", $meta;
2706 2726
2727 my $slaying = "?random/$md5";
2728
2729 if ($exit->valid) {
2707 $exit->slaying ("?random/$md5"); 2730 $exit->slaying ("?random/$md5");
2708 $exit->msg (undef); 2731 $exit->msg (undef);
2732 }
2709 } 2733 }
2710} 2734}
2711 2735
2712sub cf::object::player::enter_exit { 2736sub cf::object::player::enter_exit {
2713 my ($self, $exit) = @_; 2737 my ($self, $exit) = @_;
2714 2738
2715 return unless $self->type == cf::PLAYER; 2739 return unless $self->type == cf::PLAYER;
2716 2740
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; 2741 $self->enter_link;
2729 2742
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 { 2743 (async {
2735 $Coro::current->{desc} = "enter_exit $slaying $hp $sp"; 2744 $Coro::current->{desc} = "enter_exit";
2736 2745
2737 $self->deactivate_recursive; # just to be sure
2738 unless (eval { 2746 unless (eval {
2747 $self->deactivate_recursive; # just to be sure
2748
2749 # random map handling
2750 {
2751 my $guard = cf::lock_acquire "exit_prepare:$exit";
2752
2753 prepare_random_map $exit
2754 if $exit->slaying eq "/!";
2755 }
2756
2757 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2758 my $x = $exit->stats->hp;
2759 my $y = $exit->stats->sp;
2760
2739 $self->goto ($slaying, $hp, $sp); 2761 $self->goto ($map, $x, $y);
2740 2762
2763 # if exit is damned, update players death & WoR home-position
2764 $self->contr->savebed ($map, $x, $y)
2765 if $exit->flag (cf::FLAG_DAMNED);
2766
2741 1; 2767 1
2742 }) { 2768 }) {
2743 $self->message ("Something went wrong deep within the crossfire server. " 2769 $self->message ("Something went wrong deep within the deliantra server. "
2744 . "I'll try to bring you back to the map you were before. " 2770 . "I'll try to bring you back to the map you were before. "
2745 . "Please report this to the dungeon master!", 2771 . "Please report this to the dungeon master!",
2746 cf::NDI_UNIQUE | cf::NDI_RED); 2772 cf::NDI_UNIQUE | cf::NDI_RED);
2747 2773
2748 warn "ERROR in enter_exit: $@"; 2774 warn "ERROR in enter_exit: $@";
… …
2765sub cf::client::send_drawinfo { 2791sub cf::client::send_drawinfo {
2766 my ($self, $text, $flags) = @_; 2792 my ($self, $text, $flags) = @_;
2767 2793
2768 utf8::encode $text; 2794 utf8::encode $text;
2769 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2795 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2796}
2797
2798=item $client->send_big_packet ($pkt)
2799
2800Like C<send_packet>, but tries to compress large packets, and fragments
2801them as required.
2802
2803=cut
2804
2805our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2806
2807sub cf::client::send_big_packet {
2808 my ($self, $pkt) = @_;
2809
2810 # try lzf for large packets
2811 $pkt = "lzf " . Compress::LZF::compress $pkt
2812 if 1024 <= length $pkt and $self->{can_lzf};
2813
2814 # split very large packets
2815 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2816 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2817 $pkt = "frag";
2818 }
2819
2820 $self->send_packet ($pkt);
2770} 2821}
2771 2822
2772=item $client->send_msg ($channel, $msg, $color, [extra...]) 2823=item $client->send_msg ($channel, $msg, $color, [extra...])
2773 2824
2774Send a drawinfo or msg packet to the client, formatting the msg for the 2825Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2778 2829
2779=cut 2830=cut
2780 2831
2781# non-persistent channels (usually the info channel) 2832# non-persistent channels (usually the info channel)
2782our %CHANNEL = ( 2833our %CHANNEL = (
2834 "c/motd" => {
2835 id => "infobox",
2836 title => "MOTD",
2837 reply => undef,
2838 tooltip => "The message of the day",
2839 },
2783 "c/identify" => { 2840 "c/identify" => {
2784 id => "infobox", 2841 id => "infobox",
2785 title => "Identify", 2842 title => "Identify",
2786 reply => undef, 2843 reply => undef,
2787 tooltip => "Items recently identified", 2844 tooltip => "Items recently identified",
… …
2789 "c/examine" => { 2846 "c/examine" => {
2790 id => "infobox", 2847 id => "infobox",
2791 title => "Examine", 2848 title => "Examine",
2792 reply => undef, 2849 reply => undef,
2793 tooltip => "Signs and other items you examined", 2850 tooltip => "Signs and other items you examined",
2851 },
2852 "c/shopinfo" => {
2853 id => "infobox",
2854 title => "Shop Info",
2855 reply => undef,
2856 tooltip => "What your bargaining skill tells you about the shop",
2794 }, 2857 },
2795 "c/book" => { 2858 "c/book" => {
2796 id => "infobox", 2859 id => "infobox",
2797 title => "Book", 2860 title => "Book",
2798 reply => undef, 2861 reply => undef,
… …
2814 id => "infobox", 2877 id => "infobox",
2815 title => "Body Parts", 2878 title => "Body Parts",
2816 reply => undef, 2879 reply => undef,
2817 tooltip => "Shows which body parts you posess and are available", 2880 tooltip => "Shows which body parts you posess and are available",
2818 }, 2881 },
2882 "c/statistics" => {
2883 id => "infobox",
2884 title => "Statistics",
2885 reply => undef,
2886 tooltip => "Shows your primary statistics",
2887 },
2888 "c/skills" => {
2889 id => "infobox",
2890 title => "Skills",
2891 reply => undef,
2892 tooltip => "Shows your experience per skill and item power",
2893 },
2894 "c/shopitems" => {
2895 id => "infobox",
2896 title => "Shop Items",
2897 reply => undef,
2898 tooltip => "Shows the items currently for sale in this shop",
2899 },
2900 "c/resistances" => {
2901 id => "infobox",
2902 title => "Resistances",
2903 reply => undef,
2904 tooltip => "Shows your resistances",
2905 },
2906 "c/pets" => {
2907 id => "infobox",
2908 title => "Pets",
2909 reply => undef,
2910 tooltip => "Shows information abotu your pets/a specific pet",
2911 },
2912 "c/perceiveself" => {
2913 id => "infobox",
2914 title => "Perceive Self",
2915 reply => undef,
2916 tooltip => "You gained detailed knowledge about yourself",
2917 },
2819 "c/uptime" => { 2918 "c/uptime" => {
2820 id => "infobox", 2919 id => "infobox",
2821 title => "Uptime", 2920 title => "Uptime",
2822 reply => undef, 2921 reply => undef,
2823 tooltip => "How long the server has been running since last restart", 2922 tooltip => "How long the server has been running since last restart",
… …
2826 id => "infobox", 2925 id => "infobox",
2827 title => "Map Info", 2926 title => "Map Info",
2828 reply => undef, 2927 reply => undef,
2829 tooltip => "Information related to the maps", 2928 tooltip => "Information related to the maps",
2830 }, 2929 },
2930 "c/party" => {
2931 id => "party",
2932 title => "Party",
2933 reply => "gsay ",
2934 tooltip => "Messages and chat related to your party",
2935 },
2936 "c/death" => {
2937 id => "death",
2938 title => "Death",
2939 reply => undef,
2940 tooltip => "Reason for and more info about your most recent death",
2941 },
2942 "c/say" => $SAY_CHANNEL,
2943 "c/chat" => $CHAT_CHANNEL,
2831); 2944);
2832 2945
2833sub cf::client::send_msg { 2946sub cf::client::send_msg {
2834 my ($self, $channel, $msg, $color, @extra) = @_; 2947 my ($self, $channel, $msg, $color, @extra) = @_;
2835 2948
2836 $msg = $self->pl->expand_cfpod ($msg); 2949 $msg = $self->pl->expand_cfpod ($msg)
2950 unless $color & cf::NDI_VERBATIM;
2837 2951
2838 $color &= cf::NDI_CLIENT_MASK; # just in case... 2952 $color &= cf::NDI_CLIENT_MASK; # just in case...
2839 2953
2840 # check predefined channels, for the benefit of C 2954 # check predefined channels, for the benefit of C
2841 if ($CHANNEL{$channel}) { 2955 if ($CHANNEL{$channel}) {
2842 $channel = $CHANNEL{$channel}; 2956 $channel = $CHANNEL{$channel};
2843 2957
2844 $self->ext_msg (channel_info => $channel) 2958 $self->ext_msg (channel_info => $channel);
2845 if $self->can_msg;
2846
2847 $channel = $channel->{id}; 2959 $channel = $channel->{id};
2848 2960
2849 } elsif (ref $channel) { 2961 } elsif (ref $channel) {
2850 # send meta info to client, if not yet sent 2962 # send meta info to client, if not yet sent
2851 unless (exists $self->{channel}{$channel->{id}}) { 2963 unless (exists $self->{channel}{$channel->{id}}) {
2852 $self->{channel}{$channel->{id}} = $channel; 2964 $self->{channel}{$channel->{id}} = $channel;
2853 $self->ext_msg (channel_info => $channel) 2965 $self->ext_msg (channel_info => $channel);
2854 if $self->can_msg;
2855 } 2966 }
2856 2967
2857 $channel = $channel->{id}; 2968 $channel = $channel->{id};
2858 } 2969 }
2859 2970
2860 return unless @extra || length $msg; 2971 return unless @extra || length $msg;
2861 2972
2862 if ($self->can_msg) {
2863 # default colour, mask it out 2973 # default colour, mask it out
2864 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 2974 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2865 if $color & cf::NDI_DEF; 2975 if $color & cf::NDI_DEF;
2866 2976
2867 $self->send_packet ("msg " . $self->{json_coder}->encode ( 2977 my $pkt = "msg "
2978 . $self->{json_coder}->encode (
2868 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 2979 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2869 } else { 2980 );
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 2981
2881 $color &= cf::NDI_COLOR_MASK; 2982 $self->send_big_packet ($pkt);
2882
2883 utf8::encode $msg;
2884
2885 if (0 && $msg =~ /\[/) {
2886 # COMMAND/INFO
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 }
2894} 2983}
2895 2984
2896=item $client->ext_msg ($type, @msg) 2985=item $client->ext_msg ($type, @msg)
2897 2986
2898Sends an ext event to the client. 2987Sends an ext event to the client.
… …
2901 2990
2902sub cf::client::ext_msg($$@) { 2991sub cf::client::ext_msg($$@) {
2903 my ($self, $type, @msg) = @_; 2992 my ($self, $type, @msg) = @_;
2904 2993
2905 if ($self->extcmd == 2) { 2994 if ($self->extcmd == 2) {
2906 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 2995 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2907 } elsif ($self->extcmd == 1) { # TODO: remove 2996 } elsif ($self->extcmd == 1) { # TODO: remove
2908 push @msg, msgtype => "event_$type"; 2997 push @msg, msgtype => "event_$type";
2909 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 2998 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2910 } 2999 }
2911} 3000}
2912 3001
2913=item $client->ext_reply ($msgid, @msg) 3002=item $client->ext_reply ($msgid, @msg)
2914 3003
… …
2918 3007
2919sub cf::client::ext_reply($$@) { 3008sub cf::client::ext_reply($$@) {
2920 my ($self, $id, @msg) = @_; 3009 my ($self, $id, @msg) = @_;
2921 3010
2922 if ($self->extcmd == 2) { 3011 if ($self->extcmd == 2) {
2923 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg])); 3012 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2924 } elsif ($self->extcmd == 1) { 3013 } elsif ($self->extcmd == 1) {
2925 #TODO: version 1, remove 3014 #TODO: version 1, remove
2926 unshift @msg, msgtype => "reply", msgid => $id; 3015 unshift @msg, msgtype => "reply", msgid => $id;
2927 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3016 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2928 } 3017 }
2929} 3018}
2930 3019
2931=item $success = $client->query ($flags, "text", \&cb) 3020=item $success = $client->query ($flags, "text", \&cb)
2932 3021
… …
3059our $safe_hole = new Safe::Hole; 3148our $safe_hole = new Safe::Hole;
3060 3149
3061$SIG{FPE} = 'IGNORE'; 3150$SIG{FPE} = 'IGNORE';
3062 3151
3063$safe->permit_only (Opcode::opset qw( 3152$safe->permit_only (Opcode::opset qw(
3064 :base_core :base_mem :base_orig :base_math 3153 :base_core :base_mem :base_orig :base_math :base_loop
3065 grepstart grepwhile mapstart mapwhile 3154 grepstart grepwhile mapstart mapwhile
3066 sort time 3155 sort time
3067)); 3156));
3068 3157
3069# here we export the classes and methods available to script code 3158# here we export the classes and methods available to script code
… …
3072 3161
3073The following functions and methods are available within a safe environment: 3162The following functions and methods are available within a safe environment:
3074 3163
3075 cf::object 3164 cf::object
3076 contr pay_amount pay_player map x y force_find force_add destroy 3165 contr pay_amount pay_player map x y force_find force_add destroy
3077 insert remove name archname title slaying race decrease_ob_nr 3166 insert remove name archname title slaying race decrease split
3167 value
3078 3168
3079 cf::object::player 3169 cf::object::player
3080 player 3170 player
3081 3171
3082 cf::player 3172 cf::player
… …
3087 3177
3088=cut 3178=cut
3089 3179
3090for ( 3180for (
3091 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3181 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3092 insert remove inv name archname title slaying race 3182 insert remove inv nrof name archname title slaying race
3093 decrease_ob_nr destroy)], 3183 decrease split destroy change_exp value msg lore send_msg)],
3094 ["cf::object::player" => qw(player)], 3184 ["cf::object::player" => qw(player)],
3095 ["cf::player" => qw(peaceful)], 3185 ["cf::player" => qw(peaceful send_msg)],
3096 ["cf::map" => qw(trigger)], 3186 ["cf::map" => qw(trigger)],
3097) { 3187) {
3098 no strict 'refs'; 3188 no strict 'refs';
3099 my ($pkg, @funs) = @$_; 3189 my ($pkg, @funs) = @$_;
3100 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3190 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
3118 3208
3119 my $qcode = $code; 3209 my $qcode = $code;
3120 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3210 $qcode =~ s/"/‟/g; # not allowed in #line filenames
3121 $qcode =~ s/\n/\\n/g; 3211 $qcode =~ s/\n/\\n/g;
3122 3212
3213 %vars = (_dummy => 0) unless %vars;
3214
3215 my @res;
3123 local $_; 3216 local $_;
3124 local @safe::cf::_safe_eval_args = values %vars;
3125 3217
3126 my $eval = 3218 my $eval =
3127 "do {\n" 3219 "do {\n"
3128 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3220 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
3129 . "#line 0 \"{$qcode}\"\n" 3221 . "#line 0 \"{$qcode}\"\n"
3130 . $code 3222 . $code
3131 . "\n}" 3223 . "\n}"
3132 ; 3224 ;
3133 3225
3226 if ($CFG{safe_eval}) {
3134 sub_generation_inc; 3227 sub_generation_inc;
3228 local @safe::cf::_safe_eval_args = values %vars;
3135 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3229 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
3136 sub_generation_inc; 3230 sub_generation_inc;
3231 } else {
3232 local @cf::_safe_eval_args = values %vars;
3233 @res = wantarray ? eval eval : scalar eval $eval;
3234 }
3137 3235
3138 if ($@) { 3236 if ($@) {
3139 warn "$@"; 3237 warn "$@";
3140 warn "while executing safe code '$code'\n"; 3238 warn "while executing safe code '$code'\n";
3141 warn "with arguments " . (join " ", %vars) . "\n"; 3239 warn "with arguments " . (join " ", %vars) . "\n";
… …
3160=cut 3258=cut
3161 3259
3162sub register_script_function { 3260sub register_script_function {
3163 my ($fun, $cb) = @_; 3261 my ($fun, $cb) = @_;
3164 3262
3165 no strict 'refs'; 3263 $fun = "safe::$fun" if $CFG{safe_eval};
3166 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3264 *$fun = $safe_hole->wrap ($cb);
3167} 3265}
3168 3266
3169=back 3267=back
3170 3268
3171=cut 3269=cut
… …
3192 3290
3193 $facedata->{version} == 2 3291 $facedata->{version} == 2
3194 or cf::cleanup "$path: version mismatch, cannot proceed."; 3292 or cf::cleanup "$path: version mismatch, cannot proceed.";
3195 3293
3196 # patch in the exptable 3294 # patch in the exptable
3295 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3197 $facedata->{resource}{"res/exp_table"} = { 3296 $facedata->{resource}{"res/exp_table"} = {
3198 type => FT_RSRC, 3297 type => FT_RSRC,
3199 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]), 3298 data => $exp_table,
3299 hash => (Digest::MD5::md5 $exp_table),
3200 }; 3300 };
3201 cf::cede_to_tick; 3301 cf::cede_to_tick;
3202 3302
3203 { 3303 {
3204 my $faces = $facedata->{faceinfo}; 3304 my $faces = $facedata->{faceinfo};
… …
3206 while (my ($face, $info) = each %$faces) { 3306 while (my ($face, $info) = each %$faces) {
3207 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3307 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3208 3308
3209 cf::face::set_visibility $idx, $info->{visibility}; 3309 cf::face::set_visibility $idx, $info->{visibility};
3210 cf::face::set_magicmap $idx, $info->{magicmap}; 3310 cf::face::set_magicmap $idx, $info->{magicmap};
3211 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32}; 3311 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
3212 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64}; 3312 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
3213 3313
3214 cf::cede_to_tick; 3314 cf::cede_to_tick;
3215 } 3315 }
3216 3316
3217 while (my ($face, $info) = each %$faces) { 3317 while (my ($face, $info) = each %$faces) {
… …
3241 3341
3242 cf::anim::invalidate_all; # d'oh 3342 cf::anim::invalidate_all; # d'oh
3243 } 3343 }
3244 3344
3245 { 3345 {
3246 # TODO: for gcfclient pleasure, we should give resources
3247 # that gcfclient doesn't grok a >10000 face index.
3248 my $res = $facedata->{resource}; 3346 my $res = $facedata->{resource};
3249 3347
3250 while (my ($name, $info) = each %$res) { 3348 while (my ($name, $info) = each %$res) {
3251 if (defined $info->{type}) { 3349 if (defined $info->{type}) {
3252 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3350 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3253 my $data;
3254 3351
3255 if ($info->{type} & 1) { 3352 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3256 # prepend meta info
3257
3258 my $meta = $enc->encode ({
3259 name => $name,
3260 %{ $info->{meta} || {} },
3261 });
3262
3263 $data = pack "(w/a*)*", $meta, $info->{data};
3264 } else {
3265 $data = $info->{data};
3266 }
3267
3268 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3269 cf::face::set_type $idx, $info->{type}; 3353 cf::face::set_type $idx, $info->{type};
3270 } else { 3354 } else {
3271 $RESOURCE{$name} = $info; 3355 $RESOURCE{$name} = $info;
3272 } 3356 }
3273 3357
… …
3306 while (my ($k, $v) = each %$want) { 3390 while (my ($k, $v) = each %$want) {
3307 $ns->fx_want ($k, $v); 3391 $ns->fx_want ($k, $v);
3308 } 3392 }
3309}; 3393};
3310 3394
3395sub load_resource_file($) {
3396 my $guard = lock_acquire "load_resource_file";
3397
3398 my $status = load_resource_file_ $_[0];
3399 get_slot 0.1, 100;
3400 cf::arch::commit_load;
3401
3402 $status
3403}
3404
3311sub reload_regions { 3405sub reload_regions {
3312 # HACK to clear player env face cache, we need some signal framework 3406 # HACK to clear player env face cache, we need some signal framework
3313 # for this (global event?) 3407 # for this (global event?)
3314 %ext::player_env::MUSIC_FACE_CACHE = (); 3408 %ext::player_env::MUSIC_FACE_CACHE = ();
3315 3409
… …
3328} 3422}
3329 3423
3330sub reload_archetypes { 3424sub reload_archetypes {
3331 load_resource_file "$DATADIR/archetypes" 3425 load_resource_file "$DATADIR/archetypes"
3332 or die "unable to load archetypes\n"; 3426 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} 3427}
3339 3428
3340sub reload_treasures { 3429sub reload_treasures {
3341 load_resource_file "$DATADIR/treasures" 3430 load_resource_file "$DATADIR/treasures"
3342 or die "unable to load treasurelists\n"; 3431 or die "unable to load treasurelists\n";
3343} 3432}
3344 3433
3345sub reload_resources { 3434sub reload_resources {
3346 warn "reloading resource files...\n"; 3435 warn "reloading resource files...\n";
3347 3436
3437 reload_facedata;
3438 reload_archetypes;
3348 reload_regions; 3439 reload_regions;
3349 reload_facedata;
3350 #reload_archetypes;#d#
3351 reload_archetypes;
3352 reload_treasures; 3440 reload_treasures;
3353 3441
3354 warn "finished reloading resource files\n"; 3442 warn "finished reloading resource files\n";
3355} 3443}
3356 3444
3357sub init {
3358 reload_resources;
3359}
3360
3361sub reload_config { 3445sub reload_config {
3446 warn "reloading config file...\n";
3447
3362 open my $fh, "<:utf8", "$CONFDIR/config" 3448 open my $fh, "<:utf8", "$CONFDIR/config"
3363 or return; 3449 or return;
3364 3450
3365 local $/; 3451 local $/;
3366 *CFG = YAML::Load <$fh>; 3452 *CFG = YAML::XS::Load scalar <$fh>;
3367 3453
3368 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3454 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
3369 3455
3370 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3456 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
3371 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3457 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
3375 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3461 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
3376 and die "WARNING: m(un)lockall failed: $!\n"; 3462 and die "WARNING: m(un)lockall failed: $!\n";
3377 }; 3463 };
3378 warn $@ if $@; 3464 warn $@ if $@;
3379 } 3465 }
3466
3467 warn "finished reloading resource files\n";
3468}
3469
3470sub pidfile() {
3471 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3472 or die "$PIDFILE: $!";
3473 flock $fh, &Fcntl::LOCK_EX
3474 or die "$PIDFILE: flock: $!";
3475 $fh
3476}
3477
3478# make sure only one server instance is running at any one time
3479sub atomic {
3480 my $fh = pidfile;
3481
3482 my $pid = <$fh>;
3483 kill 9, $pid if $pid > 0;
3484
3485 seek $fh, 0, 0;
3486 print $fh $$;
3487}
3488
3489sub main_loop {
3490 warn "EV::loop starting\n";
3491 if (1) {
3492 EV::loop;
3493 }
3494 warn "EV::loop returned\n";
3495 goto &main_loop unless $REALLY_UNLOOP;
3380} 3496}
3381 3497
3382sub main { 3498sub main {
3499 cf::init_globals; # initialise logging
3500
3501 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3502 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3503 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3504 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3505
3506 cf::init_experience;
3507 cf::init_anim;
3508 cf::init_attackmess;
3509 cf::init_dynamic;
3510
3511 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3512
3383 # we must not ever block the main coroutine 3513 # we must not ever block the main coroutine
3384 local $Coro::idle = sub { 3514 local $Coro::idle = sub {
3385 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3515 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3386 (async { 3516 (async {
3387 $Coro::current->{desc} = "IDLE BUG HANDLER"; 3517 $Coro::current->{desc} = "IDLE BUG HANDLER";
3388 EV::loop EV::LOOP_ONESHOT; 3518 EV::loop EV::LOOP_ONESHOT;
3389 })->prio (Coro::PRIO_MAX); 3519 })->prio (Coro::PRIO_MAX);
3390 }; 3520 };
3391 3521
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; 3522 evthread_start IO::AIO::poll_fileno;
3398 EV::loop; 3523
3524 cf::sync_job {
3525 cf::load_settings;
3526 cf::load_materials;
3527
3528 reload_resources;
3529 reload_config;
3530 db_init;
3531
3532 cf::init_uuid;
3533 cf::init_signals;
3534 cf::init_commands;
3535 cf::init_skills;
3536
3537 cf::init_beforeplay;
3538
3539 atomic;
3540
3541 load_extensions;
3542
3543 utime time, time, $RUNTIMEFILE;
3544
3545 # no (long-running) fork's whatsoever before this point(!)
3546 use POSIX ();
3547 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3548
3549 (pop @POST_INIT)->(0) while @POST_INIT;
3550 };
3551
3552 main_loop;
3399} 3553}
3400 3554
3401############################################################################# 3555#############################################################################
3402# initialisation and cleanup 3556# initialisation and cleanup
3403 3557
… …
3410 }; 3564 };
3411 } 3565 }
3412} 3566}
3413 3567
3414sub write_runtime_sync { 3568sub write_runtime_sync {
3415 my $runtime = "$LOCALDIR/runtime";
3416
3417 # first touch the runtime file to show we are still running: 3569 # first touch the runtime file to show we are still running:
3418 # the fsync below can take a very very long time. 3570 # the fsync below can take a very very long time.
3419 3571
3420 IO::AIO::aio_utime $runtime, undef, undef; 3572 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3421 3573
3422 my $guard = cf::lock_acquire "write_runtime"; 3574 my $guard = cf::lock_acquire "write_runtime";
3423 3575
3424 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3576 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT, 0644
3425 or return; 3577 or return;
3426 3578
3427 my $value = $cf::RUNTIME + 90 + 10; 3579 my $value = $cf::RUNTIME + 90 + 10;
3428 # 10 is the runtime save interval, for a monotonic clock 3580 # 10 is the runtime save interval, for a monotonic clock
3429 # 60 allows for the watchdog to kill the server. 3581 # 60 allows for the watchdog to kill the server.
… …
3439 aio_utime $fh, undef, undef; 3591 aio_utime $fh, undef, undef;
3440 3592
3441 close $fh 3593 close $fh
3442 or return; 3594 or return;
3443 3595
3444 aio_rename "$runtime~", $runtime 3596 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3445 and return; 3597 and return;
3446 3598
3447 warn "runtime file written.\n"; 3599 warn "runtime file written.\n";
3448 3600
3449 1 3601 1
… …
3461 my $uuid = "$LOCALDIR/uuid"; 3613 my $uuid = "$LOCALDIR/uuid";
3462 3614
3463 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644 3615 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3464 or return; 3616 or return;
3465 3617
3466 my $value = uuid_str $uuid_skip + uuid_seq uuid_cur; 3618 my $value = uuid_seq uuid_cur;
3619
3620 unless ($value) {
3621 warn "cowardly refusing to write zero uuid value!\n";
3622 return;
3623 }
3624
3625 my $value = uuid_str $value + $uuid_skip;
3467 $uuid_skip = 0; 3626 $uuid_skip = 0;
3468 3627
3469 (aio_write $fh, 0, (length $value), $value, 0) <= 0 3628 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3470 and return; 3629 and return;
3471 3630
… …
3493} 3652}
3494 3653
3495sub emergency_save() { 3654sub emergency_save() {
3496 my $freeze_guard = cf::freeze_mainloop; 3655 my $freeze_guard = cf::freeze_mainloop;
3497 3656
3498 warn "enter emergency perl save\n"; 3657 warn "emergency_perl_save: enter\n";
3499 3658
3500 cf::sync_job { 3659 cf::sync_job {
3660 # this is a trade-off: we want to be very quick here, so
3661 # save all maps without fsync, and later call a global sync
3662 # (which in turn might be very very slow)
3663 local $USE_FSYNC = 0;
3664
3501 # use a peculiar iteration method to avoid tripping on perl 3665 # use a peculiar iteration method to avoid tripping on perl
3502 # refcount bugs in for. also avoids problems with players 3666 # refcount bugs in for. also avoids problems with players
3503 # and maps saved/destroyed asynchronously. 3667 # and maps saved/destroyed asynchronously.
3504 warn "begin emergency player save\n"; 3668 warn "emergency_perl_save: begin player save\n";
3505 for my $login (keys %cf::PLAYER) { 3669 for my $login (keys %cf::PLAYER) {
3506 my $pl = $cf::PLAYER{$login} or next; 3670 my $pl = $cf::PLAYER{$login} or next;
3507 $pl->valid or next; 3671 $pl->valid or next;
3508 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt 3672 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3509 $pl->save; 3673 $pl->save;
3510 } 3674 }
3511 warn "end emergency player save\n"; 3675 warn "emergency_perl_save: end player save\n";
3512 3676
3513 warn "begin emergency map save\n"; 3677 warn "emergency_perl_save: begin map save\n";
3514 for my $path (keys %cf::MAP) { 3678 for my $path (keys %cf::MAP) {
3515 my $map = $cf::MAP{$path} or next; 3679 my $map = $cf::MAP{$path} or next;
3516 $map->valid or next; 3680 $map->valid or next;
3517 $map->save; 3681 $map->save;
3518 } 3682 }
3519 warn "end emergency map save\n"; 3683 warn "emergency_perl_save: end map save\n";
3520 3684
3521 warn "begin emergency database checkpoint\n"; 3685 warn "emergency_perl_save: begin database checkpoint\n";
3522 BDB::db_env_txn_checkpoint $DB_ENV; 3686 BDB::db_env_txn_checkpoint $DB_ENV;
3523 warn "end emergency database checkpoint\n"; 3687 warn "emergency_perl_save: end database checkpoint\n";
3524 3688
3525 warn "begin write uuid\n"; 3689 warn "emergency_perl_save: begin write uuid\n";
3526 write_uuid_sync 1; 3690 write_uuid_sync 1;
3527 warn "end write uuid\n"; 3691 warn "emergency_perl_save: end write uuid\n";
3528 }; 3692 };
3529 3693
3694 warn "emergency_perl_save: starting sync()\n";
3695 IO::AIO::aio_sync sub {
3696 warn "emergency_perl_save: finished sync()\n";
3697 };
3698
3530 warn "leave emergency perl save\n"; 3699 warn "emergency_perl_save: leave\n";
3531} 3700}
3532 3701
3533sub post_cleanup { 3702sub post_cleanup {
3534 my ($make_core) = @_; 3703 my ($make_core) = @_;
3535 3704
3536 warn Carp::longmess "post_cleanup backtrace" 3705 warn Carp::longmess "post_cleanup backtrace"
3537 if $make_core; 3706 if $make_core;
3707
3708 my $fh = pidfile;
3709 unlink $PIDFILE if <$fh> == $$;
3710}
3711
3712# a safer delete_package, copied from Symbol
3713sub clear_package($) {
3714 my $pkg = shift;
3715
3716 # expand to full symbol table name if needed
3717 unless ($pkg =~ /^main::.*::$/) {
3718 $pkg = "main$pkg" if $pkg =~ /^::/;
3719 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3720 $pkg .= '::' unless $pkg =~ /::$/;
3721 }
3722
3723 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3724 my $stem_symtab = *{$stem}{HASH};
3725
3726 defined $stem_symtab and exists $stem_symtab->{$leaf}
3727 or return;
3728
3729 # clear all symbols
3730 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3731 for my $name (keys %$leaf_symtab) {
3732 _gv_clear *{"$pkg$name"};
3733# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3734 }
3735 warn "cleared package $pkg\n";#d#
3538} 3736}
3539 3737
3540sub do_reload_perl() { 3738sub do_reload_perl() {
3541 # can/must only be called in main 3739 # can/must only be called in main
3542 if ($Coro::current != $Coro::main) { 3740 if ($Coro::current != $Coro::main) {
3543 warn "can only reload from main coroutine"; 3741 warn "can only reload from main coroutine";
3544 return; 3742 return;
3545 } 3743 }
3546 3744
3745 return if $RELOAD++;
3746
3747 my $t1 = EV::time;
3748
3749 while ($RELOAD) {
3547 warn "reloading..."; 3750 warn "reloading...";
3548 3751
3549 warn "entering sync_job"; 3752 warn "entering sync_job";
3550 3753
3551 cf::sync_job { 3754 cf::sync_job {
3552 cf::write_runtime_sync; # external watchdog should not bark 3755 cf::write_runtime_sync; # external watchdog should not bark
3553 cf::emergency_save; 3756 cf::emergency_save;
3554 cf::write_runtime_sync; # external watchdog should not bark 3757 cf::write_runtime_sync; # external watchdog should not bark
3555 3758
3556 warn "syncing database to disk"; 3759 warn "syncing database to disk";
3557 BDB::db_env_txn_checkpoint $DB_ENV; 3760 BDB::db_env_txn_checkpoint $DB_ENV;
3558 3761
3559 # if anything goes wrong in here, we should simply crash as we already saved 3762 # if anything goes wrong in here, we should simply crash as we already saved
3560 3763
3561 warn "flushing outstanding aio requests"; 3764 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; 3765 while (IO::AIO::nreqs || BDB::nreqs) {
3567 warn "iterate..."; 3766 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 } 3767 }
3593 3768
3594 warn "... nuking $pkg"; 3769 warn "cancelling all extension coros";
3595 Symbol::delete_package $pkg; 3770 $_->cancel for values %EXT_CORO;
3596 } 3771 %EXT_CORO = ();
3597 3772
3598 warn "unloading all perl modules loaded from $LIBDIR"; 3773 warn "removing commands";
3599 while (my ($k, $v) = each %INC) { 3774 %COMMAND = ();
3600 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3601 3775
3776 warn "removing ext/exti commands";
3777 %EXTCMD = ();
3778 %EXTICMD = ();
3779
3780 warn "unloading/nuking all extensions";
3781 for my $pkg (@EXTS) {
3602 warn "... unloading $k"; 3782 warn "... unloading $pkg";
3603 delete $INC{$k};
3604 3783
3605 $k =~ s/\.pm$//;
3606 $k =~ s/\//::/g;
3607
3608 if (my $cb = $k->can ("unload_module")) { 3784 if (my $cb = $pkg->can ("unload")) {
3785 eval {
3609 $cb->(); 3786 $cb->($pkg);
3787 1
3788 } or warn "$pkg unloaded, but with errors: $@";
3789 }
3790
3791 warn "... clearing $pkg";
3792 clear_package $pkg;
3610 } 3793 }
3611 3794
3612 Symbol::delete_package $k; 3795 warn "unloading all perl modules loaded from $LIBDIR";
3796 while (my ($k, $v) = each %INC) {
3797 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3798
3799 warn "... unloading $k";
3800 delete $INC{$k};
3801
3802 $k =~ s/\.pm$//;
3803 $k =~ s/\//::/g;
3804
3805 if (my $cb = $k->can ("unload_module")) {
3806 $cb->();
3807 }
3808
3809 clear_package $k;
3613 } 3810 }
3614 3811
3615 warn "getting rid of safe::, as good as possible"; 3812 warn "getting rid of safe::, as good as possible";
3616 Symbol::delete_package "safe::$_" 3813 clear_package "safe::$_"
3617 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3814 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3618 3815
3619 warn "unloading cf.pm \"a bit\""; 3816 warn "unloading cf.pm \"a bit\"";
3620 delete $INC{"cf.pm"}; 3817 delete $INC{"cf.pm"};
3621 delete $INC{"cf/pod.pm"}; 3818 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3622 3819
3623 # don't, removes xs symbols, too, 3820 # don't, removes xs symbols, too,
3624 # and global variables created in xs 3821 # and global variables created in xs
3625 #Symbol::delete_package __PACKAGE__; 3822 #clear_package __PACKAGE__;
3626 3823
3627 warn "unload completed, starting to reload now"; 3824 warn "unload completed, starting to reload now";
3628 3825
3629 warn "reloading cf.pm"; 3826 warn "reloading cf.pm";
3630 require cf; 3827 require cf;
3631 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3828 cf::_connect_to_perl_1;
3632 3829
3633 warn "loading config and database again"; 3830 warn "loading config and database again";
3634 cf::reload_config; 3831 cf::reload_config;
3635 3832
3636 warn "loading extensions"; 3833 warn "loading extensions";
3637 cf::load_extensions; 3834 cf::load_extensions;
3638 3835
3836 if ($REATTACH_ON_RELOAD) {
3639 warn "reattaching attachments to objects/players"; 3837 warn "reattaching attachments to objects/players";
3640 _global_reattach; # objects, sockets 3838 _global_reattach; # objects, sockets
3641 warn "reattaching attachments to maps"; 3839 warn "reattaching attachments to maps";
3642 reattach $_ for values %MAP; 3840 reattach $_ for values %MAP;
3643 warn "reattaching attachments to players"; 3841 warn "reattaching attachments to players";
3644 reattach $_ for values %PLAYER; 3842 reattach $_ for values %PLAYER;
3843 }
3645 3844
3845 warn "running post_init jobs";
3846 (pop @POST_INIT)->(1) while @POST_INIT;
3847
3646 warn "leaving sync_job"; 3848 warn "leaving sync_job";
3647 3849
3648 1 3850 1
3649 } or do { 3851 } or do {
3650 warn $@; 3852 warn $@;
3651 cf::cleanup "error while reloading, exiting."; 3853 cf::cleanup "error while reloading, exiting.";
3652 }; 3854 };
3653 3855
3654 warn "reloaded"; 3856 warn "reloaded";
3857 --$RELOAD;
3858 }
3859
3860 $t1 = EV::time - $t1;
3861 warn "reload completed in ${t1}s\n";
3655}; 3862};
3656 3863
3657our $RELOAD_WATCHER; # used only during reload 3864our $RELOAD_WATCHER; # used only during reload
3658 3865
3659sub reload_perl() { 3866sub reload_perl() {
3660 # doing reload synchronously and two reloads happen back-to-back, 3867 # doing reload synchronously and two reloads happen back-to-back,
3661 # coro crashes during coro_state_free->destroy here. 3868 # coro crashes during coro_state_free->destroy here.
3662 3869
3870 $RELOAD_WATCHER ||= cf::async {
3871 Coro::AIO::aio_wait cache_extensions;
3872
3663 $RELOAD_WATCHER ||= EV::timer 0, 0, sub { 3873 $RELOAD_WATCHER = EV::timer $TICK * 1.5, 0, sub {
3664 do_reload_perl; 3874 do_reload_perl;
3665 undef $RELOAD_WATCHER; 3875 undef $RELOAD_WATCHER;
3876 };
3666 }; 3877 };
3667} 3878}
3668 3879
3669register_command "reload" => sub { 3880register_command "reload" => sub {
3670 my ($who, $arg) = @_; 3881 my ($who, $arg) = @_;
… …
3684 3895
3685our @WAIT_FOR_TICK; 3896our @WAIT_FOR_TICK;
3686our @WAIT_FOR_TICK_BEGIN; 3897our @WAIT_FOR_TICK_BEGIN;
3687 3898
3688sub wait_for_tick { 3899sub wait_for_tick {
3689 return if tick_inhibit;
3690 return if $Coro::current == $Coro::main; 3900 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3691 3901
3692 my $signal = new Coro::Signal; 3902 my $signal = new Coro::Signal;
3693 push @WAIT_FOR_TICK, $signal; 3903 push @WAIT_FOR_TICK, $signal;
3694 $signal->wait; 3904 $signal->wait;
3695} 3905}
3696 3906
3697sub wait_for_tick_begin { 3907sub wait_for_tick_begin {
3698 return if tick_inhibit;
3699 return if $Coro::current == $Coro::main; 3908 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3700 3909
3701 my $signal = new Coro::Signal; 3910 my $signal = new Coro::Signal;
3702 push @WAIT_FOR_TICK_BEGIN, $signal; 3911 push @WAIT_FOR_TICK_BEGIN, $signal;
3703 $signal->wait; 3912 $signal->wait;
3704} 3913}
… …
3709 unless ++$bug_warning > 10; 3918 unless ++$bug_warning > 10;
3710 return; 3919 return;
3711 } 3920 }
3712 3921
3713 cf::server_tick; # one server iteration 3922 cf::server_tick; # one server iteration
3923
3924 #for(1..3e6){} EV::now_update; $NOW=EV::now; # generate load #d#
3714 3925
3715 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3926 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3716 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.; 3927 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3717 Coro::async_pool { 3928 Coro::async_pool {
3718 $Coro::current->{desc} = "runtime saver"; 3929 $Coro::current->{desc} = "runtime saver";
… …
3743{ 3954{
3744 # configure BDB 3955 # configure BDB
3745 3956
3746 BDB::min_parallel 8; 3957 BDB::min_parallel 8;
3747 BDB::max_poll_reqs $TICK * 0.1; 3958 BDB::max_poll_reqs $TICK * 0.1;
3748 $Coro::BDB::WATCHER->priority (1); 3959 $AnyEvent::BDB::WATCHER->priority (1);
3749 3960
3750 unless ($DB_ENV) { 3961 unless ($DB_ENV) {
3751 $DB_ENV = BDB::db_env_create; 3962 $DB_ENV = BDB::db_env_create;
3752 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC 3963 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
3753 | BDB::LOG_AUTOREMOVE, 1); 3964 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
3965 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
3754 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT); 3966 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3755 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT); 3967 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3756 3968
3757 cf::sync_job { 3969 cf::sync_job {
3758 eval { 3970 eval {
… …
3784{ 3996{
3785 # configure IO::AIO 3997 # configure IO::AIO
3786 3998
3787 IO::AIO::min_parallel 8; 3999 IO::AIO::min_parallel 8;
3788 IO::AIO::max_poll_time $TICK * 0.1; 4000 IO::AIO::max_poll_time $TICK * 0.1;
3789 $Coro::AIO::WATCHER->priority (1); 4001 undef $AnyEvent::AIO::WATCHER;
3790} 4002}
3791 4003
3792my $_log_backtrace; 4004my $_log_backtrace;
3793 4005
3794sub _log_backtrace { 4006sub _log_backtrace {
… …
3797 $msg =~ s/\n//; 4009 $msg =~ s/\n//;
3798 4010
3799 # limit the # of concurrent backtraces 4011 # limit the # of concurrent backtraces
3800 if ($_log_backtrace < 2) { 4012 if ($_log_backtrace < 2) {
3801 ++$_log_backtrace; 4013 ++$_log_backtrace;
4014 my $perl_bt = Carp::longmess $msg;
3802 async { 4015 async {
3803 $Coro::current->{desc} = "abt $msg"; 4016 $Coro::current->{desc} = "abt $msg";
3804 4017
3805 my @bt = fork_call { 4018 my @bt = fork_call {
3806 @addr = map { sprintf "%x", $_ } @addr; 4019 @addr = map { sprintf "%x", $_ } @addr;
… …
3817 } 4030 }
3818 4031
3819 @funcs 4032 @funcs
3820 }; 4033 };
3821 4034
3822 LOG llevInfo, "[ABT] $msg\n"; 4035 LOG llevInfo, "[ABT] $perl_bt\n";
4036 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3823 LOG llevInfo, "[ABT] $_\n" for @bt; 4037 LOG llevInfo, "[ABT] $_\n" for @bt;
3824 --$_log_backtrace; 4038 --$_log_backtrace;
3825 }; 4039 };
3826 } else { 4040 } else {
3827 LOG llevInfo, "[ABT] $msg\n"; 4041 LOG llevInfo, "[ABT] $msg\n";
3828 LOG llevInfo, "[ABT] [suppressed]\n"; 4042 LOG llevInfo, "[ABT] [suppressed]\n";
3829 } 4043 }
3830} 4044}
3831 4045
3832# load additional modules 4046# load additional modules
3833use cf::pod; 4047require "cf/$_.pm" for @EXTRA_MODULES;
4048cf::_connect_to_perl_2;
3834 4049
3835END { cf::emergency_save } 4050END { cf::emergency_save }
3836 4051
38371 40521
3838 4053

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines