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.325 by root, Sat Jul 28 14:32:22 2007 UTC vs.
Revision 1.522 by root, Sat Apr 17 02:22:14 2010 UTC

1#
2# This file is part of Deliantra, the Roguelike Realtime MMORPG.
3#
4# Copyright (©) 2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5#
6# Deliantra is free software: you can redistribute it and/or modify it under
7# the terms of the Affero GNU General Public License as published by the
8# Free Software Foundation, either version 3 of the License, or (at your
9# option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU General Public License for more details.
15#
16# You should have received a copy of the Affero GNU General Public License
17# and the GNU General Public License along with this program. If not, see
18# <http://www.gnu.org/licenses/>.
19#
20# The authors can be reached via e-mail to <support@deliantra.net>
21#
22
1package cf; 23package cf;
2 24
25use 5.10.0;
3use utf8; 26use utf8;
4use strict; 27use strict qw(vars subs);
5 28
6use Symbol; 29use Symbol;
7use List::Util; 30use List::Util;
8use Socket; 31use Socket;
9use Storable; 32use EV;
10use Event;
11use Opcode; 33use Opcode;
12use Safe; 34use Safe;
13use Safe::Hole; 35use Safe::Hole;
36use Storable ();
37use Carp ();
14 38
39use Guard ();
15use Coro 3.61 (); 40use Coro ();
16use Coro::State; 41use Coro::State;
17use Coro::Handle; 42use Coro::Handle;
43use Coro::EV;
18use Coro::Event; 44use Coro::AnyEvent;
19use Coro::Timer; 45use Coro::Timer;
20use Coro::Signal; 46use Coro::Signal;
21use Coro::Semaphore; 47use Coro::Semaphore;
48use Coro::SemaphoreSet;
49use Coro::AnyEvent;
22use Coro::AIO; 50use Coro::AIO;
51use Coro::BDB 1.6;
23use Coro::Storable; 52use Coro::Storable;
53use Coro::Util ();
24 54
25use JSON::XS 1.4 (); 55use JSON::XS 2.01 ();
26use BDB (); 56use BDB ();
27use Data::Dumper; 57use Data::Dumper;
28use Digest::MD5;
29use Fcntl; 58use Fcntl;
30use YAML::Syck (); 59use YAML::XS ();
31use IO::AIO 2.32 (); 60use IO::AIO ();
32use Time::HiRes; 61use Time::HiRes;
33use Compress::LZF; 62use Compress::LZF;
34use Digest::MD5 (); 63use Digest::MD5 ();
64
65AnyEvent::detect;
35 66
36# configure various modules to our taste 67# configure various modules to our taste
37# 68#
38$Storable::canonical = 1; # reduce rsync transfers 69$Storable::canonical = 1; # reduce rsync transfers
39Coro::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";
40Compress::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
41 77
42$Event::Eval = 1; # no idea why this is required, but it is 78# strictly for debugging
43 79$SIG{QUIT} = sub { Carp::cluck "SIGQUIT" };
44# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
45$YAML::Syck::ImplicitUnicode = 1;
46
47$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
48 80
49sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 81sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
50 82
51our %COMMAND = (); 83our %COMMAND = ();
52our %COMMAND_TIME = (); 84our %COMMAND_TIME = ();
… …
55our %EXTCMD = (); 87our %EXTCMD = ();
56our %EXTICMD = (); 88our %EXTICMD = ();
57our %EXT_CORO = (); # coroutines bound to extensions 89our %EXT_CORO = (); # coroutines bound to extensions
58our %EXT_MAP = (); # pluggable maps 90our %EXT_MAP = (); # pluggable maps
59 91
60our $RELOAD; # number of reloads so far 92our $RELOAD; # number of reloads so far, non-zero while in reload
61our @EVENT; 93our @EVENT;
94our @REFLECT; # set by XS
95our %REFLECT; # set by us
62 96
63our $CONFDIR = confdir; 97our $CONFDIR = confdir;
64our $DATADIR = datadir; 98our $DATADIR = datadir;
65our $LIBDIR = "$DATADIR/ext"; 99our $LIBDIR = "$DATADIR/ext";
66our $PODDIR = "$DATADIR/pod"; 100our $PODDIR = "$DATADIR/pod";
67our $MAPDIR = "$DATADIR/" . mapdir; 101our $MAPDIR = "$DATADIR/" . mapdir;
68our $LOCALDIR = localdir; 102our $LOCALDIR = localdir;
69our $TMPDIR = "$LOCALDIR/" . tmpdir; 103our $TMPDIR = "$LOCALDIR/" . tmpdir;
70our $UNIQUEDIR = "$LOCALDIR/" . uniquedir; 104our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
71our $PLAYERDIR = "$LOCALDIR/" . playerdir; 105our $PLAYERDIR = "$LOCALDIR/" . playerdir;
72our $RANDOMDIR = "$LOCALDIR/random"; 106our $RANDOMDIR = "$LOCALDIR/random";
73our $BDBDIR = "$LOCALDIR/db"; 107our $BDBDIR = "$LOCALDIR/db";
108our $PIDFILE = "$LOCALDIR/pid";
109our $RUNTIMEFILE = "$LOCALDIR/runtime";
110
111our %RESOURCE;
112
113our $OUTPUT_RATE_MIN = 4000;
114our $OUTPUT_RATE_MAX = 100000;
74 115
75our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!) 116our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
76our $TICK_WATCHER;
77our $AIO_POLL_WATCHER;
78our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 117our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
79our $NEXT_TICK; 118our $NEXT_TICK;
80our $NOW;
81our $USE_FSYNC = 1; # use fsync to write maps - default off 119our $USE_FSYNC = 1; # use fsync to write maps - default on
82 120
121our $BDB_DEADLOCK_WATCHER;
122our $BDB_CHECKPOINT_WATCHER;
83our $BDB_POLL_WATCHER; 123our $BDB_TRICKLE_WATCHER;
84our $DB_ENV; 124our $DB_ENV;
125
126our @EXTRA_MODULES = qw(pod match mapscript);
85 127
86our %CFG; 128our %CFG;
87 129
88our $UPTIME; $UPTIME ||= time; 130our $UPTIME; $UPTIME ||= time;
89our $RUNTIME; 131our $RUNTIME;
132our $NOW;
90 133
91our %PLAYER; # all users 134our (%PLAYER, %PLAYER_LOADING); # all users
92our %MAP; # all maps 135our (%MAP, %MAP_LOADING ); # all maps
93our $LINK_MAP; # the special {link} map, which is always available 136our $LINK_MAP; # the special {link} map, which is always available
94 137
95# used to convert map paths into valid unix filenames by replacing / by ∕ 138# used to convert map paths into valid unix filenames by replacing / by ∕
96our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 139our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
97 140
98our $LOAD; # a number between 0 (idle) and 1 (too many objects) 141our $LOAD; # a number between 0 (idle) and 1 (too many objects)
99our $LOADAVG; # same thing, but with alpha-smoothing 142our $LOADAVG; # same thing, but with alpha-smoothing
143our $JITTER; # average jitter
100our $tick_start; # for load detecting purposes 144our $TICK_START; # for load detecting purposes
145
146our @POST_INIT;
147
148our $REATTACH_ON_RELOAD; # set to true to force object reattach on reload (slow)
149our $REALLY_UNLOOP; # never set to true, please :)
101 150
102binmode STDOUT; 151binmode STDOUT;
103binmode STDERR; 152binmode STDERR;
104 153
105# read virtual server time, if available 154# read virtual server time, if available
106unless ($RUNTIME || !-e "$LOCALDIR/runtime") { 155unless ($RUNTIME || !-e $RUNTIMEFILE) {
107 open my $fh, "<", "$LOCALDIR/runtime" 156 open my $fh, "<", $RUNTIMEFILE
108 or die "unable to read runtime file: $!"; 157 or die "unable to read $RUNTIMEFILE file: $!";
109 $RUNTIME = <$fh> + 0.; 158 $RUNTIME = <$fh> + 0.;
110} 159}
160
161eval "sub TICK() { $TICK } 1" or die;
111 162
112mkdir $_ 163mkdir $_
113 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR; 164 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
114 165
115our $EMERGENCY_POSITION; 166our $EMERGENCY_POSITION;
116 167
117sub cf::map::normalise; 168sub cf::map::normalise;
169
170sub in_main() {
171 $Coro::current == $Coro::main
172}
173
174#############################################################################
175
176%REFLECT = ();
177for (@REFLECT) {
178 my $reflect = JSON::XS::decode_json $_;
179 $REFLECT{$reflect->{class}} = $reflect;
180}
181
182# this is decidedly evil
183$REFLECT{object}{flags} = { map +($_ => undef), grep $_, map /^FLAG_([A-Z0-9_]+)$/ && lc $1, keys %{"cf::"} };
118 184
119############################################################################# 185#############################################################################
120 186
121=head2 GLOBAL VARIABLES 187=head2 GLOBAL VARIABLES
122 188
… …
158 224
159The raw value load value from the last tick. 225The raw value load value from the last tick.
160 226
161=item %cf::CFG 227=item %cf::CFG
162 228
163Configuration for the server, loaded from C</etc/crossfire/config>, or 229Configuration for the server, loaded from C</etc/deliantra-server/config>, or
164from wherever your confdir points to. 230from wherever your confdir points to.
165 231
166=item cf::wait_for_tick, cf::wait_for_tick_begin 232=item cf::wait_for_tick, cf::wait_for_tick_begin
167 233
168These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only 234These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
169returns directly I<after> the tick processing (and consequently, can only wake one process 235returns directly I<after> the tick processing (and consequently, can only wake one process
170per tick), while cf::wait_for_tick wakes up all waiters after tick processing. 236per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
171 237
172=item @cf::INVOKE_RESULTS 238=item @cf::INVOKE_RESULTS
173 239
174This array contains the results of the last C<invoke ()> call. When 240This array contains the results of the last C<invoke ()> call. When
175C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of 241C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
176that call. 242that call.
177 243
244=item %cf::REFLECT
245
246Contains, for each (C++) class name, a hash reference with information
247about object members (methods, scalars, arrays and flags) and other
248metadata, which is useful for introspection.
249
178=back 250=back
179 251
180=cut 252=cut
181 253
182BEGIN { 254$Coro::State::WARNHOOK = sub {
183 *CORE::GLOBAL::warn = sub {
184 my $msg = join "", @_; 255 my $msg = join "", @_;
185 256
186 $msg .= "\n" 257 $msg .= "\n"
187 unless $msg =~ /\n$/; 258 unless $msg =~ /\n$/;
188 259
189 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge; 260 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
190 261
191 utf8::encode $msg;
192 LOG llevError, $msg; 262 LOG llevError, $msg;
193 }; 263};
194} 264
265$Coro::State::DIEHOOK = sub {
266 return unless $^S eq 0; # "eq", not "=="
267
268 warn Carp::longmess $_[0];
269
270 if (in_main) {#d#
271 warn "DIEHOOK called in main context, Coro bug?\n";#d#
272 return;#d#
273 }#d#
274
275 # kill coroutine otherwise
276 Coro::terminate
277};
195 278
196@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 279@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
197@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 280@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
198@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 281@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
199@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 282@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
… …
206for my $pkg (qw( 289for my $pkg (qw(
207 cf::global cf::attachable 290 cf::global cf::attachable
208 cf::object cf::object::player 291 cf::object cf::object::player
209 cf::client cf::player 292 cf::client cf::player
210 cf::arch cf::living 293 cf::arch cf::living
294 cf::map cf::mapspace
211 cf::map cf::party cf::region 295 cf::party cf::region
212)) { 296)) {
213 no strict 'refs';
214 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg; 297 @{"safe::$pkg\::wrap::ISA"} = @{"$pkg\::wrap::ISA"} = $pkg;
215} 298}
216 299
217$Event::DIED = sub { 300$EV::DIED = sub {
218 warn "error in event callback: @_"; 301 Carp::cluck "error in event callback: @_";
219}; 302};
220 303
221############################################################################# 304#############################################################################
222 305
223=head2 UTILITY FUNCTIONS 306=head2 UTILITY FUNCTIONS
… …
245 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 328 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
246 $d 329 $d
247 } || "[unable to dump $_[0]: '$@']"; 330 } || "[unable to dump $_[0]: '$@']";
248} 331}
249 332
250=item $ref = cf::from_json $json 333=item $ref = cf::decode_json $json
251 334
252Converts a JSON string into the corresponding perl data structure. 335Converts a JSON string into the corresponding perl data structure.
253 336
254=item $json = cf::to_json $ref 337=item $json = cf::encode_json $ref
255 338
256Converts a perl data structure into its JSON representation. 339Converts a perl data structure into its JSON representation.
257 340
258=cut 341=cut
259 342
260our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max 343our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
261 344
262sub to_json ($) { $json_coder->encode ($_[0]) } 345sub encode_json($) { $json_coder->encode ($_[0]) }
263sub from_json ($) { $json_coder->decode ($_[0]) } 346sub decode_json($) { $json_coder->decode ($_[0]) }
347
348=item cf::post_init { BLOCK }
349
350Execute the given codeblock, I<after> all extensions have been (re-)loaded,
351but I<before> the server starts ticking again.
352
353The cdoeblock will have a single boolean argument to indicate whether this
354is a reload or not.
355
356=cut
357
358sub post_init(&) {
359 push @POST_INIT, shift;
360}
264 361
265=item cf::lock_wait $string 362=item cf::lock_wait $string
266 363
267Wait until the given lock is available. See cf::lock_acquire. 364Wait until the given lock is available. See cf::lock_acquire.
268 365
269=item my $lock = cf::lock_acquire $string 366=item my $lock = cf::lock_acquire $string
270 367
271Wait until the given lock is available and then acquires it and returns 368Wait until the given lock is available and then acquires it and returns
272a Coro::guard object. If the guard object gets destroyed (goes out of scope, 369a L<Guard> object. If the guard object gets destroyed (goes out of scope,
273for example when the coroutine gets canceled), the lock is automatically 370for example when the coroutine gets canceled), the lock is automatically
274returned. 371returned.
275 372
373Locks are *not* recursive, locking from the same coro twice results in a
374deadlocked coro.
375
276Lock names should begin with a unique identifier (for example, cf::map::find 376Lock names should begin with a unique identifier (for example, cf::map::find
277uses map_find and cf::map::load uses map_load). 377uses map_find and cf::map::load uses map_load).
278 378
279=item $locked = cf::lock_active $string 379=item $locked = cf::lock_active $string
280 380
281Return true if the lock is currently active, i.e. somebody has locked it. 381Return true if the lock is currently active, i.e. somebody has locked it.
282 382
283=cut 383=cut
284 384
285our %LOCK; 385our $LOCKS = new Coro::SemaphoreSet;
286 386
287sub lock_wait($) { 387sub lock_wait($) {
288 my ($key) = @_; 388 $LOCKS->wait ($_[0]);
289
290 # wait for lock, if any
291 while ($LOCK{$key}) {
292 push @{ $LOCK{$key} }, $Coro::current;
293 Coro::schedule;
294 }
295} 389}
296 390
297sub lock_acquire($) { 391sub lock_acquire($) {
298 my ($key) = @_; 392 $LOCKS->guard ($_[0])
299
300 # wait, to be sure we are not locked
301 lock_wait $key;
302
303 $LOCK{$key} = [];
304
305 Coro::guard {
306 # wake up all waiters, to be on the safe side
307 $_->ready for @{ delete $LOCK{$key} };
308 }
309} 393}
310 394
311sub lock_active($) { 395sub lock_active($) {
312 my ($key) = @_; 396 $LOCKS->count ($_[0]) < 1
313
314 ! ! $LOCK{$key}
315} 397}
316 398
317sub freeze_mainloop { 399sub freeze_mainloop {
318 return unless $TICK_WATCHER->is_active; 400 tick_inhibit_inc;
319 401
320 my $guard = Coro::guard { 402 &Guard::guard (\&tick_inhibit_dec);
321 $TICK_WATCHER->start; 403}
322 }; 404
323 $TICK_WATCHER->stop; 405=item cf::periodic $interval, $cb
324 $guard 406
407Like EV::periodic, but randomly selects a starting point so that the actions
408get spread over time.
409
410=cut
411
412sub periodic($$) {
413 my ($interval, $cb) = @_;
414
415 my $start = rand List::Util::min 180, $interval;
416
417 EV::periodic $start, $interval, 0, $cb
325} 418}
326 419
327=item cf::get_slot $time[, $priority[, $name]] 420=item cf::get_slot $time[, $priority[, $name]]
328 421
329Allocate $time seconds of blocking CPU time at priority C<$priority>: 422Allocate $time seconds of blocking CPU time at priority C<$priority>:
… …
337 430
338=cut 431=cut
339 432
340our @SLOT_QUEUE; 433our @SLOT_QUEUE;
341our $SLOT_QUEUE; 434our $SLOT_QUEUE;
435our $SLOT_DECAY = 0.9;
342 436
343$SLOT_QUEUE->cancel if $SLOT_QUEUE; 437$SLOT_QUEUE->cancel if $SLOT_QUEUE;
344$SLOT_QUEUE = Coro::async { 438$SLOT_QUEUE = Coro::async {
439 $Coro::current->desc ("timeslot manager");
440
345 my $signal = new Coro::Signal; 441 my $signal = new Coro::Signal;
442 my $busy;
346 443
347 while () { 444 while () {
348 next_job: 445 next_job:
446
349 my $avail = cf::till_tick; 447 my $avail = cf::till_tick;
350 if ($avail > 0.01) { 448
351 for (0 .. $#SLOT_QUEUE) { 449 for (0 .. $#SLOT_QUEUE) {
352 if ($SLOT_QUEUE[$_][0] < $avail) { 450 if ($SLOT_QUEUE[$_][0] <= $avail) {
451 $busy = 0;
353 my $job = splice @SLOT_QUEUE, $_, 1, (); 452 my $job = splice @SLOT_QUEUE, $_, 1, ();
354 $job->[2]->send; 453 $job->[2]->send;
355 Coro::cede; 454 Coro::cede;
356 goto next_job; 455 goto next_job;
357 } 456 } else {
457 $SLOT_QUEUE[$_][0] *= $SLOT_DECAY;
358 } 458 }
359 } 459 }
360 460
361 if (@SLOT_QUEUE) { 461 if (@SLOT_QUEUE) {
362 # we do not use wait_For_tick() as it returns immediately when tick is inactive 462 # we do not use wait_for_tick() as it returns immediately when tick is inactive
363 push @cf::WAIT_FOR_TICK, $signal; 463 push @cf::WAIT_FOR_TICK, $signal;
364 $signal->wait; 464 $signal->wait;
365 } else { 465 } else {
466 $busy = 0;
366 Coro::schedule; 467 Coro::schedule;
367 } 468 }
368 } 469 }
369}; 470};
370 471
371sub get_slot($;$$) { 472sub get_slot($;$$) {
473 return if tick_inhibit || $Coro::current == $Coro::main;
474
372 my ($time, $pri, $name) = @_; 475 my ($time, $pri, $name) = @_;
373 476
374 $time = $TICK * .6 if $time > $TICK * .6; 477 $time = clamp $time, 0.01, $TICK * .6;
478
375 my $sig = new Coro::Signal; 479 my $sig = new Coro::Signal;
376 480
377 push @SLOT_QUEUE, [$time, $pri, $sig, $name]; 481 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
378 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE; 482 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
379 $SLOT_QUEUE->ready; 483 $SLOT_QUEUE->ready;
… …
390 494
391BEGIN { *async = \&Coro::async_pool } 495BEGIN { *async = \&Coro::async_pool }
392 496
393=item cf::sync_job { BLOCK } 497=item cf::sync_job { BLOCK }
394 498
395The design of Crossfire TRT requires that the main coroutine ($Coro::main) 499The design of Deliantra requires that the main coroutine ($Coro::main)
396is always able to handle events or runnable, as Crossfire TRT is only 500is always able to handle events or runnable, as Deliantra is only
397partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not 501partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
398acceptable. 502acceptable.
399 503
400If it must be done, put the blocking parts into C<sync_job>. This will run 504If it must be done, put the blocking parts into C<sync_job>. This will run
401the given BLOCK in another coroutine while waiting for the result. The 505the given BLOCK in another coroutine while waiting for the result. The
… …
406 510
407sub sync_job(&) { 511sub sync_job(&) {
408 my ($job) = @_; 512 my ($job) = @_;
409 513
410 if ($Coro::current == $Coro::main) { 514 if ($Coro::current == $Coro::main) {
411 my $time = Event::time; 515 my $time = AE::time;
412 516
413 # this is the main coro, too bad, we have to block 517 # this is the main coro, too bad, we have to block
414 # till the operation succeeds, freezing the server :/ 518 # till the operation succeeds, freezing the server :/
415 519
416 # TODO: use suspend/resume instead 520 LOG llevError, Carp::longmess "sync job";#d#
417 # (but this is cancel-safe) 521
418 my $freeze_guard = freeze_mainloop; 522 my $freeze_guard = freeze_mainloop;
419 523
420 my $busy = 1; 524 my $busy = 1;
421 my @res; 525 my @res;
422 526
423 (async { 527 (async {
528 $Coro::current->desc ("sync job coro");
424 @res = eval { $job->() }; 529 @res = eval { $job->() };
425 warn $@ if $@; 530 warn $@ if $@;
426 undef $busy; 531 undef $busy;
427 })->prio (Coro::PRIO_MAX); 532 })->prio (Coro::PRIO_MAX);
428 533
429 while ($busy) { 534 while ($busy) {
430 Coro::cede or Event::one_event; 535 if (Coro::nready) {
536 Coro::cede_notself;
537 } else {
538 EV::loop EV::LOOP_ONESHOT;
431 } 539 }
540 }
432 541
433 $time = Event::time - $time; 542 my $time = AE::time - $time;
434 543
435 LOG llevError | logBacktrace, Carp::longmess "long sync job"
436 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
437
438 $tick_start += $time; # do not account sync jobs to server load 544 $TICK_START += $time; # do not account sync jobs to server load
439 545
440 wantarray ? @res : $res[0] 546 wantarray ? @res : $res[0]
441 } else { 547 } else {
442 # we are in another coroutine, how wonderful, everything just works 548 # we are in another coroutine, how wonderful, everything just works
443 549
… …
468=item fork_call { }, $args 574=item fork_call { }, $args
469 575
470Executes the given code block with the given arguments in a seperate 576Executes the given code block with the given arguments in a seperate
471process, returning the results. Everything must be serialisable with 577process, returning the results. Everything must be serialisable with
472Coro::Storable. May, of course, block. Note that the executed sub may 578Coro::Storable. May, of course, block. Note that the executed sub may
473never block itself or use any form of Event handling. 579never block itself or use any form of event handling.
474 580
475=cut 581=cut
476
477sub _store_scalar {
478 open my $fh, ">", \my $buf
479 or die "fork_call: cannot open fh-to-buf in child : $!";
480 Storable::store_fd $_[0], $fh;
481 close $fh;
482
483 $buf
484}
485 582
486sub fork_call(&@) { 583sub fork_call(&@) {
487 my ($cb, @args) = @_; 584 my ($cb, @args) = @_;
488 585
489# socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 586 # we seemingly have to make a local copy of the whole thing,
490# or die "socketpair: $!"; 587 # otherwise perl prematurely frees the stuff :/
491 pipe my $fh1, my $fh2 588 # TODO: investigate and fix (likely this will be rather laborious)
492 or die "pipe: $!";
493 589
494 if (my $pid = fork) { 590 my @res = Coro::Util::fork_eval {
495 close $fh2;
496
497 my $res = (Coro::Handle::unblock $fh1)->readline (undef);
498 warn "pst<$res>" unless $res =~ /^pst/;
499 $res = Coro::Storable::thaw $res;
500
501 waitpid $pid, 0; # should not block anymore, we expect the child to simply behave
502
503 Carp::confess $$res unless "ARRAY" eq ref $res;
504
505 return wantarray ? @$res : $res->[-1];
506 } else {
507 reset_signals; 591 reset_signals;
508 local $SIG{__WARN__}; 592 &$cb
509 local $SIG{__DIE__}; 593 }, @args;
510 # just in case, this hack effectively disables event
511 # in the child. cleaner and slower would be canceling all watchers,
512 # but this works for the time being.
513 local $Coro::idle;
514 $Coro::current->prio (Coro::PRIO_MAX);
515 594
516 eval { 595 wantarray ? @res : $res[-1]
517 close $fh1; 596}
518 597
519 my @res = eval { $cb->(@args) }; 598sub objinfo {
520
521 syswrite $fh2, _store_scalar $@ ? \"$@" : \@res;
522 close $fh2;
523 };
524
525 warn $@ if $@;
526 _exit 0;
527 } 599 (
600 "counter value" => cf::object::object_count,
601 "objects created" => cf::object::create_count,
602 "objects destroyed" => cf::object::destroy_count,
603 "freelist size" => cf::object::free_count,
604 "allocated objects" => cf::object::objects_size,
605 "active objects" => cf::object::actives_size,
606 )
607}
608
609=item $coin = coin_from_name $name
610
611=cut
612
613our %coin_alias = (
614 "silver" => "silvercoin",
615 "silvercoin" => "silvercoin",
616 "silvercoins" => "silvercoin",
617 "gold" => "goldcoin",
618 "goldcoin" => "goldcoin",
619 "goldcoins" => "goldcoin",
620 "platinum" => "platinacoin",
621 "platinumcoin" => "platinacoin",
622 "platinumcoins" => "platinacoin",
623 "platina" => "platinacoin",
624 "platinacoin" => "platinacoin",
625 "platinacoins" => "platinacoin",
626 "royalty" => "royalty",
627 "royalties" => "royalty",
628);
629
630sub coin_from_name($) {
631 $coin_alias{$_[0]}
632 ? cf::arch::find $coin_alias{$_[0]}
633 : undef
528} 634}
529 635
530=item $value = cf::db_get $family => $key 636=item $value = cf::db_get $family => $key
531 637
532Returns a single value from the environment database. 638Returns a single value from the environment database.
… …
534=item cf::db_put $family => $key => $value 640=item cf::db_put $family => $key => $value
535 641
536Stores the given C<$value> in the family. It can currently store binary 642Stores the given C<$value> in the family. It can currently store binary
537data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary). 643data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
538 644
645=item $db = cf::db_table "name"
646
647Create and/or open a new database table. The string must not be "db" and must be unique
648within each server.
649
539=cut 650=cut
651
652sub db_table($) {
653 my ($name) = @_;
654 my $db = BDB::db_create $DB_ENV;
655
656 eval {
657 $db->set_flags (BDB::CHKSUM);
658
659 utf8::encode $name;
660 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
661 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
662 cf::cleanup "db_open(db): $!" if $!;
663 };
664 cf::cleanup "db_open(db): $@" if $@;
665
666 $db
667}
540 668
541our $DB; 669our $DB;
542 670
543sub db_init { 671sub db_init {
544 unless ($DB) {
545 $DB = BDB::db_create $DB_ENV;
546
547 cf::sync_job { 672 cf::sync_job {
548 eval { 673 $DB ||= db_table "db";
549 $DB->set_flags (BDB::CHKSUM);
550
551 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
552 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
553 cf::cleanup "db_open(db): $!" if $!;
554 };
555 cf::cleanup "db_open(db): $@" if $@;
556 };
557 } 674 };
558} 675}
559 676
560sub db_get($$) { 677sub db_get($$) {
561 my $key = "$_[0]/$_[1]"; 678 my $key = "$_[0]/$_[1]";
562 679
… …
612 if (1) { 729 if (1) {
613 $md5 = 730 $md5 =
614 join "\x00", 731 join "\x00",
615 $processversion, 732 $processversion,
616 map { 733 map {
617 Coro::cede; 734 cf::cede_to_tick;
618 ($src->[$_], Digest::MD5::md5_hex $data[$_]) 735 ($src->[$_], Digest::MD5::md5_hex $data[$_])
619 } 0.. $#$src; 736 } 0.. $#$src;
620 737
621 738
622 my $dbmd5 = db_get cache => "$id/md5"; 739 my $dbmd5 = db_get cache => "$id/md5";
… …
660 777
661############################################################################# 778#############################################################################
662 779
663=head2 ATTACHABLE OBJECTS 780=head2 ATTACHABLE OBJECTS
664 781
665Many objects in crossfire are so-called attachable objects. That means you can 782Many objects in deliantra are so-called attachable objects. That means you can
666attach callbacks/event handlers (a collection of which is called an "attachment") 783attach callbacks/event handlers (a collection of which is called an "attachment")
667to it. All such attachable objects support the following methods. 784to it. All such attachable objects support the following methods.
668 785
669In the following description, CLASS can be any of C<global>, C<object> 786In the following description, CLASS can be any of C<global>, C<object>
670C<player>, C<client> or C<map> (i.e. the attachable objects in 787C<player>, C<client> or C<map> (i.e. the attachable objects in
671Crossfire TRT). 788Deliantra).
672 789
673=over 4 790=over 4
674 791
675=item $attachable->attach ($attachment, key => $value...) 792=item $attachable->attach ($attachment, key => $value...)
676 793
… …
720=item cf::CLASS::attachment $name, ... 837=item cf::CLASS::attachment $name, ...
721 838
722Register an attachment by C<$name> through which attachable objects of the 839Register an attachment by C<$name> through which attachable objects of the
723given CLASS can refer to this attachment. 840given CLASS can refer to this attachment.
724 841
725Some classes such as crossfire maps and objects can specify attachments 842Some classes such as deliantra maps and objects can specify attachments
726that are attached at load/instantiate time, thus the need for a name. 843that are attached at load/instantiate time, thus the need for a name.
727 844
728These calls expect any number of the following handler/hook descriptions: 845These calls expect any number of the following handler/hook descriptions:
729 846
730=over 4 847=over 4
… …
958 } 1075 }
959 1076
960 0 1077 0
961} 1078}
962 1079
963=item $bool = cf::global::invoke (EVENT_CLASS_XXX, ...) 1080=item $bool = cf::global->invoke (EVENT_CLASS_XXX, ...)
964 1081
965=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...) 1082=item $bool = $attachable->invoke (EVENT_CLASS_XXX, ...)
966 1083
967Generate an object-specific event with the given arguments. 1084Generate an object-specific event with the given arguments.
968 1085
… …
974 1091
975=cut 1092=cut
976 1093
977############################################################################# 1094#############################################################################
978# object support 1095# object support
979#
980 1096
1097sub _object_equal($$);
1098sub _object_equal($$) {
1099 my ($a, $b) = @_;
1100
1101 return 0 unless (ref $a) eq (ref $b);
1102
1103 if ("HASH" eq ref $a) {
1104 my @ka = keys %$a;
1105 my @kb = keys %$b;
1106
1107 return 0 if @ka != @kb;
1108
1109 for (0 .. $#ka) {
1110 return 0 unless $ka[$_] eq $kb[$_];
1111 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
1112 }
1113
1114 } elsif ("ARRAY" eq ref $a) {
1115
1116 return 0 if @$a != @$b;
1117
1118 for (0 .. $#$a) {
1119 return 0 unless _object_equal $a->[$_], $b->[$_];
1120 }
1121
1122 } elsif ($a ne $b) {
1123 return 0;
1124 }
1125
1126 1
1127}
1128
1129our $SLOW_MERGES;#d#
981sub _can_merge { 1130sub _can_merge {
982 my ($ob1, $ob2) = @_; 1131 my ($ob1, $ob2) = @_;
983 1132
984 local $Storable::canonical = 1; 1133 ++$SLOW_MERGES;#d#
985 my $fob1 = Storable::freeze $ob1;
986 my $fob2 = Storable::freeze $ob2;
987 1134
988 $fob1 eq $fob2 1135 # we do the slow way here
1136 return _object_equal $ob1, $ob2
989} 1137}
990 1138
991sub reattach { 1139sub reattach {
992 # basically do the same as instantiate, without calling instantiate 1140 # basically do the same as instantiate, without calling instantiate
993 my ($obj) = @_; 1141 my ($obj) = @_;
994 1142
1143 # no longer needed after getting rid of delete_package?
995 bless $obj, ref $obj; # re-bless in case extensions have been reloaded 1144 #bless $obj, ref $obj; # re-bless in case extensions have been reloaded
996 1145
997 my $registry = $obj->registry; 1146 my $registry = $obj->registry;
998 1147
999 @$registry = (); 1148 @$registry = ();
1000 1149
… …
1015cf::attachable->attach ( 1164cf::attachable->attach (
1016 prio => -1000000, 1165 prio => -1000000,
1017 on_instantiate => sub { 1166 on_instantiate => sub {
1018 my ($obj, $data) = @_; 1167 my ($obj, $data) = @_;
1019 1168
1020 $data = from_json $data; 1169 $data = decode_json $data;
1021 1170
1022 for (@$data) { 1171 for (@$data) {
1023 my ($name, $args) = @$_; 1172 my ($name, $args) = @$_;
1024 1173
1025 $obj->attach ($name, %{$args || {} }); 1174 $obj->attach ($name, %{$args || {} });
… …
1041sub object_freezer_save { 1190sub object_freezer_save {
1042 my ($filename, $rdata, $objs) = @_; 1191 my ($filename, $rdata, $objs) = @_;
1043 1192
1044 sync_job { 1193 sync_job {
1045 if (length $$rdata) { 1194 if (length $$rdata) {
1195 utf8::decode (my $decname = $filename);
1046 warn sprintf "saving %s (%d,%d)\n", 1196 warn sprintf "saving %s (%d,%d)\n",
1047 $filename, length $$rdata, scalar @$objs; 1197 $decname, length $$rdata, scalar @$objs;
1048 1198
1049 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1199 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
1050 chmod SAVE_MODE, $fh; 1200 aio_chmod $fh, SAVE_MODE;
1051 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1201 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
1052 aio_fsync $fh if $cf::USE_FSYNC; 1202 if ($cf::USE_FSYNC) {
1203 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;
1204 aio_fsync $fh;
1205 }
1053 close $fh; 1206 aio_close $fh;
1054 1207
1055 if (@$objs) { 1208 if (@$objs) {
1056 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1209 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
1057 chmod SAVE_MODE, $fh; 1210 aio_chmod $fh, SAVE_MODE;
1058 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1211 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
1059 aio_write $fh, 0, (length $data), $data, 0; 1212 aio_write $fh, 0, (length $data), $data, 0;
1060 aio_fsync $fh if $cf::USE_FSYNC; 1213 if ($cf::USE_FSYNC) {
1214 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;
1215 aio_fsync $fh;
1216 }
1061 close $fh; 1217 aio_close $fh;
1062 aio_rename "$filename.pst~", "$filename.pst"; 1218 aio_rename "$filename.pst~", "$filename.pst";
1063 } 1219 }
1064 } else { 1220 } else {
1065 aio_unlink "$filename.pst"; 1221 aio_unlink "$filename.pst";
1066 } 1222 }
1067 1223
1068 aio_rename "$filename~", $filename; 1224 aio_rename "$filename~", $filename;
1225
1226 $filename =~ s%/[^/]+$%%;
1227 aio_pathsync $filename if $cf::USE_FSYNC;
1069 } else { 1228 } else {
1070 warn "FATAL: $filename~: $!\n"; 1229 warn "unable to save objects: $filename~: $!\n";
1071 } 1230 }
1072 } else { 1231 } else {
1073 aio_unlink $filename; 1232 aio_unlink $filename;
1074 aio_unlink "$filename.pst"; 1233 aio_unlink "$filename.pst";
1075 } 1234 }
1076 } 1235 };
1077} 1236}
1078 1237
1079sub object_freezer_as_string { 1238sub object_freezer_as_string {
1080 my ($rdata, $objs) = @_; 1239 my ($rdata, $objs) = @_;
1081 1240
… …
1093 or return; 1252 or return;
1094 1253
1095 unless (aio_stat "$filename.pst") { 1254 unless (aio_stat "$filename.pst") {
1096 (aio_load "$filename.pst", $av) >= 0 1255 (aio_load "$filename.pst", $av) >= 0
1097 or return; 1256 or return;
1257
1098 $av = eval { (Storable::thaw $av)->{objs} }; 1258 my $st = eval { Coro::Storable::thaw $av };
1259 $av = $st->{objs};
1099 } 1260 }
1100 1261
1262 utf8::decode (my $decname = $filename);
1101 warn sprintf "loading %s (%d)\n", 1263 warn sprintf "loading %s (%d,%d)\n",
1102 $filename, length $data, scalar @{$av || []}; 1264 $decname, length $data, scalar @{$av || []};
1265
1103 return ($data, $av); 1266 ($data, $av)
1104} 1267}
1105 1268
1106=head2 COMMAND CALLBACKS 1269=head2 COMMAND CALLBACKS
1107 1270
1108=over 4 1271=over 4
… …
1162 my ($name, $cb) = @_; 1325 my ($name, $cb) = @_;
1163 1326
1164 $EXTICMD{$name} = $cb; 1327 $EXTICMD{$name} = $cb;
1165} 1328}
1166 1329
1330use File::Glob ();
1331
1167cf::player->attach ( 1332cf::player->attach (
1168 on_command => sub { 1333 on_unknown_command => sub {
1169 my ($pl, $name, $params) = @_; 1334 my ($pl, $name, $params) = @_;
1170 1335
1171 my $cb = $COMMAND{$name} 1336 my $cb = $COMMAND{$name}
1172 or return; 1337 or return;
1173 1338
… …
1186 my ($type, $reply, @payload) = 1351 my ($type, $reply, @payload) =
1187 "ARRAY" eq ref $msg 1352 "ARRAY" eq ref $msg
1188 ? @$msg 1353 ? @$msg
1189 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1190 1355
1356 my @reply;
1357
1191 if (my $cb = $EXTCMD{$type}) { 1358 if (my $cb = $EXTCMD{$type}) {
1192 my @reply = $cb->($pl, @payload); 1359 @reply = $cb->($pl, @payload);
1193
1194 $pl->ext_reply ($reply, @reply)
1195 if $reply;
1196 } 1360 }
1361
1362 $pl->ext_reply ($reply, @reply)
1363 if $reply;
1364
1197 } else { 1365 } else {
1198 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1199 } 1367 }
1200 1368
1201 cf::override; 1369 cf::override;
1202 }, 1370 },
1203); 1371);
1372
1373# "readahead" all extensions
1374sub cache_extensions {
1375 my $grp = IO::AIO::aio_group;
1376
1377 add $grp IO::AIO::aio_readdirx $LIBDIR, IO::AIO::READDIR_STAT_ORDER, sub {
1378 for (grep /\.ext$/, @{$_[0]}) {
1379 add $grp IO::AIO::aio_load "$LIBDIR/$_", my $data;
1380 }
1381 };
1382
1383 $grp
1384}
1204 1385
1205sub load_extensions { 1386sub load_extensions {
1206 cf::sync_job { 1387 cf::sync_job {
1207 my %todo; 1388 my %todo;
1208 1389
… …
1228 1409
1229 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1230 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1231 1412
1232 $ext{source} = 1413 $ext{source} =
1233 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1234 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1235 . $source 1416 . $source
1236 . "\n};\n1"; 1417 . "\n};\n1";
1237 1418
1238 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1239 } 1420 }
1240 1421
1422 my $pass = 0;
1241 my %done; 1423 my %done;
1242 while (%todo) { 1424 while (%todo) {
1243 my $progress; 1425 my $progress;
1244 1426
1427 ++$pass;
1428
1429 ext:
1245 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1246 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1247 goto skip 1432 next ext
1248 unless exists $done{$_}; 1433 unless exists $done{$_};
1249 } 1434 }
1250 1435
1251 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1252 1437
1253 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1254 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1255 : "$v->{base}: extension inactive.\n";
1256 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1257 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1258 warn $msg; 1445
1259 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1260 exit 1; 1447 delete $todo{$k};
1261 } 1448 } else {
1262 1449 $done{$k} = delete $todo{$k};
1263 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1264 } 1455 }
1265
1266 $done{$k} = delete $todo{$k};
1267 push @EXTS, $v->{pkg};
1268 $progress = 1;
1269 } 1456 }
1270 1457
1271 skip: 1458 unless ($progress) {
1272 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1273 unless $progress; 1460
1461 while (my ($k, $v) = each %todo) {
1462 cf::cleanup "mandatory extension '$k' has unresolved dependencies, exiting."
1463 if exists $v->{meta}{mandatory};
1464 }
1465 }
1274 } 1466 }
1275 }; 1467 };
1276} 1468}
1277 1469
1278############################################################################# 1470#############################################################################
1279 1471
1280=back 1472=back
1281 1473
1282=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1283 1475
1284Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1285 1477
1286=cut 1478=cut
1287 1479
1288package cf::player; 1480package cf::player;
1289 1481
1290use Coro::AIO; 1482use Coro::AIO;
1291 1483
1292=head3 cf::player 1484=head3 cf::player
1293 1485
1294=over 4 1486=over 4
1487
1488=item cf::player::num_playing
1489
1490Returns the official number of playing players, as per the Crossfire metaserver rules.
1491
1492=cut
1493
1494sub num_playing {
1495 scalar grep
1496 $_->ob->map
1497 && !$_->hidden
1498 && !$_->ob->flag (cf::FLAG_WIZ),
1499 cf::player::list
1500}
1295 1501
1296=item cf::player::find $login 1502=item cf::player::find $login
1297 1503
1298Returns the given player object, loading it if necessary (might block). 1504Returns the given player object, loading it if necessary (might block).
1299 1505
… …
1318 1524
1319sub exists($) { 1525sub exists($) {
1320 my ($login) = @_; 1526 my ($login) = @_;
1321 1527
1322 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1323 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1324} 1530}
1325 1531
1326sub find($) { 1532sub find($) {
1327 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1328 my $login = $_[0]; 1534 my $login = $_[0];
… …
1335 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1541 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1336 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1542 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1337 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1543 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1338 aio_unlink +(playerdir $login) . "/$login.pl"; 1544 aio_unlink +(playerdir $login) . "/$login.pl";
1339 1545
1340 my $pl = load_pl path $login 1546 my $f = new_from_file cf::object::thawer path $login
1341 or return; 1547 or return;
1548
1549 my $pl = cf::player::load_pl $f
1550 or return;
1551
1552 local $cf::PLAYER_LOADING{$login} = $pl;
1553 $f->resolve_delayed_derefs;
1342 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1343 } 1555 }
1344 } 1556 }
1345} 1557}
1558
1559cf::player->attach (
1560 on_load => sub {
1561 my ($pl, $path) = @_;
1562
1563 # restore slots saved in save, below
1564 my $slots = delete $pl->{_slots};
1565
1566 $pl->ob->current_weapon ($slots->[0]);
1567 $pl->combat_ob ($slots->[1]);
1568 $pl->ranged_ob ($slots->[2]);
1569 },
1570);
1346 1571
1347sub save($) { 1572sub save($) {
1348 my ($pl) = @_; 1573 my ($pl) = @_;
1349 1574
1350 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
… …
1355 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1356 1581
1357 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1358 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1359 1584
1585 cf::get_slot 0.01;
1586
1587 # save slots, to be restored later
1588 local $pl->{_slots} = [$pl->ob->current_weapon, $pl->combat_ob, $pl->ranged_ob];
1589
1360 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1361 Coro::cede; 1591 cf::cede_to_tick;
1362} 1592}
1363 1593
1364sub new($) { 1594sub new($) {
1365 my ($login) = @_; 1595 my ($login) = @_;
1366 1596
… …
1372 $cf::PLAYER{$login} = $self; 1602 $cf::PLAYER{$login} = $self;
1373 1603
1374 $self 1604 $self
1375} 1605}
1376 1606
1607=item $player->send_msg ($channel, $msg, $color, [extra...])
1608
1609=cut
1610
1611sub send_msg {
1612 my $ns = shift->ns
1613 or return;
1614 $ns->send_msg (@_);
1615}
1616
1377=item $pl->quit_character 1617=item $pl->quit_character
1378 1618
1379Nukes the player without looking back. If logged in, the connection will 1619Nukes the player without looking back. If logged in, the connection will
1380be destroyed. May block for a long time. 1620be destroyed. May block for a long time.
1381 1621
… …
1385 my ($pl) = @_; 1625 my ($pl) = @_;
1386 1626
1387 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1388 1628
1389 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1390 $pl->password ("*"); # this should lock out the player until we nuked the dir 1630 $pl->password ("*"); # this should lock out the player until we have nuked the dir
1391 1631
1392 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1393 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1394 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1395 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1396 1638
1397 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1398 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1434 or return []; 1676 or return [];
1435 1677
1436 my @logins; 1678 my @logins;
1437 1679
1438 for my $login (@$dirs) { 1680 for my $login (@$dirs) {
1681 my $path = path $login;
1682
1683 # a .pst is a dead give-away for a valid player
1684 # if no pst file found, open and chekc for blocked users
1685 if (aio_stat "$path.pst") {
1439 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1440 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1441 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1689 }
1442 1690
1443 utf8::decode $login; 1691 utf8::decode $login;
1444 push @logins, $login; 1692 push @logins, $login;
1445 } 1693 }
1446 1694
… …
1473 } 1721 }
1474 1722
1475 \@paths 1723 \@paths
1476} 1724}
1477 1725
1478=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1726=item $protocol_xml = $player->expand_cfpod ($cfpod)
1479 1727
1480Expand crossfire pod fragments into protocol xml. 1728Expand deliantra pod fragments into protocol xml.
1481
1482=cut
1483
1484sub expand_cfpod {
1485 ((my $self), (local $_)) = @_;
1486
1487 # escape & and <
1488 s/&/&amp;/g;
1489 s/(?<![BIUGH])</&lt;/g;
1490
1491 # this is buggy, it needs to properly take care of nested <'s
1492
1493 1 while
1494 # replace B<>, I<>, U<> etc.
1495 s/B<([^\>]*)>/<b>$1<\/b>/
1496 || s/I<([^\>]*)>/<i>$1<\/i>/
1497 || s/U<([^\>]*)>/<u>$1<\/u>/
1498 # replace G<male|female> tags
1499 || s{G<([^>|]*)\|([^>]*)>}{
1500 $self->gender ? $2 : $1
1501 }ge
1502 # replace H<hint text>
1503 || s{H<([^\>]*)>}
1504 {
1505 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1506 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1507 "")
1508 [$self->{hintmode}]
1509 }ge;
1510
1511 # create single paragraphs (very hackish)
1512 s/(?<=\S)\n(?=\w)/ /g;
1513
1514 # compress some whitespace
1515 s/\s+\n/\n/g; # ws line-ends
1516 s/\n\n+/\n/g; # double lines
1517 s/^\n+//; # beginning lines
1518 s/\n+$//; # ending lines
1519
1520 $_
1521}
1522
1523sub hintmode {
1524 $_[0]{hintmode} = $_[1] if @_ > 1;
1525 $_[0]{hintmode}
1526}
1527 1729
1528=item $player->ext_reply ($msgid, @msg) 1730=item $player->ext_reply ($msgid, @msg)
1529 1731
1530Sends an ext reply to the player. 1732Sends an ext reply to the player.
1531 1733
1532=cut 1734=cut
1533 1735
1534sub ext_reply($$@) { 1736sub ext_reply($$@) {
1535 my ($self, $id, @msg) = @_; 1737 my ($self, $id, @msg) = @_;
1536 1738
1537 if ($self->ns->extcmd == 2) { 1739 $self->ns->ext_reply ($id, @msg)
1538 $self->send ("ext " . $self->ns->{json_coder}->encode (["reply-$id", @msg]));
1539 } elsif ($self->ns->extcmd == 1) {
1540 #TODO: version 1, remove
1541 unshift @msg, msgtype => "reply", msgid => $id;
1542 $self->send ("ext " . $self->ns->{json_coder}->encode ({@msg}));
1543 }
1544} 1740}
1545 1741
1546=item $player->ext_msg ($type, @msg) 1742=item $player->ext_msg ($type, @msg)
1547 1743
1548Sends an ext event to the client. 1744Sends an ext event to the client.
… …
1604our $MAX_RESET = 3600; 1800our $MAX_RESET = 3600;
1605our $DEFAULT_RESET = 3000; 1801our $DEFAULT_RESET = 3000;
1606 1802
1607sub generate_random_map { 1803sub generate_random_map {
1608 my ($self, $rmp) = @_; 1804 my ($self, $rmp) = @_;
1805
1806 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1807
1609 # mit "rum" bekleckern, nicht 1808 # mit "rum" bekleckern, nicht
1610 $self->_create_random_map ( 1809 $self->_create_random_map (
1611 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1810 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1612 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1811 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1613 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1812 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1614 $rmp->{exit_on_final_map}, 1813 $rmp->{exit_on_final_map},
1615 $rmp->{xsize}, $rmp->{ysize}, 1814 $rmp->{xsize}, $rmp->{ysize},
1616 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1815 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1617 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1816 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1735 1934
1736# the temporary/swap location 1935# the temporary/swap location
1737sub save_path { 1936sub save_path {
1738 my ($self) = @_; 1937 my ($self) = @_;
1739 1938
1740 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1939 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1741 "$TMPDIR/$path.map" 1940 "$TMPDIR/$path.map"
1742} 1941}
1743 1942
1744# the unique path, undef == no special unique path 1943# the unique path, undef == no special unique path
1745sub uniq_path { 1944sub uniq_path {
1746 my ($self) = @_; 1945 my ($self) = @_;
1747 1946
1748 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1947 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1749 "$UNIQUEDIR/$path" 1948 "$UNIQUEDIR/$path"
1750}
1751
1752# and all this just because we cannot iterate over
1753# all maps in C++...
1754sub change_all_map_light {
1755 my ($change) = @_;
1756
1757 $_->change_map_light ($change)
1758 for grep $_->outdoor, values %cf::MAP;
1759} 1949}
1760 1950
1761sub decay_objects { 1951sub decay_objects {
1762 my ($self) = @_; 1952 my ($self) = @_;
1763 1953
… …
1776 1966
1777sub load_header_from($) { 1967sub load_header_from($) {
1778 my ($self, $path) = @_; 1968 my ($self, $path) = @_;
1779 1969
1780 utf8::encode $path; 1970 utf8::encode $path;
1781 #aio_open $path, O_RDONLY, 0 1971 my $f = new_from_file cf::object::thawer $path
1782 # or return;
1783
1784 $self->_load_header ($path)
1785 or return; 1972 or return;
1973
1974 $self->_load_header ($f)
1975 or return;
1976
1977 local $MAP_LOADING{$self->{path}} = $self;
1978 $f->resolve_delayed_derefs;
1786 1979
1787 $self->{load_path} = $path; 1980 $self->{load_path} = $path;
1788 1981
1789 1 1982 1
1790} 1983}
… …
1844sub find { 2037sub find {
1845 my ($path, $origin) = @_; 2038 my ($path, $origin) = @_;
1846 2039
1847 $path = normalise $path, $origin && $origin->path; 2040 $path = normalise $path, $origin && $origin->path;
1848 2041
2042 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1849 cf::lock_wait "map_find:$path"; 2043 my $guard2 = cf::lock_acquire "map_find:$path";
1850 2044
1851 $cf::MAP{$path} || do { 2045 $cf::MAP{$path} || do {
1852 my $guard = cf::lock_acquire "map_find:$path";
1853 my $map = new_from_path cf::map $path 2046 my $map = new_from_path cf::map $path
1854 or return; 2047 or return;
1855 2048
1856 $map->{last_save} = $cf::RUNTIME; 2049 $map->{last_save} = $cf::RUNTIME;
1857 2050
… …
1859 or return; 2052 or return;
1860 2053
1861 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2054 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1862 # doing this can freeze the server in a sync job, obviously 2055 # doing this can freeze the server in a sync job, obviously
1863 #$cf::WAIT_FOR_TICK->wait; 2056 #$cf::WAIT_FOR_TICK->wait;
2057 undef $guard2;
2058 undef $guard1;
1864 $map->reset; 2059 $map->reset;
1865 undef $guard;
1866 return find $path; 2060 return find $path;
1867 } 2061 }
1868 2062
1869 $cf::MAP{$path} = $map 2063 $cf::MAP{$path} = $map
1870 } 2064 }
1871} 2065}
1872 2066
1873sub pre_load { } 2067sub pre_load { }
1874sub post_load { } 2068#sub post_load { } # XS
1875 2069
1876sub load { 2070sub load {
1877 my ($self) = @_; 2071 my ($self) = @_;
1878 2072
1879 local $self->{deny_reset} = 1; # loading can take a long time 2073 local $self->{deny_reset} = 1; # loading can take a long time
1880 2074
1881 my $path = $self->{path}; 2075 my $path = $self->{path};
1882 2076
1883 { 2077 {
1884 my $guard = cf::lock_acquire "map_load:$path"; 2078 my $guard = cf::lock_acquire "map_data:$path";
1885 2079
2080 return unless $self->valid;
1886 return if $self->in_memory != cf::MAP_SWAPPED; 2081 return unless $self->in_memory == cf::MAP_SWAPPED;
1887 2082
1888 $self->in_memory (cf::MAP_LOADING); 2083 $self->in_memory (cf::MAP_LOADING);
1889 2084
1890 $self->alloc; 2085 $self->alloc;
1891 2086
1892 $self->pre_load; 2087 $self->pre_load;
1893 Coro::cede; 2088 cf::cede_to_tick;
1894 2089
2090 my $f = new_from_file cf::object::thawer $self->{load_path};
2091 $f->skip_block;
1895 $self->_load_objects ($self->{load_path}, 1) 2092 $self->_load_objects ($f)
1896 or return; 2093 or return;
1897 2094
1898 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2095 $self->post_load_original
1899 if delete $self->{load_original}; 2096 if delete $self->{load_original};
1900 2097
1901 if (my $uniq = $self->uniq_path) { 2098 if (my $uniq = $self->uniq_path) {
1902 utf8::encode $uniq; 2099 utf8::encode $uniq;
1903 if (aio_open $uniq, O_RDONLY, 0) { 2100 unless (aio_stat $uniq) {
2101 if (my $f = new_from_file cf::object::thawer $uniq) {
1904 $self->clear_unique_items; 2102 $self->clear_unique_items;
1905 $self->_load_objects ($uniq, 0); 2103 $self->_load_objects ($f);
2104 $f->resolve_delayed_derefs;
2105 }
1906 } 2106 }
1907 } 2107 }
1908 2108
1909 Coro::cede; 2109 $f->resolve_delayed_derefs;
2110
2111 cf::cede_to_tick;
1910 # now do the right thing for maps 2112 # now do the right thing for maps
1911 $self->link_multipart_objects; 2113 $self->link_multipart_objects;
1912 $self->difficulty ($self->estimate_difficulty) 2114 $self->difficulty ($self->estimate_difficulty)
1913 unless $self->difficulty; 2115 unless $self->difficulty;
1914 Coro::cede; 2116 cf::cede_to_tick;
1915 2117
1916 unless ($self->{deny_activate}) { 2118 unless ($self->{deny_activate}) {
1917 $self->decay_objects; 2119 $self->decay_objects;
1918 $self->fix_auto_apply; 2120 $self->fix_auto_apply;
1919 $self->update_buttons; 2121 $self->update_buttons;
1920 Coro::cede; 2122 cf::cede_to_tick;
1921 $self->set_darkness_map;
1922 Coro::cede;
1923 $self->activate; 2123 $self->activate;
1924 } 2124 }
1925 2125
1926 $self->{last_save} = $cf::RUNTIME; 2126 $self->{last_save} = $cf::RUNTIME;
1927 $self->last_access ($cf::RUNTIME); 2127 $self->last_access ($cf::RUNTIME);
1928 2128
1929 $self->in_memory (cf::MAP_IN_MEMORY); 2129 $self->in_memory (cf::MAP_ACTIVE);
1930 } 2130 }
1931 2131
1932 $self->post_load; 2132 $self->post_load;
1933} 2133}
1934 2134
2135# customize the map for a given player, i.e.
2136# return the _real_ map. used by e.g. per-player
2137# maps to change the path to ~playername/mappath
1935sub customise_for { 2138sub customise_for {
1936 my ($self, $ob) = @_; 2139 my ($self, $ob) = @_;
1937 2140
1938 return find "~" . $ob->name . "/" . $self->{path} 2141 return find "~" . $ob->name . "/" . $self->{path}
1939 if $self->per_player; 2142 if $self->per_player;
… …
1943 2146
1944 $self 2147 $self
1945} 2148}
1946 2149
1947# find and load all maps in the 3x3 area around a map 2150# find and load all maps in the 3x3 area around a map
1948sub load_diag { 2151sub load_neighbours {
1949 my ($map) = @_; 2152 my ($map) = @_;
1950 2153
1951 my @diag; # diagonal neighbours 2154 my @neigh; # diagonal neighbours
1952 2155
1953 for (0 .. 3) { 2156 for (0 .. 3) {
1954 my $neigh = $map->tile_path ($_) 2157 my $neigh = $map->tile_path ($_)
1955 or next; 2158 or next;
1956 $neigh = find $neigh, $map 2159 $neigh = find $neigh, $map
1957 or next; 2160 or next;
1958 $neigh->load; 2161 $neigh->load;
1959 2162
2163 push @neigh,
1960 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2164 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1961 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2165 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1962 } 2166 }
1963 2167
1964 for (@diag) { 2168 for (grep defined $_->[0], @neigh) {
2169 my ($path, $origin) = @$_;
1965 my $neigh = find @$_ 2170 my $neigh = find $path, $origin
1966 or next; 2171 or next;
1967 $neigh->load; 2172 $neigh->load;
1968 } 2173 }
1969} 2174}
1970 2175
… …
1975} 2180}
1976 2181
1977sub do_load_sync { 2182sub do_load_sync {
1978 my ($map) = @_; 2183 my ($map) = @_;
1979 2184
2185 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2186 if $Coro::current == $Coro::main;
2187
1980 cf::sync_job { $map->load }; 2188 cf::sync_job { $map->load };
1981} 2189}
1982 2190
1983our %MAP_PREFETCH; 2191our %MAP_PREFETCH;
1984our $MAP_PREFETCHER = undef; 2192our $MAP_PREFETCHER = undef;
1985 2193
1986sub find_async { 2194sub find_async {
1987 my ($path, $origin) = @_; 2195 my ($path, $origin, $load) = @_;
1988 2196
1989 $path = normalise $path, $origin && $origin->{path}; 2197 $path = normalise $path, $origin && $origin->{path};
1990 2198
1991 if (my $map = $cf::MAP{$path}) { 2199 if (my $map = $cf::MAP{$path}) {
1992 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2200 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1993 } 2201 }
1994 2202
1995 undef $MAP_PREFETCH{$path}; 2203 $MAP_PREFETCH{$path} |= $load;
2204
1996 $MAP_PREFETCHER ||= cf::async { 2205 $MAP_PREFETCHER ||= cf::async {
2206 $Coro::current->{desc} = "map prefetcher";
2207
1997 while (%MAP_PREFETCH) { 2208 while (%MAP_PREFETCH) {
1998 for my $path (keys %MAP_PREFETCH) { 2209 while (my ($k, $v) = each %MAP_PREFETCH) {
1999 if (my $map = find $path) { 2210 if (my $map = find $k) {
2000 $map->load; 2211 $map->load if $v;
2001 } 2212 }
2002 2213
2003 delete $MAP_PREFETCH{$path}; 2214 delete $MAP_PREFETCH{$k};
2004 } 2215 }
2005 } 2216 }
2006 undef $MAP_PREFETCHER; 2217 undef $MAP_PREFETCHER;
2007 }; 2218 };
2008 $MAP_PREFETCHER->prio (6); 2219 $MAP_PREFETCHER->prio (6);
2009 2220
2010 () 2221 ()
2011} 2222}
2012 2223
2224# common code, used by both ->save and ->swapout
2013sub save { 2225sub _save {
2014 my ($self) = @_; 2226 my ($self) = @_;
2015
2016 my $lock = cf::lock_acquire "map_data:" . $self->path;
2017 2227
2018 $self->{last_save} = $cf::RUNTIME; 2228 $self->{last_save} = $cf::RUNTIME;
2019 2229
2020 return unless $self->dirty; 2230 return unless $self->dirty;
2021 2231
… …
2027 return if $self->{deny_save}; 2237 return if $self->{deny_save};
2028 2238
2029 local $self->{last_access} = $self->last_access;#d# 2239 local $self->{last_access} = $self->last_access;#d#
2030 2240
2031 cf::async { 2241 cf::async {
2242 $Coro::current->{desc} = "map player save";
2032 $_->contr->save for $self->players; 2243 $_->contr->save for $self->players;
2033 }; 2244 };
2245
2246 cf::get_slot 0.02;
2034 2247
2035 if ($uniq) { 2248 if ($uniq) {
2036 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2249 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2037 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2250 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2038 } else { 2251 } else {
2039 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2252 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2040 } 2253 }
2041} 2254}
2042 2255
2256sub save {
2257 my ($self) = @_;
2258
2259 my $lock = cf::lock_acquire "map_data:$self->{path}";
2260
2261 $self->_save;
2262}
2263
2043sub swap_out { 2264sub swap_out {
2044 my ($self) = @_; 2265 my ($self) = @_;
2045 2266
2046 # save first because save cedes
2047 $self->save;
2048
2049 my $lock = cf::lock_acquire "map_data:" . $self->path; 2267 my $lock = cf::lock_acquire "map_data:$self->{path}";
2050 2268
2269 return if $self->in_memory != cf::MAP_ACTIVE;
2270 return if $self->{deny_save};
2051 return if $self->players; 2271 return if $self->players;
2052 return if $self->in_memory != cf::MAP_IN_MEMORY;
2053 return if $self->{deny_save};
2054 2272
2273 # first deactivate the map and "unlink" it from the core
2274 $self->deactivate;
2275 $_->clear_links_to ($self) for values %cf::MAP;
2276 $self->in_memory (cf::MAP_SWAPPED);
2277
2278 # then atomically save
2279 $self->_save;
2280
2281 # then free the map
2055 $self->clear; 2282 $self->clear;
2056 $self->in_memory (cf::MAP_SWAPPED);
2057} 2283}
2058 2284
2059sub reset_at { 2285sub reset_at {
2060 my ($self) = @_; 2286 my ($self) = @_;
2061 2287
… …
2079 2305
2080 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2306 my $lock = cf::lock_acquire "map_data:$self->{path}";
2081 2307
2082 return if $self->players; 2308 return if $self->players;
2083 2309
2084 warn "resetting map ", $self->path; 2310 warn "resetting map ", $self->path, "\n";
2085 2311
2086 $self->in_memory (cf::MAP_SWAPPED); 2312 $self->in_memory (cf::MAP_SWAPPED);
2087 2313
2088 # need to save uniques path 2314 # need to save uniques path
2089 unless ($self->{deny_save}) { 2315 unless ($self->{deny_save}) {
… …
2093 if $uniq; 2319 if $uniq;
2094 } 2320 }
2095 2321
2096 delete $cf::MAP{$self->path}; 2322 delete $cf::MAP{$self->path};
2097 2323
2324 $self->deactivate;
2325 $_->clear_links_to ($self) for values %cf::MAP;
2098 $self->clear; 2326 $self->clear;
2099
2100 $_->clear_links_to ($self) for values %cf::MAP;
2101 2327
2102 $self->unlink_save; 2328 $self->unlink_save;
2103 $self->destroy; 2329 $self->destroy;
2104} 2330}
2105 2331
2106my $nuke_counter = "aaaa"; 2332my $nuke_counter = "aaaa";
2107 2333
2108sub nuke { 2334sub nuke {
2109 my ($self) = @_; 2335 my ($self) = @_;
2110 2336
2337 {
2338 my $lock = cf::lock_acquire "map_data:$self->{path}";
2339
2111 delete $cf::MAP{$self->path}; 2340 delete $cf::MAP{$self->path};
2112 2341
2113 $self->unlink_save; 2342 $self->unlink_save;
2114 2343
2115 bless $self, "cf::map"; 2344 bless $self, "cf::map";
2116 delete $self->{deny_reset}; 2345 delete $self->{deny_reset};
2117 $self->{deny_save} = 1; 2346 $self->{deny_save} = 1;
2118 $self->reset_timeout (1); 2347 $self->reset_timeout (1);
2119 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2348 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2120 2349
2121 $cf::MAP{$self->path} = $self; 2350 $cf::MAP{$self->path} = $self;
2351 }
2122 2352
2123 $self->reset; # polite request, might not happen 2353 $self->reset; # polite request, might not happen
2124} 2354}
2125 2355
2126=item $maps = cf::map::tmp_maps 2356=item $maps = cf::map::tmp_maps
… …
2168 2398
2169sub unique_maps() { 2399sub unique_maps() {
2170 [ 2400 [
2171 map { 2401 map {
2172 utf8::decode $_; 2402 utf8::decode $_;
2173 /\.map$/ 2403 s/\.map$//; # TODO future compatibility hack
2404 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2405 ? ()
2174 ? normalise $_ 2406 : normalise $_
2175 : ()
2176 } @{ aio_readdir $UNIQUEDIR or [] } 2407 } @{ aio_readdir $UNIQUEDIR or [] }
2177 ] 2408 ]
2178} 2409}
2179 2410
2180package cf; 2411=item cf::map::static_maps
2412
2413Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2414file in the shared directory excluding F</styles> and F</editor>). May
2415block.
2416
2417=cut
2418
2419sub static_maps() {
2420 my @dirs = "";
2421 my @maps;
2422
2423 while (@dirs) {
2424 my $dir = shift @dirs;
2425
2426 next if $dir eq "/styles" || $dir eq "/editor";
2427
2428 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2429 or return;
2430
2431 for (@$files) {
2432 s/\.map$// or next;
2433 utf8::decode $_;
2434 push @maps, "$dir/$_";
2435 }
2436
2437 push @dirs, map "$dir/$_", @$dirs;
2438 }
2439
2440 \@maps
2441}
2181 2442
2182=back 2443=back
2183 2444
2184=head3 cf::object 2445=head3 cf::object
2185 2446
… …
2189 2450
2190=over 4 2451=over 4
2191 2452
2192=item $ob->inv_recursive 2453=item $ob->inv_recursive
2193 2454
2194Returns the inventory of the object _and_ their inventories, recursively. 2455Returns the inventory of the object I<and> their inventories, recursively,
2456but I<not> the object itself.
2195 2457
2196=cut 2458=cut
2197 2459
2198sub inv_recursive_; 2460sub inv_recursive_;
2199sub inv_recursive_ { 2461sub inv_recursive_ {
… …
2202 2464
2203sub inv_recursive { 2465sub inv_recursive {
2204 inv_recursive_ inv $_[0] 2466 inv_recursive_ inv $_[0]
2205} 2467}
2206 2468
2469=item $ref = $ob->ref
2470
2471Creates and returns a persistent reference to an object that can be stored as a string.
2472
2473=item $ob = cf::object::deref ($refstring)
2474
2475returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2476even if the object actually exists. May block.
2477
2478=cut
2479
2480sub deref {
2481 my ($ref) = @_;
2482
2483 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2484 my ($uuid, $name) = ($1, $2);
2485 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2486 or return;
2487 $pl->ob->uuid eq $uuid
2488 or return;
2489
2490 $pl->ob
2491 } else {
2492 warn "$ref: cannot resolve object reference\n";
2493 undef
2494 }
2495}
2496
2207package cf; 2497package cf;
2208 2498
2209=back 2499=back
2210 2500
2211=head3 cf::object::player 2501=head3 cf::object::player
… …
2217Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2507Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2218can be C<undef>. Does the right thing when the player is currently in a 2508can be C<undef>. Does the right thing when the player is currently in a
2219dialogue with the given NPC character. 2509dialogue with the given NPC character.
2220 2510
2221=cut 2511=cut
2512
2513our $SAY_CHANNEL = {
2514 id => "say",
2515 title => "Map",
2516 reply => "say ",
2517 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2518};
2519
2520our $CHAT_CHANNEL = {
2521 id => "chat",
2522 title => "Chat",
2523 reply => "chat ",
2524 tooltip => "Player chat and shouts, global to the server.",
2525};
2222 2526
2223# rough implementation of a future "reply" method that works 2527# rough implementation of a future "reply" method that works
2224# with dialog boxes. 2528# with dialog boxes.
2225#TODO: the first argument must go, split into a $npc->reply_to ( method 2529#TODO: the first argument must go, split into a $npc->reply_to ( method
2226sub cf::object::player::reply($$$;$) { 2530sub cf::object::player::reply($$$;$) {
… …
2238 my $dialog = $pl->{npc_dialog}; 2542 my $dialog = $pl->{npc_dialog};
2239 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg)); 2543 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2240 2544
2241 } else { 2545 } else {
2242 $msg = $npc->name . " says: $msg" if $npc; 2546 $msg = $npc->name . " says: $msg" if $npc;
2243 $self->message ($msg, $flags); 2547 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2244 } 2548 }
2245 } 2549 }
2550}
2551
2552=item $object->send_msg ($channel, $msg, $color, [extra...])
2553
2554=cut
2555
2556sub cf::object::send_msg {
2557 my $pl = shift->contr
2558 or return;
2559 $pl->send_msg (@_);
2246} 2560}
2247 2561
2248=item $player_object->may ("access") 2562=item $player_object->may ("access")
2249 2563
2250Returns wether the given player is authorized to access resource "access" 2564Returns wether the given player is authorized to access resource "access"
… …
2263 2577
2264=item $player_object->enter_link 2578=item $player_object->enter_link
2265 2579
2266Freezes the player and moves him/her to a special map (C<{link}>). 2580Freezes the player and moves him/her to a special map (C<{link}>).
2267 2581
2268The player should be reasonably safe there for short amounts of time. You 2582The player should be reasonably safe there for short amounts of time (e.g.
2269I<MUST> call C<leave_link> as soon as possible, though. 2583for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2584though, as the palyer cannot control the character while it is on the link
2585map.
2270 2586
2271Will never block. 2587Will never block.
2272 2588
2273=item $player_object->leave_link ($map, $x, $y) 2589=item $player_object->leave_link ($map, $x, $y)
2274 2590
… …
2299 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2615 return if UNIVERSAL::isa $self->map, "ext::map_link";
2300 2616
2301 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2617 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2302 if $self->map && $self->map->{path} ne "{link}"; 2618 if $self->map && $self->map->{path} ne "{link}";
2303 2619
2304 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2620 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2305} 2621}
2306 2622
2307sub cf::object::player::leave_link { 2623sub cf::object::player::leave_link {
2308 my ($self, $map, $x, $y) = @_; 2624 my ($self, $map, $x, $y) = @_;
2309 2625
… …
2326 ($x, $y) = (-1, -1) 2642 ($x, $y) = (-1, -1)
2327 unless (defined $x) && (defined $y); 2643 unless (defined $x) && (defined $y);
2328 2644
2329 # use -1 or undef as default coordinates, not 0, 0 2645 # use -1 or undef as default coordinates, not 0, 0
2330 ($x, $y) = ($map->enter_x, $map->enter_y) 2646 ($x, $y) = ($map->enter_x, $map->enter_y)
2331 if $x <=0 && $y <= 0; 2647 if $x <= 0 && $y <= 0;
2332 2648
2333 $map->load; 2649 $map->load;
2334 $map->load_diag; 2650 $map->load_neighbours;
2335 2651
2336 return unless $self->contr->active; 2652 return unless $self->contr->active;
2337 $self->activate_recursive;
2338 2653
2339 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2654 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2340 $self->enter_map ($map, $x, $y); 2655 $self->enter_map ($map, $x, $y);
2656
2657 # only activate afterwards, to support waiting in hooks
2658 $self->activate_recursive;
2341} 2659}
2342 2660
2343=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2661=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2344 2662
2345Moves the player to the given map-path and coordinates by first freezing 2663Moves the player to the given map-path and coordinates by first freezing
2346her, loading and preparing them map, calling the provided $check callback 2664her, loading and preparing them map, calling the provided $check callback
2347that has to return the map if sucecssful, and then unfreezes the player on 2665that has to return the map if sucecssful, and then unfreezes the player on
2348the new (success) or old (failed) map position. In either case, $done will 2666the new (success) or old (failed) map position. In either case, $done will
2349be called at the end of this process. 2667be called at the end of this process.
2350 2668
2669Note that $check will be called with a potentially non-loaded map, so if
2670it needs a loaded map it has to call C<< ->load >>.
2671
2351=cut 2672=cut
2352 2673
2353our $GOTOGEN; 2674our $GOTOGEN;
2354 2675
2355sub cf::object::player::goto { 2676sub cf::object::player::goto {
… …
2359 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2680 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2360 2681
2361 $self->enter_link; 2682 $self->enter_link;
2362 2683
2363 (async { 2684 (async {
2685 $Coro::current->{desc} = "player::goto $path $x $y";
2686
2687 # *tag paths override both path and x|y
2688 if ($path =~ /^\*(.*)$/) {
2689 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2690 my $ob = $obs[rand @obs];
2691
2692 # see if we actually can go there
2693 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2694 $ob = $obs[rand @obs];
2695 } else {
2696 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2697 }
2698 # else put us there anyways for now #d#
2699
2700 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2701 } else {
2702 ($path, $x, $y) = (undef, undef, undef);
2703 }
2704 }
2705
2364 my $map = eval { 2706 my $map = eval {
2365 my $map = cf::map::find $path; 2707 my $map = defined $path ? cf::map::find $path : undef;
2366 2708
2367 if ($map) { 2709 if ($map) {
2368 $map = $map->customise_for ($self); 2710 $map = $map->customise_for ($self);
2369 $map = $check->($map) if $check && $map; 2711 $map = $check->($map) if $check && $map;
2370 } else { 2712 } else {
2371 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2713 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2372 } 2714 }
2373 2715
2374 $map 2716 $map
2375 }; 2717 };
2376 2718
… …
2412} 2754}
2413 2755
2414sub prepare_random_map { 2756sub prepare_random_map {
2415 my ($exit) = @_; 2757 my ($exit) = @_;
2416 2758
2417 my $guard = cf::lock_acquire "exit_prepare:$exit";
2418
2419 # all this does is basically replace the /! path by 2759 # all this does is basically replace the /! path by
2420 # a new random map path (?random/...) with a seed 2760 # a new random map path (?random/...) with a seed
2421 # that depends on the exit object 2761 # that depends on the exit object
2422 2762
2423 my $rmp = parse_random_map_params $exit->msg; 2763 my $rmp = parse_random_map_params $exit->msg;
… …
2425 if ($exit->map) { 2765 if ($exit->map) {
2426 $rmp->{region} = $exit->region->name; 2766 $rmp->{region} = $exit->region->name;
2427 $rmp->{origin_map} = $exit->map->path; 2767 $rmp->{origin_map} = $exit->map->path;
2428 $rmp->{origin_x} = $exit->x; 2768 $rmp->{origin_x} = $exit->x;
2429 $rmp->{origin_y} = $exit->y; 2769 $rmp->{origin_y} = $exit->y;
2770
2771 $exit->map->touch;
2430 } 2772 }
2431 2773
2432 $rmp->{random_seed} ||= $exit->random_seed; 2774 $rmp->{random_seed} ||= $exit->random_seed;
2433 2775
2434 my $data = cf::to_json $rmp; 2776 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2435 my $md5 = Digest::MD5::md5_hex $data; 2777 my $md5 = Digest::MD5::md5_hex $data;
2436 my $meta = "$RANDOMDIR/$md5.meta"; 2778 my $meta = "$RANDOMDIR/$md5.meta";
2437 2779
2438 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2780 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2439 aio_write $fh, 0, (length $data), $data, 0; 2781 aio_write $fh, 0, (length $data), $data, 0;
2440 undef $fh; 2782 undef $fh;
2441 aio_rename "$meta~", $meta; 2783 aio_rename "$meta~", $meta;
2442 2784
2785 my $slaying = "?random/$md5";
2786
2787 if ($exit->valid) {
2443 $exit->slaying ("?random/$md5"); 2788 $exit->slaying ("?random/$md5");
2444 $exit->msg (undef); 2789 $exit->msg (undef);
2790 }
2445 } 2791 }
2446} 2792}
2447 2793
2448sub cf::object::player::enter_exit { 2794sub cf::object::player::enter_exit {
2449 my ($self, $exit) = @_; 2795 my ($self, $exit) = @_;
2450 2796
2451 return unless $self->type == cf::PLAYER; 2797 return unless $self->type == cf::PLAYER;
2452 2798
2453 if ($exit->slaying eq "/!") {
2454 #TODO: this should de-fi-ni-te-ly not be a sync-job
2455 # the problem is that $exit might not survive long enough
2456 # so it needs to be done right now, right here
2457 cf::sync_job { prepare_random_map $exit };
2458 }
2459
2460 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2461 my $hp = $exit->stats->hp;
2462 my $sp = $exit->stats->sp;
2463
2464 $self->enter_link; 2799 $self->enter_link;
2465 2800
2466 # if exit is damned, update players death & WoR home-position
2467 $self->contr->savebed ($slaying, $hp, $sp)
2468 if $exit->flag (FLAG_DAMNED);
2469
2470 (async { 2801 (async {
2471 $self->deactivate_recursive; # just to be sure 2802 $Coro::current->{desc} = "enter_exit";
2803
2472 unless (eval { 2804 unless (eval {
2805 $self->deactivate_recursive; # just to be sure
2806
2807 # random map handling
2808 {
2809 my $guard = cf::lock_acquire "exit_prepare:$exit";
2810
2811 prepare_random_map $exit
2812 if $exit->slaying eq "/!";
2813 }
2814
2815 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2816 my $x = $exit->stats->hp;
2817 my $y = $exit->stats->sp;
2818
2473 $self->goto ($slaying, $hp, $sp); 2819 $self->goto ($map, $x, $y);
2474 2820
2821 # if exit is damned, update players death & WoR home-position
2822 $self->contr->savebed ($map, $x, $y)
2823 if $exit->flag (cf::FLAG_DAMNED);
2824
2475 1; 2825 1
2476 }) { 2826 }) {
2477 $self->message ("Something went wrong deep within the crossfire server. " 2827 $self->message ("Something went wrong deep within the deliantra server. "
2478 . "I'll try to bring you back to the map you were before. " 2828 . "I'll try to bring you back to the map you were before. "
2479 . "Please report this to the dungeon master!", 2829 . "Please report this to the dungeon master!",
2480 cf::NDI_UNIQUE | cf::NDI_RED); 2830 cf::NDI_UNIQUE | cf::NDI_RED);
2481 2831
2482 warn "ERROR in enter_exit: $@"; 2832 warn "ERROR in enter_exit: $@";
… …
2499sub cf::client::send_drawinfo { 2849sub cf::client::send_drawinfo {
2500 my ($self, $text, $flags) = @_; 2850 my ($self, $text, $flags) = @_;
2501 2851
2502 utf8::encode $text; 2852 utf8::encode $text;
2503 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2853 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2854}
2855
2856=item $client->send_big_packet ($pkt)
2857
2858Like C<send_packet>, but tries to compress large packets, and fragments
2859them as required.
2860
2861=cut
2862
2863our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2864
2865sub cf::client::send_big_packet {
2866 my ($self, $pkt) = @_;
2867
2868 # try lzf for large packets
2869 $pkt = "lzf " . Compress::LZF::compress $pkt
2870 if 1024 <= length $pkt and $self->{can_lzf};
2871
2872 # split very large packets
2873 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2874 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2875 $pkt = "frag";
2876 }
2877
2878 $self->send_packet ($pkt);
2504} 2879}
2505 2880
2506=item $client->send_msg ($channel, $msg, $color, [extra...]) 2881=item $client->send_msg ($channel, $msg, $color, [extra...])
2507 2882
2508Send a drawinfo or msg packet to the client, formatting the msg for the 2883Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2510the message, with C<log> being the default. If C<$color> is negative, suppress 2885the message, with C<log> being the default. If C<$color> is negative, suppress
2511the message unless the client supports the msg packet. 2886the message unless the client supports the msg packet.
2512 2887
2513=cut 2888=cut
2514 2889
2890# non-persistent channels (usually the info channel)
2891our %CHANNEL = (
2892 "c/motd" => {
2893 id => "infobox",
2894 title => "MOTD",
2895 reply => undef,
2896 tooltip => "The message of the day",
2897 },
2898 "c/identify" => {
2899 id => "infobox",
2900 title => "Identify",
2901 reply => undef,
2902 tooltip => "Items recently identified",
2903 },
2904 "c/examine" => {
2905 id => "infobox",
2906 title => "Examine",
2907 reply => undef,
2908 tooltip => "Signs and other items you examined",
2909 },
2910 "c/shopinfo" => {
2911 id => "infobox",
2912 title => "Shop Info",
2913 reply => undef,
2914 tooltip => "What your bargaining skill tells you about the shop",
2915 },
2916 "c/book" => {
2917 id => "infobox",
2918 title => "Book",
2919 reply => undef,
2920 tooltip => "The contents of a note or book",
2921 },
2922 "c/lookat" => {
2923 id => "infobox",
2924 title => "Look",
2925 reply => undef,
2926 tooltip => "What you saw there",
2927 },
2928 "c/who" => {
2929 id => "infobox",
2930 title => "Players",
2931 reply => undef,
2932 tooltip => "Shows players who are currently online",
2933 },
2934 "c/body" => {
2935 id => "infobox",
2936 title => "Body Parts",
2937 reply => undef,
2938 tooltip => "Shows which body parts you posess and are available",
2939 },
2940 "c/statistics" => {
2941 id => "infobox",
2942 title => "Statistics",
2943 reply => undef,
2944 tooltip => "Shows your primary statistics",
2945 },
2946 "c/skills" => {
2947 id => "infobox",
2948 title => "Skills",
2949 reply => undef,
2950 tooltip => "Shows your experience per skill and item power",
2951 },
2952 "c/shopitems" => {
2953 id => "infobox",
2954 title => "Shop Items",
2955 reply => undef,
2956 tooltip => "Shows the items currently for sale in this shop",
2957 },
2958 "c/resistances" => {
2959 id => "infobox",
2960 title => "Resistances",
2961 reply => undef,
2962 tooltip => "Shows your resistances",
2963 },
2964 "c/pets" => {
2965 id => "infobox",
2966 title => "Pets",
2967 reply => undef,
2968 tooltip => "Shows information abotu your pets/a specific pet",
2969 },
2970 "c/perceiveself" => {
2971 id => "infobox",
2972 title => "Perceive Self",
2973 reply => undef,
2974 tooltip => "You gained detailed knowledge about yourself",
2975 },
2976 "c/uptime" => {
2977 id => "infobox",
2978 title => "Uptime",
2979 reply => undef,
2980 tooltip => "How long the server has been running since last restart",
2981 },
2982 "c/mapinfo" => {
2983 id => "infobox",
2984 title => "Map Info",
2985 reply => undef,
2986 tooltip => "Information related to the maps",
2987 },
2988 "c/party" => {
2989 id => "party",
2990 title => "Party",
2991 reply => "gsay ",
2992 tooltip => "Messages and chat related to your party",
2993 },
2994 "c/death" => {
2995 id => "death",
2996 title => "Death",
2997 reply => undef,
2998 tooltip => "Reason for and more info about your most recent death",
2999 },
3000 "c/say" => $SAY_CHANNEL,
3001 "c/chat" => $CHAT_CHANNEL,
3002);
3003
2515sub cf::client::send_msg { 3004sub cf::client::send_msg {
2516 my ($self, $channel, $msg, $color, @extra) = @_; 3005 my ($self, $channel, $msg, $color, @extra) = @_;
2517 3006
2518 $msg = $self->pl->expand_cfpod ($msg); 3007 $msg = $self->pl->expand_cfpod ($msg)
3008 unless $color & cf::NDI_VERBATIM;
2519 3009
2520 $color &= cf::NDI_CLIENT_MASK; # just in case... 3010 $color &= cf::NDI_CLIENT_MASK; # just in case...
2521 3011
3012 # check predefined channels, for the benefit of C
3013 if ($CHANNEL{$channel}) {
3014 $channel = $CHANNEL{$channel};
3015
3016 $self->ext_msg (channel_info => $channel);
3017 $channel = $channel->{id};
3018
2522 if (ref $channel) { 3019 } elsif (ref $channel) {
2523 # send meta info to client, if not yet sent 3020 # send meta info to client, if not yet sent
2524 unless (exists $self->{channel}{$channel->{id}}) { 3021 unless (exists $self->{channel}{$channel->{id}}) {
2525 $self->{channel}{$channel->{id}} = $channel; 3022 $self->{channel}{$channel->{id}} = $channel;
2526 $self->ext_msg (channel_info => $channel); 3023 $self->ext_msg (channel_info => $channel);
2527 } 3024 }
… …
2529 $channel = $channel->{id}; 3026 $channel = $channel->{id};
2530 } 3027 }
2531 3028
2532 return unless @extra || length $msg; 3029 return unless @extra || length $msg;
2533 3030
2534 if ($self->can_msg) {
2535 # default colour, mask it out 3031 # default colour, mask it out
2536 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF) 3032 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2537 if $color & cf::NDI_DEF; 3033 if $color & cf::NDI_DEF;
2538 3034
2539 $self->send_packet ("msg " . $self->{json_coder}->encode ( 3035 my $pkt = "msg "
3036 . $self->{json_coder}->encode (
2540 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra])); 3037 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2541 } else { 3038 );
2542 if ($color >= 0) {
2543 # replace some tags by gcfclient-compatible ones
2544 for ($msg) {
2545 1 while
2546 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2547 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2548 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2549 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2550 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2551 }
2552 3039
2553 $color &= cf::NDI_COLOR_MASK; 3040 $self->send_big_packet ($pkt);
2554
2555 if (0 && $msg =~ /\[/) {
2556 $self->send_packet ("drawextinfo $color 4 0 $msg")
2557 } else {
2558 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2559 $self->send_packet ("drawinfo $color $msg")
2560 }
2561 }
2562 }
2563} 3041}
2564 3042
2565=item $client->ext_msg ($type, @msg) 3043=item $client->ext_msg ($type, @msg)
2566 3044
2567Sends an ext event to the client. 3045Sends an ext event to the client.
… …
2569=cut 3047=cut
2570 3048
2571sub cf::client::ext_msg($$@) { 3049sub cf::client::ext_msg($$@) {
2572 my ($self, $type, @msg) = @_; 3050 my ($self, $type, @msg) = @_;
2573 3051
2574 my $extcmd = $self->extcmd;
2575
2576 if ($extcmd == 2) { 3052 if ($self->extcmd == 2) {
2577 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg])); 3053 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2578 } elsif ($extcmd == 1) { # TODO: remove 3054 } elsif ($self->extcmd == 1) { # TODO: remove
2579 push @msg, msgtype => "event_$type"; 3055 push @msg, msgtype => "event_$type";
2580 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg})); 3056 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3057 }
3058}
3059
3060=item $client->ext_reply ($msgid, @msg)
3061
3062Sends an ext reply to the client.
3063
3064=cut
3065
3066sub cf::client::ext_reply($$@) {
3067 my ($self, $id, @msg) = @_;
3068
3069 if ($self->extcmd == 2) {
3070 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3071 } elsif ($self->extcmd == 1) {
3072 #TODO: version 1, remove
3073 unshift @msg, msgtype => "reply", msgid => $id;
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2581 } 3075 }
2582} 3076}
2583 3077
2584=item $success = $client->query ($flags, "text", \&cb) 3078=item $success = $client->query ($flags, "text", \&cb)
2585 3079
… …
2646 my ($type, $reply, @payload) = 3140 my ($type, $reply, @payload) =
2647 "ARRAY" eq ref $msg 3141 "ARRAY" eq ref $msg
2648 ? @$msg 3142 ? @$msg
2649 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove 3143 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2650 3144
3145 my @reply;
3146
2651 if (my $cb = $EXTICMD{$type}) { 3147 if (my $cb = $EXTICMD{$type}) {
2652 my @reply = $cb->($ns, @payload); 3148 @reply = $cb->($ns, @payload);
2653
2654 $ns->ext_reply ($reply, @reply)
2655 if $reply;
2656 } 3149 }
3150
3151 $ns->ext_reply ($reply, @reply)
3152 if $reply;
3153
2657 } else { 3154 } else {
2658 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3155 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2659 } 3156 }
2660 3157
2661 cf::override; 3158 cf::override;
… …
2683 3180
2684 $coro 3181 $coro
2685} 3182}
2686 3183
2687cf::client->attach ( 3184cf::client->attach (
2688 on_destroy => sub { 3185 on_client_destroy => sub {
2689 my ($ns) = @_; 3186 my ($ns) = @_;
2690 3187
2691 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3188 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2692 }, 3189 },
2693); 3190);
… …
2708our $safe = new Safe "safe"; 3205our $safe = new Safe "safe";
2709our $safe_hole = new Safe::Hole; 3206our $safe_hole = new Safe::Hole;
2710 3207
2711$SIG{FPE} = 'IGNORE'; 3208$SIG{FPE} = 'IGNORE';
2712 3209
2713$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3210$safe->permit_only (Opcode::opset qw(
3211 :base_core :base_mem :base_orig :base_math :base_loop
3212 grepstart grepwhile mapstart mapwhile
3213 sort time
3214));
2714 3215
2715# here we export the classes and methods available to script code 3216# here we export the classes and methods available to script code
2716 3217
2717=pod 3218=pod
2718 3219
2719The following functions and methods are available within a safe environment: 3220The following functions and methods are available within a safe environment:
2720 3221
2721 cf::object 3222 cf::object
2722 contr pay_amount pay_player map x y force_find force_add 3223 contr pay_amount pay_player map x y force_find force_add destroy
2723 insert remove 3224 insert remove name archname title slaying race decrease split
3225 value
2724 3226
2725 cf::object::player 3227 cf::object::player
2726 player 3228 player
2727 3229
2728 cf::player 3230 cf::player
… …
2733 3235
2734=cut 3236=cut
2735 3237
2736for ( 3238for (
2737 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3239 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2738 insert remove)], 3240 insert remove inv nrof name archname title slaying race
3241 decrease split destroy change_exp value msg lore send_msg)],
2739 ["cf::object::player" => qw(player)], 3242 ["cf::object::player" => qw(player)],
2740 ["cf::player" => qw(peaceful)], 3243 ["cf::player" => qw(peaceful send_msg)],
2741 ["cf::map" => qw(trigger)], 3244 ["cf::map" => qw(trigger)],
2742) { 3245) {
2743 no strict 'refs'; 3246 no strict 'refs';
2744 my ($pkg, @funs) = @$_; 3247 my ($pkg, @funs) = @$_;
2745 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3248 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2763 3266
2764 my $qcode = $code; 3267 my $qcode = $code;
2765 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3268 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2766 $qcode =~ s/\n/\\n/g; 3269 $qcode =~ s/\n/\\n/g;
2767 3270
3271 %vars = (_dummy => 0) unless %vars;
3272
3273 my @res;
2768 local $_; 3274 local $_;
2769 local @safe::cf::_safe_eval_args = values %vars;
2770 3275
2771 my $eval = 3276 my $eval =
2772 "do {\n" 3277 "do {\n"
2773 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3278 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2774 . "#line 0 \"{$qcode}\"\n" 3279 . "#line 0 \"{$qcode}\"\n"
2775 . $code 3280 . $code
2776 . "\n}" 3281 . "\n}"
2777 ; 3282 ;
2778 3283
3284 if ($CFG{safe_eval}) {
2779 sub_generation_inc; 3285 sub_generation_inc;
3286 local @safe::cf::_safe_eval_args = values %vars;
2780 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3287 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2781 sub_generation_inc; 3288 sub_generation_inc;
3289 } else {
3290 local @cf::_safe_eval_args = values %vars;
3291 @res = wantarray ? eval eval : scalar eval $eval;
3292 }
2782 3293
2783 if ($@) { 3294 if ($@) {
2784 warn "$@"; 3295 warn "$@";
2785 warn "while executing safe code '$code'\n"; 3296 warn "while executing safe code '$code'\n";
2786 warn "with arguments " . (join " ", %vars) . "\n"; 3297 warn "with arguments " . (join " ", %vars) . "\n";
… …
2805=cut 3316=cut
2806 3317
2807sub register_script_function { 3318sub register_script_function {
2808 my ($fun, $cb) = @_; 3319 my ($fun, $cb) = @_;
2809 3320
2810 no strict 'refs'; 3321 $fun = "safe::$fun" if $CFG{safe_eval};
2811 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3322 *$fun = $safe_hole->wrap ($cb);
2812} 3323}
2813 3324
2814=back 3325=back
2815 3326
2816=cut 3327=cut
… …
2818############################################################################# 3329#############################################################################
2819# the server's init and main functions 3330# the server's init and main functions
2820 3331
2821sub load_facedata($) { 3332sub load_facedata($) {
2822 my ($path) = @_; 3333 my ($path) = @_;
3334
3335 # HACK to clear player env face cache, we need some signal framework
3336 # for this (global event?)
3337 %ext::player_env::MUSIC_FACE_CACHE = ();
3338
3339 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2823 3340
2824 warn "loading facedata from $path\n"; 3341 warn "loading facedata from $path\n";
2825 3342
2826 my $facedata; 3343 my $facedata;
2827 0 < aio_load $path, $facedata 3344 0 < aio_load $path, $facedata
… …
2830 $facedata = Coro::Storable::thaw $facedata; 3347 $facedata = Coro::Storable::thaw $facedata;
2831 3348
2832 $facedata->{version} == 2 3349 $facedata->{version} == 2
2833 or cf::cleanup "$path: version mismatch, cannot proceed."; 3350 or cf::cleanup "$path: version mismatch, cannot proceed.";
2834 3351
3352 # patch in the exptable
3353 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3354 $facedata->{resource}{"res/exp_table"} = {
3355 type => FT_RSRC,
3356 data => $exp_table,
3357 hash => (Digest::MD5::md5 $exp_table),
3358 };
3359 cf::cede_to_tick;
3360
2835 { 3361 {
2836 my $faces = $facedata->{faceinfo}; 3362 my $faces = $facedata->{faceinfo};
2837 3363
2838 while (my ($face, $info) = each %$faces) { 3364 while (my ($face, $info) = each %$faces) {
2839 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3365 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3366
2840 cf::face::set_visibility $idx, $info->{visibility}; 3367 cf::face::set_visibility $idx, $info->{visibility};
2841 cf::face::set_magicmap $idx, $info->{magicmap}; 3368 cf::face::set_magicmap $idx, $info->{magicmap};
2842 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3369 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2843 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3370 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2844 3371
2845 cf::cede_to_tick; 3372 cf::cede_to_tick;
2846 } 3373 }
2847 3374
2848 while (my ($face, $info) = each %$faces) { 3375 while (my ($face, $info) = each %$faces) {
2849 next unless $info->{smooth}; 3376 next unless $info->{smooth};
3377
2850 my $idx = cf::face::find $face 3378 my $idx = cf::face::find $face
2851 or next; 3379 or next;
3380
2852 if (my $smooth = cf::face::find $info->{smooth}) { 3381 if (my $smooth = cf::face::find $info->{smooth}) {
2853 cf::face::set_smooth $idx, $smooth; 3382 cf::face::set_smooth $idx, $smooth;
2854 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3383 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2855 } else { 3384 } else {
2856 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3385 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2870 3399
2871 cf::anim::invalidate_all; # d'oh 3400 cf::anim::invalidate_all; # d'oh
2872 } 3401 }
2873 3402
2874 { 3403 {
2875 # TODO: for gcfclient pleasure, we should give resources
2876 # that gcfclient doesn't grok a >10000 face index.
2877 my $res = $facedata->{resource}; 3404 my $res = $facedata->{resource};
2878 my $enc = JSON::XS->new->utf8->canonical;
2879
2880 my $soundconf = delete $res->{"res/sound.conf"};
2881 3405
2882 while (my ($name, $info) = each %$res) { 3406 while (my ($name, $info) = each %$res) {
2883 my $meta = $enc->encode ({ 3407 if (defined $info->{type}) {
2884 name => $name,
2885 %{ $info->{meta} || {} },
2886 });
2887
2888 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3408 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2889 3409
2890 if ($info->{type} & 1) {
2891 # prepend meta info
2892
2893 my $data = pack "(w/a*)*", $meta, $info->{data};
2894 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2895
2896 cf::face::set_data $idx, 0, $data, $chk; 3410 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
3411 cf::face::set_type $idx, $info->{type};
2897 } else { 3412 } else {
2898 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum}; 3413 $RESOURCE{$name} = $info;
2899 } 3414 }
2900 3415
2901 cf::face::set_type $idx, $info->{type};
2902
2903 cf::cede_to_tick; 3416 cf::cede_to_tick;
2904 } 3417 }
2905
2906 if ($soundconf) {
2907 $soundconf = $enc->decode (delete $soundconf->{data});
2908
2909 for (0 .. SOUND_CAST_SPELL_0 - 1) {
2910 my $sound = $soundconf->{compat}[$_]
2911 or next;
2912
2913 my $face = cf::face::find "sound/$sound->[1]";
2914
2915 cf::sound::set $sound->[0] => $face;
2916 cf::sound::old_sound_index $_, $face; # gcfclient-compat
2917 }
2918
2919 #TODO
2920 }
2921 } 3418 }
3419
3420 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
2922 3421
2923 1 3422 1
2924} 3423}
3424
3425cf::global->attach (on_resource_update => sub {
3426 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3427 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3428
3429 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3430 my $sound = $soundconf->{compat}[$_]
3431 or next;
3432
3433 my $face = cf::face::find "sound/$sound->[1]";
3434 cf::sound::set $sound->[0] => $face;
3435 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3436 }
3437
3438 while (my ($k, $v) = each %{$soundconf->{event}}) {
3439 my $face = cf::face::find "sound/$v";
3440 cf::sound::set $k => $face;
3441 }
3442 }
3443});
2925 3444
2926register_exticmd fx_want => sub { 3445register_exticmd fx_want => sub {
2927 my ($ns, $want) = @_; 3446 my ($ns, $want) = @_;
2928 3447
2929 while (my ($k, $v) = each %$want) { 3448 while (my ($k, $v) = each %$want) {
2930 $ns->fx_want ($k, $v); 3449 $ns->fx_want ($k, $v);
2931 } 3450 }
2932}; 3451};
2933 3452
3453sub load_resource_file($) {
3454 my $guard = lock_acquire "load_resource_file";
3455
3456 my $status = load_resource_file_ $_[0];
3457 get_slot 0.1, 100;
3458 cf::arch::commit_load;
3459
3460 $status
3461}
3462
2934sub reload_regions { 3463sub reload_regions {
3464 # HACK to clear player env face cache, we need some signal framework
3465 # for this (global event?)
3466 %ext::player_env::MUSIC_FACE_CACHE = ();
3467
2935 load_resource_file "$MAPDIR/regions" 3468 load_resource_file "$MAPDIR/regions"
2936 or die "unable to load regions file\n"; 3469 or die "unable to load regions file\n";
2937 3470
2938 for (cf::region::list) { 3471 for (cf::region::list) {
2939 $_->{match} = qr/$_->{match}/ 3472 $_->{match} = qr/$_->{match}/
… …
2947} 3480}
2948 3481
2949sub reload_archetypes { 3482sub reload_archetypes {
2950 load_resource_file "$DATADIR/archetypes" 3483 load_resource_file "$DATADIR/archetypes"
2951 or die "unable to load archetypes\n"; 3484 or die "unable to load archetypes\n";
2952 #d# NEED to laod twice to resolve forward references
2953 # this really needs to be done in an extra post-pass
2954 # (which needs to be synchronous, so solve it differently)
2955 load_resource_file "$DATADIR/archetypes"
2956 or die "unable to load archetypes\n";
2957} 3485}
2958 3486
2959sub reload_treasures { 3487sub reload_treasures {
2960 load_resource_file "$DATADIR/treasures" 3488 load_resource_file "$DATADIR/treasures"
2961 or die "unable to load treasurelists\n"; 3489 or die "unable to load treasurelists\n";
2962} 3490}
2963 3491
2964sub reload_resources { 3492sub reload_resources {
2965 warn "reloading resource files...\n"; 3493 warn "reloading resource files...\n";
2966 3494
3495 reload_facedata;
3496 reload_archetypes;
2967 reload_regions; 3497 reload_regions;
2968 reload_facedata;
2969 #reload_archetypes;#d#
2970 reload_archetypes;
2971 reload_treasures; 3498 reload_treasures;
2972 3499
2973 warn "finished reloading resource files\n"; 3500 warn "finished reloading resource files\n";
2974} 3501}
2975 3502
2976sub init { 3503sub reload_config {
2977 reload_resources; 3504 warn "reloading config file...\n";
2978}
2979 3505
2980sub cfg_load {
2981 open my $fh, "<:utf8", "$CONFDIR/config" 3506 open my $fh, "<:utf8", "$CONFDIR/config"
2982 or return; 3507 or return;
2983 3508
2984 local $/; 3509 local $/;
2985 *CFG = YAML::Syck::Load <$fh>; 3510 *CFG = YAML::XS::Load scalar <$fh>;
2986 3511
2987 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3512 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2988 3513
2989 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3514 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2990 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3515 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2994 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3519 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2995 and die "WARNING: m(un)lockall failed: $!\n"; 3520 and die "WARNING: m(un)lockall failed: $!\n";
2996 }; 3521 };
2997 warn $@ if $@; 3522 warn $@ if $@;
2998 } 3523 }
3524
3525 warn "finished reloading resource files\n";
3526}
3527
3528sub pidfile() {
3529 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3530 or die "$PIDFILE: $!";
3531 flock $fh, &Fcntl::LOCK_EX
3532 or die "$PIDFILE: flock: $!";
3533 $fh
3534}
3535
3536# make sure only one server instance is running at any one time
3537sub atomic {
3538 my $fh = pidfile;
3539
3540 my $pid = <$fh>;
3541 kill 9, $pid if $pid > 0;
3542
3543 seek $fh, 0, 0;
3544 print $fh $$;
3545}
3546
3547sub main_loop {
3548 warn "EV::loop starting\n";
3549 if (1) {
3550 EV::loop;
3551 }
3552 warn "EV::loop returned\n";
3553 goto &main_loop unless $REALLY_UNLOOP;
2999} 3554}
3000 3555
3001sub main { 3556sub main {
3557 cf::init_globals; # initialise logging
3558
3559 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3560 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3561 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3562 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3563
3564 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3565
3002 # we must not ever block the main coroutine 3566 # we must not ever block the main coroutine
3003 local $Coro::idle = sub { 3567 local $Coro::idle = sub {
3004 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3568 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
3005 (async { 3569 (async {
3006 Event::one_event; 3570 $Coro::current->{desc} = "IDLE BUG HANDLER";
3571 EV::loop EV::LOOP_ONESHOT;
3007 })->prio (Coro::PRIO_MAX); 3572 })->prio (Coro::PRIO_MAX);
3008 }; 3573 };
3009 3574
3010 cfg_load; 3575 evthread_start IO::AIO::poll_fileno;
3576
3577 cf::sync_job {
3578 cf::init_experience;
3579 cf::init_anim;
3580 cf::init_attackmess;
3581 cf::init_dynamic;
3582
3583 cf::load_settings;
3584 cf::load_materials;
3585
3586 reload_resources;
3587 reload_config;
3011 db_init; 3588 db_init;
3589
3590 cf::init_uuid;
3591 cf::init_signals;
3592 cf::init_skills;
3593
3594 cf::init_beforeplay;
3595
3596 atomic;
3597
3012 load_extensions; 3598 load_extensions;
3013 3599
3014 $TICK_WATCHER->start; 3600 utime time, time, $RUNTIMEFILE;
3015 Event::loop; 3601
3602 # no (long-running) fork's whatsoever before this point(!)
3603 use POSIX ();
3604 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3605
3606 (pop @POST_INIT)->(0) while @POST_INIT;
3607 };
3608
3609 cf::object::thawer::errors_are_fatal 0;
3610 warn "parse errors in files are no longer fatal from this point on.\n";
3611
3612 main_loop;
3016} 3613}
3017 3614
3018############################################################################# 3615#############################################################################
3019# initialisation and cleanup 3616# initialisation and cleanup
3020 3617
3021# install some emergency cleanup handlers 3618# install some emergency cleanup handlers
3022BEGIN { 3619BEGIN {
3620 our %SIGWATCHER = ();
3023 for my $signal (qw(INT HUP TERM)) { 3621 for my $signal (qw(INT HUP TERM)) {
3024 Event->signal ( 3622 $SIGWATCHER{$signal} = AE::signal $signal, sub {
3025 reentrant => 0,
3026 data => WF_AUTOCANCEL,
3027 signal => $signal,
3028 prio => 0,
3029 cb => sub {
3030 cf::cleanup "SIG$signal"; 3623 cf::cleanup "SIG$signal";
3031 },
3032 ); 3624 };
3033 } 3625 }
3034} 3626}
3035 3627
3036sub write_runtime { 3628sub write_runtime_sync {
3037 my $runtime = "$LOCALDIR/runtime"; 3629 my $t0 = AE::time;
3038 3630
3039 # first touch the runtime file to show we are still running: 3631 # first touch the runtime file to show we are still running:
3040 # the fsync below can take a very very long time. 3632 # the fsync below can take a very very long time.
3041 3633
3042 IO::AIO::aio_utime $runtime, undef, undef; 3634 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
3043 3635
3044 my $guard = cf::lock_acquire "write_runtime"; 3636 my $guard = cf::lock_acquire "write_runtime";
3045 3637
3046 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3638 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
3047 or return; 3639 or return;
3048 3640
3049 my $value = $cf::RUNTIME + 90 + 10; 3641 my $value = $cf::RUNTIME + 90 + 10;
3050 # 10 is the runtime save interval, for a monotonic clock 3642 # 10 is the runtime save interval, for a monotonic clock
3051 # 60 allows for the watchdog to kill the server. 3643 # 60 allows for the watchdog to kill the server.
… …
3061 aio_utime $fh, undef, undef; 3653 aio_utime $fh, undef, undef;
3062 3654
3063 close $fh 3655 close $fh
3064 or return; 3656 or return;
3065 3657
3066 aio_rename "$runtime~", $runtime 3658 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3067 and return; 3659 and return;
3068 3660
3069 warn "runtime file written.\n"; 3661 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3070 3662
3071 1 3663 1
3664}
3665
3666our $uuid_lock;
3667our $uuid_skip;
3668
3669sub write_uuid_sync($) {
3670 $uuid_skip ||= $_[0];
3671
3672 return if $uuid_lock;
3673 local $uuid_lock = 1;
3674
3675 my $uuid = "$LOCALDIR/uuid";
3676
3677 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3678 or return;
3679
3680 my $value = uuid_seq uuid_cur;
3681
3682 unless ($value) {
3683 warn "cowardly refusing to write zero uuid value!\n";
3684 return;
3685 }
3686
3687 my $value = uuid_str $value + $uuid_skip;
3688 $uuid_skip = 0;
3689
3690 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3691 and return;
3692
3693 # always fsync - this file is important
3694 aio_fsync $fh
3695 and return;
3696
3697 close $fh
3698 or return;
3699
3700 aio_rename "$uuid~", $uuid
3701 and return;
3702
3703 warn "uuid file written ($value).\n";
3704
3705 1
3706
3707}
3708
3709sub write_uuid($$) {
3710 my ($skip, $sync) = @_;
3711
3712 $sync ? write_uuid_sync $skip
3713 : async { write_uuid_sync $skip };
3072} 3714}
3073 3715
3074sub emergency_save() { 3716sub emergency_save() {
3075 my $freeze_guard = cf::freeze_mainloop; 3717 my $freeze_guard = cf::freeze_mainloop;
3076 3718
3077 warn "enter emergency perl save\n"; 3719 warn "emergency_perl_save: enter\n";
3078 3720
3079 cf::sync_job { 3721 cf::sync_job {
3722 # this is a trade-off: we want to be very quick here, so
3723 # save all maps without fsync, and later call a global sync
3724 # (which in turn might be very very slow)
3725 local $USE_FSYNC = 0;
3726
3080 # use a peculiar iteration method to avoid tripping on perl 3727 # use a peculiar iteration method to avoid tripping on perl
3081 # refcount bugs in for. also avoids problems with players 3728 # refcount bugs in for. also avoids problems with players
3082 # and maps saved/destroyed asynchronously. 3729 # and maps saved/destroyed asynchronously.
3083 warn "begin emergency player save\n"; 3730 warn "emergency_perl_save: begin player save\n";
3084 for my $login (keys %cf::PLAYER) { 3731 for my $login (keys %cf::PLAYER) {
3085 my $pl = $cf::PLAYER{$login} or next; 3732 my $pl = $cf::PLAYER{$login} or next;
3086 $pl->valid or next; 3733 $pl->valid or next;
3734 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3087 $pl->save; 3735 $pl->save;
3088 } 3736 }
3089 warn "end emergency player save\n"; 3737 warn "emergency_perl_save: end player save\n";
3090 3738
3091 warn "begin emergency map save\n"; 3739 warn "emergency_perl_save: begin map save\n";
3092 for my $path (keys %cf::MAP) { 3740 for my $path (keys %cf::MAP) {
3093 my $map = $cf::MAP{$path} or next; 3741 my $map = $cf::MAP{$path} or next;
3094 $map->valid or next; 3742 $map->valid or next;
3095 $map->save; 3743 $map->save;
3096 } 3744 }
3097 warn "end emergency map save\n"; 3745 warn "emergency_perl_save: end map save\n";
3098 3746
3099 warn "begin emergency database checkpoint\n"; 3747 warn "emergency_perl_save: begin database checkpoint\n";
3100 BDB::db_env_txn_checkpoint $DB_ENV; 3748 BDB::db_env_txn_checkpoint $DB_ENV;
3101 warn "end emergency database checkpoint\n"; 3749 warn "emergency_perl_save: end database checkpoint\n";
3750
3751 warn "emergency_perl_save: begin write uuid\n";
3752 write_uuid_sync 1;
3753 warn "emergency_perl_save: end write uuid\n";
3102 }; 3754 };
3103 3755
3756 warn "emergency_perl_save: starting sync()\n";
3757 IO::AIO::aio_sync sub {
3758 warn "emergency_perl_save: finished sync()\n";
3759 };
3760
3104 warn "leave emergency perl save\n"; 3761 warn "emergency_perl_save: leave\n";
3105} 3762}
3106 3763
3107sub post_cleanup { 3764sub post_cleanup {
3108 my ($make_core) = @_; 3765 my ($make_core) = @_;
3109 3766
3110 warn Carp::longmess "post_cleanup backtrace" 3767 warn Carp::longmess "post_cleanup backtrace"
3111 if $make_core; 3768 if $make_core;
3769
3770 my $fh = pidfile;
3771 unlink $PIDFILE if <$fh> == $$;
3772}
3773
3774# a safer delete_package, copied from Symbol
3775sub clear_package($) {
3776 my $pkg = shift;
3777
3778 # expand to full symbol table name if needed
3779 unless ($pkg =~ /^main::.*::$/) {
3780 $pkg = "main$pkg" if $pkg =~ /^::/;
3781 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3782 $pkg .= '::' unless $pkg =~ /::$/;
3783 }
3784
3785 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3786 my $stem_symtab = *{$stem}{HASH};
3787
3788 defined $stem_symtab and exists $stem_symtab->{$leaf}
3789 or return;
3790
3791 # clear all symbols
3792 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3793 for my $name (keys %$leaf_symtab) {
3794 _gv_clear *{"$pkg$name"};
3795# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3796 }
3112} 3797}
3113 3798
3114sub do_reload_perl() { 3799sub do_reload_perl() {
3115 # can/must only be called in main 3800 # can/must only be called in main
3116 if ($Coro::current != $Coro::main) { 3801 if (in_main) {
3117 warn "can only reload from main coroutine"; 3802 warn "can only reload from main coroutine";
3118 return; 3803 return;
3119 } 3804 }
3120 3805
3806 return if $RELOAD++;
3807
3808 my $t1 = AE::time;
3809
3810 while ($RELOAD) {
3121 warn "reloading..."; 3811 warn "reloading...";
3122 3812
3123 warn "entering sync_job"; 3813 warn "entering sync_job";
3124 3814
3125 cf::sync_job { 3815 cf::sync_job {
3126 cf::write_runtime; # external watchdog should not bark 3816 cf::write_runtime_sync; # external watchdog should not bark
3127 cf::emergency_save; 3817 cf::emergency_save;
3128 cf::write_runtime; # external watchdog should not bark 3818 cf::write_runtime_sync; # external watchdog should not bark
3129 3819
3130 warn "syncing database to disk"; 3820 warn "syncing database to disk";
3131 BDB::db_env_txn_checkpoint $DB_ENV; 3821 BDB::db_env_txn_checkpoint $DB_ENV;
3132 3822
3133 # if anything goes wrong in here, we should simply crash as we already saved 3823 # if anything goes wrong in here, we should simply crash as we already saved
3134 3824
3135 warn "cancelling all WF_AUTOCANCEL watchers";
3136 for (Event::all_watchers) {
3137 $_->cancel if $_->data & WF_AUTOCANCEL;
3138 }
3139
3140 warn "flushing outstanding aio requests"; 3825 warn "flushing outstanding aio requests";
3141 for (;;) {
3142 BDB::flush;
3143 IO::AIO::flush;
3144 Coro::cede;
3145 last unless IO::AIO::nreqs || BDB::nreqs; 3826 while (IO::AIO::nreqs || BDB::nreqs) {
3146 warn "iterate..."; 3827 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3147 }
3148
3149 ++$RELOAD;
3150
3151 warn "cancelling all extension coros";
3152 $_->cancel for values %EXT_CORO;
3153 %EXT_CORO = ();
3154
3155 warn "removing commands";
3156 %COMMAND = ();
3157
3158 warn "removing ext/exti commands";
3159 %EXTCMD = ();
3160 %EXTICMD = ();
3161
3162 warn "unloading/nuking all extensions";
3163 for my $pkg (@EXTS) {
3164 warn "... unloading $pkg";
3165
3166 if (my $cb = $pkg->can ("unload")) {
3167 eval {
3168 $cb->($pkg);
3169 1
3170 } or warn "$pkg unloaded, but with errors: $@";
3171 } 3828 }
3172 3829
3173 warn "... nuking $pkg"; 3830 warn "cancelling all extension coros";
3174 Symbol::delete_package $pkg; 3831 $_->cancel for values %EXT_CORO;
3175 } 3832 %EXT_CORO = ();
3176 3833
3177 warn "unloading all perl modules loaded from $LIBDIR"; 3834 warn "removing commands";
3178 while (my ($k, $v) = each %INC) { 3835 %COMMAND = ();
3179 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3180 3836
3837 warn "removing ext/exti commands";
3838 %EXTCMD = ();
3839 %EXTICMD = ();
3840
3841 warn "unloading/nuking all extensions";
3842 for my $pkg (@EXTS) {
3181 warn "... unloading $k"; 3843 warn "... unloading $pkg";
3182 delete $INC{$k};
3183 3844
3184 $k =~ s/\.pm$//;
3185 $k =~ s/\//::/g;
3186
3187 if (my $cb = $k->can ("unload_module")) { 3845 if (my $cb = $pkg->can ("unload")) {
3846 eval {
3188 $cb->(); 3847 $cb->($pkg);
3848 1
3849 } or warn "$pkg unloaded, but with errors: $@";
3850 }
3851
3852 warn "... clearing $pkg";
3853 clear_package $pkg;
3189 } 3854 }
3190 3855
3191 Symbol::delete_package $k; 3856 warn "unloading all perl modules loaded from $LIBDIR";
3857 while (my ($k, $v) = each %INC) {
3858 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3859
3860 warn "... unloading $k";
3861 delete $INC{$k};
3862
3863 $k =~ s/\.pm$//;
3864 $k =~ s/\//::/g;
3865
3866 if (my $cb = $k->can ("unload_module")) {
3867 $cb->();
3868 }
3869
3870 clear_package $k;
3192 } 3871 }
3193 3872
3194 warn "getting rid of safe::, as good as possible"; 3873 warn "getting rid of safe::, as good as possible";
3195 Symbol::delete_package "safe::$_" 3874 clear_package "safe::$_"
3196 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3875 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3197 3876
3198 warn "unloading cf.pm \"a bit\""; 3877 warn "unloading cf.pm \"a bit\"";
3199 delete $INC{"cf.pm"}; 3878 delete $INC{"cf.pm"};
3200 delete $INC{"cf/pod.pm"}; 3879 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3201 3880
3202 # don't, removes xs symbols, too, 3881 # don't, removes xs symbols, too,
3203 # and global variables created in xs 3882 # and global variables created in xs
3204 #Symbol::delete_package __PACKAGE__; 3883 #clear_package __PACKAGE__;
3205 3884
3206 warn "unload completed, starting to reload now"; 3885 warn "unload completed, starting to reload now";
3207 3886
3208 warn "reloading cf.pm"; 3887 warn "reloading cf.pm";
3209 require cf; 3888 require cf;
3210 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3889 cf::_connect_to_perl_1;
3211 3890
3212 warn "loading config and database again"; 3891 warn "loading config and database again";
3213 cf::cfg_load; 3892 cf::reload_config;
3214 3893
3215 warn "loading extensions"; 3894 warn "loading extensions";
3216 cf::load_extensions; 3895 cf::load_extensions;
3217 3896
3897 if ($REATTACH_ON_RELOAD) {
3218 warn "reattaching attachments to objects/players"; 3898 warn "reattaching attachments to objects/players";
3219 _global_reattach; # objects, sockets 3899 _global_reattach; # objects, sockets
3220 warn "reattaching attachments to maps"; 3900 warn "reattaching attachments to maps";
3221 reattach $_ for values %MAP; 3901 reattach $_ for values %MAP;
3222 warn "reattaching attachments to players"; 3902 warn "reattaching attachments to players";
3223 reattach $_ for values %PLAYER; 3903 reattach $_ for values %PLAYER;
3904 }
3224 3905
3906 warn "running post_init jobs";
3907 (pop @POST_INIT)->(1) while @POST_INIT;
3908
3225 warn "leaving sync_job"; 3909 warn "leaving sync_job";
3226 3910
3227 1 3911 1
3228 } or do { 3912 } or do {
3229 warn $@; 3913 warn $@;
3230 warn "error while reloading, exiting."; 3914 cf::cleanup "error while reloading, exiting.";
3231 exit 1;
3232 }; 3915 };
3233 3916
3234 warn "reloaded"; 3917 warn "reloaded";
3918 --$RELOAD;
3919 }
3920
3921 $t1 = AE::time - $t1;
3922 warn "reload completed in ${t1}s\n";
3235}; 3923};
3236 3924
3237our $RELOAD_WATCHER; # used only during reload 3925our $RELOAD_WATCHER; # used only during reload
3238 3926
3239sub reload_perl() { 3927sub reload_perl() {
3240 # doing reload synchronously and two reloads happen back-to-back, 3928 # doing reload synchronously and two reloads happen back-to-back,
3241 # coro crashes during coro_state_free->destroy here. 3929 # coro crashes during coro_state_free->destroy here.
3242 3930
3243 $RELOAD_WATCHER ||= Event->timer ( 3931 $RELOAD_WATCHER ||= cf::async {
3244 reentrant => 0, 3932 Coro::AIO::aio_wait cache_extensions;
3245 after => 0, 3933
3246 data => WF_AUTOCANCEL, 3934 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3247 cb => sub {
3248 do_reload_perl; 3935 do_reload_perl;
3249 undef $RELOAD_WATCHER; 3936 undef $RELOAD_WATCHER;
3250 }, 3937 };
3251 ); 3938 };
3252} 3939}
3253 3940
3254register_command "reload" => sub { 3941register_command "reload" => sub {
3255 my ($who, $arg) = @_; 3942 my ($who, $arg) = @_;
3256 3943
3257 if ($who->flag (FLAG_WIZ)) { 3944 if ($who->flag (FLAG_WIZ)) {
3258 $who->message ("reloading server."); 3945 $who->message ("reloading server.");
3946 async {
3947 $Coro::current->{desc} = "perl_reload";
3259 async { reload_perl }; 3948 reload_perl;
3949 };
3260 } 3950 }
3261}; 3951};
3262 3952
3263unshift @INC, $LIBDIR; 3953unshift @INC, $LIBDIR;
3264 3954
… …
3266 3956
3267our @WAIT_FOR_TICK; 3957our @WAIT_FOR_TICK;
3268our @WAIT_FOR_TICK_BEGIN; 3958our @WAIT_FOR_TICK_BEGIN;
3269 3959
3270sub wait_for_tick { 3960sub wait_for_tick {
3271 return unless $TICK_WATCHER->is_active;
3272 return if $Coro::current == $Coro::main; 3961 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3273 3962
3274 my $signal = new Coro::Signal; 3963 my $signal = new Coro::Signal;
3275 push @WAIT_FOR_TICK, $signal; 3964 push @WAIT_FOR_TICK, $signal;
3276 $signal->wait; 3965 $signal->wait;
3277} 3966}
3278 3967
3279sub wait_for_tick_begin { 3968sub wait_for_tick_begin {
3280 return unless $TICK_WATCHER->is_active;
3281 return if $Coro::current == $Coro::main; 3969 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3282 3970
3283 my $signal = new Coro::Signal; 3971 my $signal = new Coro::Signal;
3284 push @WAIT_FOR_TICK_BEGIN, $signal; 3972 push @WAIT_FOR_TICK_BEGIN, $signal;
3285 $signal->wait; 3973 $signal->wait;
3286} 3974}
3287 3975
3288 my $min = 1e6;#d# 3976sub tick {
3289 my $avg = 10;
3290$TICK_WATCHER = Event->timer (
3291 reentrant => 0,
3292 parked => 1,
3293 prio => 0,
3294 at => $NEXT_TICK || $TICK,
3295 data => WF_AUTOCANCEL,
3296 cb => sub {
3297 if ($Coro::current != $Coro::main) { 3977 if ($Coro::current != $Coro::main) {
3298 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3978 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3299 unless ++$bug_warning > 10; 3979 unless ++$bug_warning > 10;
3300 return; 3980 return;
3301 } 3981 }
3302 3982
3303 $NOW = $tick_start = Event::time;
3304
3305 cf::server_tick; # one server iteration 3983 cf::server_tick; # one server iteration
3306 3984
3307 0 && sync_job {#d# 3985 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3308 for(1..10) {
3309 my $t = Event::time;
3310 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3311 or die;
3312 3986
3313 $map->width (50); 3987 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3314 $map->height (50); 3988 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3315 $map->alloc; 3989 Coro::async_pool {
3316 $map->_load_objects ("/tmp/x.map", 1); 3990 $Coro::current->{desc} = "runtime saver";
3317 my $t = Event::time - $t; 3991 write_runtime_sync
3318 3992 or warn "ERROR: unable to write runtime file: $!";
3319 #next unless $t < 0.0013;#d#
3320 if ($t < $min) {
3321 $min = $t;
3322 }
3323 $avg = $avg * 0.99 + $t * 0.01;
3324 }
3325 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3326 exit 0;
3327 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3328 }; 3993 };
3994 }
3329 3995
3330 $RUNTIME += $TICK;
3331 $NEXT_TICK += $TICK;
3332
3333 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3334 $NEXT_RUNTIME_WRITE = $NOW + 10;
3335 Coro::async_pool {
3336 write_runtime
3337 or warn "ERROR: unable to write runtime file: $!";
3338 };
3339 }
3340
3341# my $AFTER = Event::time;
3342# warn $AFTER - $NOW;#d#
3343
3344 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 3996 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3345 $sig->send; 3997 $sig->send;
3346 } 3998 }
3347 while (my $sig = shift @WAIT_FOR_TICK) { 3999 while (my $sig = shift @WAIT_FOR_TICK) {
3348 $sig->send; 4000 $sig->send;
3349 } 4001 }
3350 4002
3351 $NOW = Event::time; 4003 $LOAD = ($NOW - $TICK_START) / $TICK;
3352
3353 # if we are delayed by four ticks or more, skip them all
3354 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3355
3356 $TICK_WATCHER->at ($NEXT_TICK);
3357 $TICK_WATCHER->start;
3358
3359 $LOAD = ($NOW - $tick_start) / $TICK;
3360 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4004 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3361 4005
3362 _post_tick; 4006 if (0) {
3363 4007 if ($NEXT_TICK) {
3364 4008 my $jitter = $TICK_START - $NEXT_TICK;
4009 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4010 warn "jitter $JITTER\n";#d#
4011 }
3365 }, 4012 }
3366); 4013}
3367 4014
3368{ 4015{
3369 BDB::max_poll_time $TICK * 0.1; 4016 # configure BDB
3370 $BDB_POLL_WATCHER = Event->io ( 4017
3371 reentrant => 0,
3372 fd => BDB::poll_fileno,
3373 poll => 'r',
3374 prio => 0,
3375 data => WF_AUTOCANCEL,
3376 cb => \&BDB::poll_cb,
3377 );
3378 BDB::min_parallel 8; 4018 BDB::min_parallel 16;
3379 4019 BDB::max_poll_reqs $TICK * 0.1;
3380 BDB::set_sync_prepare { 4020 $AnyEvent::BDB::WATCHER->priority (1);
3381 my $status;
3382 my $current = $Coro::current;
3383 (
3384 sub {
3385 $status = $!;
3386 $current->ready; undef $current;
3387 },
3388 sub {
3389 Coro::schedule while defined $current;
3390 $! = $status;
3391 },
3392 )
3393 };
3394 4021
3395 unless ($DB_ENV) { 4022 unless ($DB_ENV) {
3396 $DB_ENV = BDB::db_env_create; 4023 $DB_ENV = BDB::db_env_create;
4024 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4025 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4026 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4027 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4028 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3397 4029
3398 cf::sync_job { 4030 cf::sync_job {
3399 eval { 4031 eval {
3400 BDB::db_env_open 4032 BDB::db_env_open
3401 $DB_ENV, 4033 $DB_ENV,
… …
3403 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4035 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3404 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4036 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3405 0666; 4037 0666;
3406 4038
3407 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4039 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3408
3409 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3410 $DB_ENV->set_lk_detect;
3411 }; 4040 };
3412 4041
3413 cf::cleanup "db_env_open(db): $@" if $@; 4042 cf::cleanup "db_env_open(db): $@" if $@;
3414 }; 4043 };
3415 } 4044 }
4045
4046 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4047 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4048 };
4049 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4050 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4051 };
4052 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4053 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4054 };
3416} 4055}
3417 4056
3418{ 4057{
4058 # configure IO::AIO
4059
3419 IO::AIO::min_parallel 8; 4060 IO::AIO::min_parallel 8;
3420
3421 undef $Coro::AIO::WATCHER;
3422 IO::AIO::max_poll_time $TICK * 0.1; 4061 IO::AIO::max_poll_time $TICK * 0.1;
3423 $AIO_POLL_WATCHER = Event->io ( 4062 undef $AnyEvent::AIO::WATCHER;
3424 reentrant => 0,
3425 data => WF_AUTOCANCEL,
3426 fd => IO::AIO::poll_fileno,
3427 poll => 'r',
3428 prio => 6,
3429 cb => \&IO::AIO::poll_cb,
3430 );
3431} 4063}
3432 4064
3433my $_log_backtrace; 4065my $_log_backtrace;
3434 4066
3435sub _log_backtrace { 4067sub _log_backtrace {
… …
3438 $msg =~ s/\n//; 4070 $msg =~ s/\n//;
3439 4071
3440 # limit the # of concurrent backtraces 4072 # limit the # of concurrent backtraces
3441 if ($_log_backtrace < 2) { 4073 if ($_log_backtrace < 2) {
3442 ++$_log_backtrace; 4074 ++$_log_backtrace;
4075 my $perl_bt = Carp::longmess $msg;
3443 async { 4076 async {
4077 $Coro::current->{desc} = "abt $msg";
4078
3444 my @bt = fork_call { 4079 my @bt = fork_call {
3445 @addr = map { sprintf "%x", $_ } @addr; 4080 @addr = map { sprintf "%x", $_ } @addr;
3446 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4081 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3447 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4082 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3448 or die "addr2line: $!"; 4083 or die "addr2line: $!";
… …
3456 } 4091 }
3457 4092
3458 @funcs 4093 @funcs
3459 }; 4094 };
3460 4095
3461 LOG llevInfo, "[ABT] $msg\n"; 4096 LOG llevInfo, "[ABT] $perl_bt\n";
4097 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3462 LOG llevInfo, "[ABT] $_\n" for @bt; 4098 LOG llevInfo, "[ABT] $_\n" for @bt;
3463 --$_log_backtrace; 4099 --$_log_backtrace;
3464 }; 4100 };
3465 } else { 4101 } else {
3466 LOG llevInfo, "[ABT] $msg\n"; 4102 LOG llevInfo, "[ABT] $msg\n";
3467 LOG llevInfo, "[ABT] [suppressed]\n"; 4103 LOG llevInfo, "[ABT] [suppressed]\n";
3468 } 4104 }
3469} 4105}
3470 4106
3471# load additional modules 4107# load additional modules
3472use cf::pod; 4108require "cf/$_.pm" for @EXTRA_MODULES;
4109cf::_connect_to_perl_2;
3473 4110
3474END { cf::emergency_save } 4111END { cf::emergency_save }
3475 4112
34761 41131
3477 4114

Diff Legend

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