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.315 by root, Mon Jul 23 17:53:55 2007 UTC vs.
Revision 1.524 by root, Sun Apr 18 07:08:07 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
… …
1181 my ($pl, $buf) = @_; 1346 my ($pl, $buf) = @_;
1182 1347
1183 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) }; 1348 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
1184 1349
1185 if (ref $msg) { 1350 if (ref $msg) {
1351 my ($type, $reply, @payload) =
1352 "ARRAY" eq ref $msg
1353 ? @$msg
1354 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1355
1356 my @reply;
1357
1186 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1358 if (my $cb = $EXTCMD{$type}) {
1187 if (my %reply = $cb->($pl, $msg)) { 1359 @reply = $cb->($pl, @payload);
1188 $pl->ext_reply ($msg->{msgid}, %reply);
1189 }
1190 } 1360 }
1361
1362 $pl->ext_reply ($reply, @reply)
1363 if $reply;
1364
1191 } else { 1365 } else {
1192 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1366 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
1193 } 1367 }
1194 1368
1195 cf::override; 1369 cf::override;
1196 }, 1370 },
1197); 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}
1198 1385
1199sub load_extensions { 1386sub load_extensions {
1200 cf::sync_job { 1387 cf::sync_job {
1201 my %todo; 1388 my %todo;
1202 1389
… …
1222 1409
1223 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 } 1410 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1224 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m; 1411 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1225 1412
1226 $ext{source} = 1413 $ext{source} =
1227 "package $pkg; use strict; use utf8;\n" 1414 "package $pkg; use 5.10.0; use strict 'vars', 'subs'; use utf8;\n"
1228 . "#line 1 \"$path\"\n{\n" 1415 . "#line 1 \"$path\"\n{\n"
1229 . $source 1416 . $source
1230 . "\n};\n1"; 1417 . "\n};\n1";
1231 1418
1232 $todo{$base} = \%ext; 1419 $todo{$base} = \%ext;
1233 } 1420 }
1234 1421
1422 my $pass = 0;
1235 my %done; 1423 my %done;
1236 while (%todo) { 1424 while (%todo) {
1237 my $progress; 1425 my $progress;
1238 1426
1427 ++$pass;
1428
1429 ext:
1239 while (my ($k, $v) = each %todo) { 1430 while (my ($k, $v) = each %todo) {
1240 for (split /,\s*/, $v->{meta}{depends}) { 1431 for (split /,\s*/, $v->{meta}{depends}) {
1241 goto skip 1432 next ext
1242 unless exists $done{$_}; 1433 unless exists $done{$_};
1243 } 1434 }
1244 1435
1245 warn "... loading '$k' into '$v->{pkg}'\n"; 1436 warn "... pass $pass, loading '$k' into '$v->{pkg}'\n";
1246 1437
1247 unless (eval $v->{source}) { 1438 my $active = eval $v->{source};
1439
1440 if (length $@) {
1248 my $msg = $@ ? "$v->{path}: $@\n" 1441 warn "$v->{path}: $@\n";
1249 : "$v->{base}: extension inactive.\n";
1250 1442
1443 cf::cleanup "mandatory extension '$k' failed to load, exiting."
1251 if (exists $v->{meta}{mandatory}) { 1444 if exists $v->{meta}{mandatory};
1252 warn $msg; 1445
1253 warn "mandatory extension failed to load, exiting.\n"; 1446 warn "$v->{base}: optional extension cannot be loaded, skipping.\n";
1254 exit 1; 1447 delete $todo{$k};
1255 } 1448 } else {
1256 1449 $done{$k} = delete $todo{$k};
1257 warn $msg; 1450 push @EXTS, $v->{pkg};
1451 $progress = 1;
1452
1453 warn "$v->{base}: extension inactive.\n"
1454 unless $active;
1258 } 1455 }
1259
1260 $done{$k} = delete $todo{$k};
1261 push @EXTS, $v->{pkg};
1262 $progress = 1;
1263 } 1456 }
1264 1457
1265 skip: 1458 unless ($progress) {
1266 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n" 1459 warn "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n";
1267 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 }
1268 } 1466 }
1269 }; 1467 };
1270} 1468}
1271 1469
1272############################################################################# 1470#############################################################################
1273 1471
1274=back 1472=back
1275 1473
1276=head2 CORE EXTENSIONS 1474=head2 CORE EXTENSIONS
1277 1475
1278Functions and methods that extend core crossfire objects. 1476Functions and methods that extend core deliantra objects.
1279 1477
1280=cut 1478=cut
1281 1479
1282package cf::player; 1480package cf::player;
1283 1481
1284use Coro::AIO; 1482use Coro::AIO;
1285 1483
1286=head3 cf::player 1484=head3 cf::player
1287 1485
1288=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}
1289 1501
1290=item cf::player::find $login 1502=item cf::player::find $login
1291 1503
1292Returns the given player object, loading it if necessary (might block). 1504Returns the given player object, loading it if necessary (might block).
1293 1505
… …
1312 1524
1313sub exists($) { 1525sub exists($) {
1314 my ($login) = @_; 1526 my ($login) = @_;
1315 1527
1316 $cf::PLAYER{$login} 1528 $cf::PLAYER{$login}
1317 or cf::sync_job { !aio_stat path $login } 1529 or !aio_stat path $login
1318} 1530}
1319 1531
1320sub find($) { 1532sub find($) {
1321 return $cf::PLAYER{$_[0]} || do { 1533 return $cf::PLAYER{$_[0]} || do {
1322 my $login = $_[0]; 1534 my $login = $_[0];
… …
1329 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst"; 1541 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1330 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata"; 1542 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1331 aio_unlink +(playerdir $login) . "/$login.pl.pst"; 1543 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1332 aio_unlink +(playerdir $login) . "/$login.pl"; 1544 aio_unlink +(playerdir $login) . "/$login.pl";
1333 1545
1334 my $pl = load_pl path $login 1546 my $f = new_from_file cf::object::thawer path $login
1335 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;
1336 $cf::PLAYER{$login} = $pl 1554 $cf::PLAYER{$login} = $pl
1337 } 1555 }
1338 } 1556 }
1339} 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);
1340 1571
1341sub save($) { 1572sub save($) {
1342 my ($pl) = @_; 1573 my ($pl) = @_;
1343 1574
1344 return if $pl->{deny_save}; 1575 return if $pl->{deny_save};
… …
1349 return if $pl->{deny_save}; 1580 return if $pl->{deny_save};
1350 1581
1351 aio_mkdir playerdir $pl, 0770; 1582 aio_mkdir playerdir $pl, 0770;
1352 $pl->{last_save} = $cf::RUNTIME; 1583 $pl->{last_save} = $cf::RUNTIME;
1353 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
1354 $pl->save_pl ($path); 1590 $pl->save_pl ($path);
1355 Coro::cede; 1591 cf::cede_to_tick;
1356} 1592}
1357 1593
1358sub new($) { 1594sub new($) {
1359 my ($login) = @_; 1595 my ($login) = @_;
1360 1596
… …
1366 $cf::PLAYER{$login} = $self; 1602 $cf::PLAYER{$login} = $self;
1367 1603
1368 $self 1604 $self
1369} 1605}
1370 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
1371=item $pl->quit_character 1617=item $pl->quit_character
1372 1618
1373Nukes the player without looking back. If logged in, the connection will 1619Nukes the player without looking back. If logged in, the connection will
1374be destroyed. May block for a long time. 1620be destroyed. May block for a long time.
1375 1621
… …
1379 my ($pl) = @_; 1625 my ($pl) = @_;
1380 1626
1381 my $name = $pl->ob->name; 1627 my $name = $pl->ob->name;
1382 1628
1383 $pl->{deny_save} = 1; 1629 $pl->{deny_save} = 1;
1384 $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
1385 1631
1386 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active; 1632 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1387 $pl->deactivate; 1633 $pl->deactivate;
1634 my $killer = cf::arch::get "killer_quit"; $pl->killer ($killer); $killer->destroy;
1635 $pl->ob->check_score;
1388 $pl->invoke (cf::EVENT_PLAYER_QUIT); 1636 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1389 $pl->ns->destroy if $pl->ns; 1637 $pl->ns->destroy if $pl->ns;
1390 1638
1391 my $path = playerdir $pl; 1639 my $path = playerdir $pl;
1392 my $temp = "$path~$cf::RUNTIME~deleting~"; 1640 my $temp = "$path~$cf::RUNTIME~deleting~";
… …
1428 or return []; 1676 or return [];
1429 1677
1430 my @logins; 1678 my @logins;
1431 1679
1432 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") {
1433 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1686 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1434 aio_read $fh, 0, 512, my $buf, 0 or next; 1687 aio_read $fh, 0, 512, my $buf, 0 or next;
1435 $buf !~ /^password -------------$/m or next; # official not-valid tag 1688 $buf !~ /^password -------------$/m or next; # official not-valid tag
1689 }
1436 1690
1437 utf8::decode $login; 1691 utf8::decode $login;
1438 push @logins, $login; 1692 push @logins, $login;
1439 } 1693 }
1440 1694
1441 \@logins 1695 \@logins
1442} 1696}
1443 1697
1444=item $player->maps 1698=item $player->maps
1699
1700=item cf::player::maps $login
1445 1701
1446Returns an arrayref of map paths that are private for this 1702Returns an arrayref of map paths that are private for this
1447player. May block. 1703player. May block.
1448 1704
1449=cut 1705=cut
… …
1467 } 1723 }
1468 1724
1469 \@paths 1725 \@paths
1470} 1726}
1471 1727
1472=item $protocol_xml = $player->expand_cfpod ($crossfire_pod) 1728=item $protocol_xml = $player->expand_cfpod ($cfpod)
1473 1729
1474Expand crossfire pod fragments into protocol xml. 1730Expand deliantra pod fragments into protocol xml.
1475 1731
1476=cut
1477
1478sub expand_cfpod {
1479 ((my $self), (local $_)) = @_;
1480
1481 # escape & and <
1482 s/&/&amp;/g;
1483 s/(?<![BIUGH])</&lt;/g;
1484
1485 # this is buggy, it needs to properly take care of nested <'s
1486
1487 1 while
1488 # replace B<>, I<>, U<> etc.
1489 s/B<([^\>]*)>/<b>$1<\/b>/
1490 || s/I<([^\>]*)>/<i>$1<\/i>/
1491 || s/U<([^\>]*)>/<u>$1<\/u>/
1492 # replace G<male|female> tags
1493 || s{G<([^>|]*)\|([^>]*)>}{
1494 $self->gender ? $2 : $1
1495 }ge
1496 # replace H<hint text>
1497 || s{H<([^\>]*)>}
1498 {
1499 ("<fg name=\"lightblue\">[$1 (Use hintmode to suppress hints)]</fg>",
1500 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1501 "")
1502 [$self->{hintmode}]
1503 }ge;
1504
1505 # create single paragraphs (very hackish)
1506 s/(?<=\S)\n(?=\w)/ /g;
1507
1508 # compress some whitespace
1509 s/\s+\n/\n/g; # ws line-ends
1510 s/\n\n+/\n/g; # double lines
1511 s/^\n+//; # beginning lines
1512 s/\n+$//; # ending lines
1513
1514 $_
1515}
1516
1517sub hintmode {
1518 $_[0]{hintmode} = $_[1] if @_ > 1;
1519 $_[0]{hintmode}
1520}
1521
1522=item $player->ext_reply ($msgid, %msg) 1732=item $player->ext_reply ($msgid, @msg)
1523 1733
1524Sends an ext reply to the player. 1734Sends an ext reply to the player.
1525 1735
1526=cut 1736=cut
1527 1737
1528sub ext_reply($$%) { 1738sub ext_reply($$@) {
1529 my ($self, $id, %msg) = @_; 1739 my ($self, $id, @msg) = @_;
1530 1740
1531 $msg{msgid} = $id; 1741 $self->ns->ext_reply ($id, @msg)
1532 $self->send ("ext " . $self->ns->{json_coder}->encode (\%msg));
1533} 1742}
1534 1743
1535=item $player->ext_event ($type, %msg) 1744=item $player->ext_msg ($type, @msg)
1536 1745
1537Sends an ext event to the client. 1746Sends an ext event to the client.
1538 1747
1539=cut 1748=cut
1540 1749
1541sub ext_event($$%) { 1750sub ext_msg($$@) {
1542 my ($self, $type, %msg) = @_; 1751 my ($self, $type, @msg) = @_;
1543 1752
1544 $self->ns->ext_event ($type, %msg); 1753 $self->ns->ext_msg ($type, @msg);
1545} 1754}
1546 1755
1547=head3 cf::region 1756=head3 cf::region
1548 1757
1549=over 4 1758=over 4
… …
1558 1767
1559=cut 1768=cut
1560 1769
1561sub find_by_path($) { 1770sub find_by_path($) {
1562 my ($path) = @_; 1771 my ($path) = @_;
1772
1773 $path =~ s/^~[^\/]*//; # skip ~login
1563 1774
1564 my ($match, $specificity); 1775 my ($match, $specificity);
1565 1776
1566 for my $region (list) { 1777 for my $region (list) {
1567 if ($region->{match} && $path =~ $region->{match}) { 1778 if ($region->{match} && $path =~ $region->{match}) {
… …
1593our $MAX_RESET = 3600; 1804our $MAX_RESET = 3600;
1594our $DEFAULT_RESET = 3000; 1805our $DEFAULT_RESET = 3000;
1595 1806
1596sub generate_random_map { 1807sub generate_random_map {
1597 my ($self, $rmp) = @_; 1808 my ($self, $rmp) = @_;
1809
1810 my $lock = cf::lock_acquire "generate_random_map"; # the random map generator is NOT reentrant ATM
1811
1598 # mit "rum" bekleckern, nicht 1812 # mit "rum" bekleckern, nicht
1599 $self->_create_random_map ( 1813 $self->_create_random_map (
1600 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle}, 1814 $rmp->{wallstyle}, $rmp->{wall_name}, $rmp->{floorstyle}, $rmp->{monsterstyle},
1601 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, 1815 $rmp->{treasurestyle}, $rmp->{layoutstyle}, $rmp->{doorstyle}, $rmp->{decorstyle}, $rmp->{miningstyle},
1602 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map}, 1816 $rmp->{origin_map}, $rmp->{final_map}, $rmp->{exitstyle}, $rmp->{this_map},
1603 $rmp->{exit_on_final_map}, 1817 $rmp->{exit_on_final_map},
1604 $rmp->{xsize}, $rmp->{ysize}, 1818 $rmp->{xsize}, $rmp->{ysize},
1605 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3}, 1819 $rmp->{expand2x}, $rmp->{layoutoptions1}, $rmp->{layoutoptions2}, $rmp->{layoutoptions3},
1606 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase}, 1820 $rmp->{symmetry}, $rmp->{difficulty}, $rmp->{difficulty_given}, $rmp->{difficulty_increase},
… …
1628 1842
1629 $EXT_MAP{$pkg} = [$prio, qr<$regex>]; 1843 $EXT_MAP{$pkg} = [$prio, qr<$regex>];
1630} 1844}
1631 1845
1632# also paths starting with '/' 1846# also paths starting with '/'
1633$EXT_MAP{"cf::map"} = [0, qr{^(?=/)}]; 1847$EXT_MAP{"cf::map::wrap"} = [0, qr{^(?=/)}];
1634 1848
1635sub thawer_merge { 1849sub thawer_merge {
1636 my ($self, $merge) = @_; 1850 my ($self, $merge) = @_;
1637 1851
1638 # we have to keep some variables in memory intact 1852 # we have to keep some variables in memory intact
… …
1724 1938
1725# the temporary/swap location 1939# the temporary/swap location
1726sub save_path { 1940sub save_path {
1727 my ($self) = @_; 1941 my ($self) = @_;
1728 1942
1729 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1943 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1730 "$TMPDIR/$path.map" 1944 "$TMPDIR/$path.map"
1731} 1945}
1732 1946
1733# the unique path, undef == no special unique path 1947# the unique path, undef == no special unique path
1734sub uniq_path { 1948sub uniq_path {
1735 my ($self) = @_; 1949 my ($self) = @_;
1736 1950
1737 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1951 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/go;
1738 "$UNIQUEDIR/$path" 1952 "$UNIQUEDIR/$path"
1739}
1740
1741# and all this just because we cannot iterate over
1742# all maps in C++...
1743sub change_all_map_light {
1744 my ($change) = @_;
1745
1746 $_->change_map_light ($change)
1747 for grep $_->outdoor, values %cf::MAP;
1748} 1953}
1749 1954
1750sub decay_objects { 1955sub decay_objects {
1751 my ($self) = @_; 1956 my ($self) = @_;
1752 1957
… …
1765 1970
1766sub load_header_from($) { 1971sub load_header_from($) {
1767 my ($self, $path) = @_; 1972 my ($self, $path) = @_;
1768 1973
1769 utf8::encode $path; 1974 utf8::encode $path;
1770 #aio_open $path, O_RDONLY, 0 1975 my $f = new_from_file cf::object::thawer $path
1771 # or return;
1772
1773 $self->_load_header ($path)
1774 or return; 1976 or return;
1977
1978 $self->_load_header ($f)
1979 or return;
1980
1981 local $MAP_LOADING{$self->{path}} = $self;
1982 $f->resolve_delayed_derefs;
1775 1983
1776 $self->{load_path} = $path; 1984 $self->{load_path} = $path;
1777 1985
1778 1 1986 1
1779} 1987}
… …
1833sub find { 2041sub find {
1834 my ($path, $origin) = @_; 2042 my ($path, $origin) = @_;
1835 2043
1836 $path = normalise $path, $origin && $origin->path; 2044 $path = normalise $path, $origin && $origin->path;
1837 2045
2046 my $guard1 = cf::lock_acquire "map_data:$path";#d#remove
1838 cf::lock_wait "map_find:$path"; 2047 my $guard2 = cf::lock_acquire "map_find:$path";
1839 2048
1840 $cf::MAP{$path} || do { 2049 $cf::MAP{$path} || do {
1841 my $guard = cf::lock_acquire "map_find:$path";
1842 my $map = new_from_path cf::map $path 2050 my $map = new_from_path cf::map $path
1843 or return; 2051 or return;
1844 2052
1845 $map->{last_save} = $cf::RUNTIME; 2053 $map->{last_save} = $cf::RUNTIME;
1846 2054
… …
1848 or return; 2056 or return;
1849 2057
1850 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?) 2058 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1851 # doing this can freeze the server in a sync job, obviously 2059 # doing this can freeze the server in a sync job, obviously
1852 #$cf::WAIT_FOR_TICK->wait; 2060 #$cf::WAIT_FOR_TICK->wait;
2061 undef $guard2;
2062 undef $guard1;
1853 $map->reset; 2063 $map->reset;
1854 undef $guard;
1855 return find $path; 2064 return find $path;
1856 } 2065 }
1857 2066
1858 $cf::MAP{$path} = $map 2067 $cf::MAP{$path} = $map
1859 } 2068 }
1860} 2069}
1861 2070
1862sub pre_load { } 2071sub pre_load { }
1863sub post_load { } 2072#sub post_load { } # XS
1864 2073
1865sub load { 2074sub load {
1866 my ($self) = @_; 2075 my ($self) = @_;
1867 2076
1868 local $self->{deny_reset} = 1; # loading can take a long time 2077 local $self->{deny_reset} = 1; # loading can take a long time
1869 2078
1870 my $path = $self->{path}; 2079 my $path = $self->{path};
1871 2080
1872 { 2081 {
1873 my $guard = cf::lock_acquire "map_load:$path"; 2082 my $guard = cf::lock_acquire "map_data:$path";
1874 2083
2084 return unless $self->valid;
1875 return if $self->in_memory != cf::MAP_SWAPPED; 2085 return unless $self->in_memory == cf::MAP_SWAPPED;
1876 2086
1877 $self->in_memory (cf::MAP_LOADING); 2087 $self->in_memory (cf::MAP_LOADING);
1878 2088
1879 $self->alloc; 2089 $self->alloc;
1880 2090
1881 $self->pre_load; 2091 $self->pre_load;
1882 Coro::cede; 2092 cf::cede_to_tick;
1883 2093
2094 my $f = new_from_file cf::object::thawer $self->{load_path};
2095 $f->skip_block;
1884 $self->_load_objects ($self->{load_path}, 1) 2096 $self->_load_objects ($f)
1885 or return; 2097 or return;
1886 2098
1887 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2099 $self->post_load_original
1888 if delete $self->{load_original}; 2100 if delete $self->{load_original};
1889 2101
1890 if (my $uniq = $self->uniq_path) { 2102 if (my $uniq = $self->uniq_path) {
1891 utf8::encode $uniq; 2103 utf8::encode $uniq;
1892 if (aio_open $uniq, O_RDONLY, 0) { 2104 unless (aio_stat $uniq) {
2105 if (my $f = new_from_file cf::object::thawer $uniq) {
1893 $self->clear_unique_items; 2106 $self->clear_unique_items;
1894 $self->_load_objects ($uniq, 0); 2107 $self->_load_objects ($f);
2108 $f->resolve_delayed_derefs;
2109 }
1895 } 2110 }
1896 } 2111 }
1897 2112
1898 Coro::cede; 2113 $f->resolve_delayed_derefs;
2114
2115 cf::cede_to_tick;
1899 # now do the right thing for maps 2116 # now do the right thing for maps
1900 $self->link_multipart_objects; 2117 $self->link_multipart_objects;
1901 $self->difficulty ($self->estimate_difficulty) 2118 $self->difficulty ($self->estimate_difficulty)
1902 unless $self->difficulty; 2119 unless $self->difficulty;
1903 Coro::cede; 2120 cf::cede_to_tick;
1904 2121
1905 unless ($self->{deny_activate}) { 2122 unless ($self->{deny_activate}) {
1906 $self->decay_objects; 2123 $self->decay_objects;
1907 $self->fix_auto_apply; 2124 $self->fix_auto_apply;
1908 $self->update_buttons; 2125 $self->update_buttons;
1909 Coro::cede; 2126 cf::cede_to_tick;
1910 $self->set_darkness_map;
1911 Coro::cede;
1912 $self->activate; 2127 $self->activate;
1913 } 2128 }
1914 2129
2130 $self->{last_save} = $cf::RUNTIME;
2131 $self->last_access ($cf::RUNTIME);
2132
1915 $self->in_memory (cf::MAP_IN_MEMORY); 2133 $self->in_memory (cf::MAP_ACTIVE);
1916 } 2134 }
1917 2135
1918 $self->post_load; 2136 $self->post_load;
1919} 2137}
1920 2138
2139# customize the map for a given player, i.e.
2140# return the _real_ map. used by e.g. per-player
2141# maps to change the path to ~playername/mappath
1921sub customise_for { 2142sub customise_for {
1922 my ($self, $ob) = @_; 2143 my ($self, $ob) = @_;
1923 2144
1924 return find "~" . $ob->name . "/" . $self->{path} 2145 return find "~" . $ob->name . "/" . $self->{path}
1925 if $self->per_player; 2146 if $self->per_player;
… …
1929 2150
1930 $self 2151 $self
1931} 2152}
1932 2153
1933# find and load all maps in the 3x3 area around a map 2154# find and load all maps in the 3x3 area around a map
1934sub load_diag { 2155sub load_neighbours {
1935 my ($map) = @_; 2156 my ($map) = @_;
1936 2157
1937 my @diag; # diagonal neighbours 2158 my @neigh; # diagonal neighbours
1938 2159
1939 for (0 .. 3) { 2160 for (0 .. 3) {
1940 my $neigh = $map->tile_path ($_) 2161 my $neigh = $map->tile_path ($_)
1941 or next; 2162 or next;
1942 $neigh = find $neigh, $map 2163 $neigh = find $neigh, $map
1943 or next; 2164 or next;
1944 $neigh->load; 2165 $neigh->load;
1945 2166
2167 push @neigh,
1946 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2168 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1947 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2169 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1948 } 2170 }
1949 2171
1950 for (@diag) { 2172 for (grep defined $_->[0], @neigh) {
2173 my ($path, $origin) = @$_;
1951 my $neigh = find @$_ 2174 my $neigh = find $path, $origin
1952 or next; 2175 or next;
1953 $neigh->load; 2176 $neigh->load;
1954 } 2177 }
1955} 2178}
1956 2179
… …
1961} 2184}
1962 2185
1963sub do_load_sync { 2186sub do_load_sync {
1964 my ($map) = @_; 2187 my ($map) = @_;
1965 2188
2189 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2190 if $Coro::current == $Coro::main;
2191
1966 cf::sync_job { $map->load }; 2192 cf::sync_job { $map->load };
1967} 2193}
1968 2194
1969our %MAP_PREFETCH; 2195our %MAP_PREFETCH;
1970our $MAP_PREFETCHER = undef; 2196our $MAP_PREFETCHER = undef;
1971 2197
1972sub find_async { 2198sub find_async {
1973 my ($path, $origin) = @_; 2199 my ($path, $origin, $load) = @_;
1974 2200
1975 $path = normalise $path, $origin && $origin->{path}; 2201 $path = normalise $path, $origin && $origin->{path};
1976 2202
1977 if (my $map = $cf::MAP{$path}) { 2203 if (my $map = $cf::MAP{$path}) {
1978 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2204 return $map if !$load || $map->in_memory == cf::MAP_ACTIVE;
1979 } 2205 }
1980 2206
1981 undef $MAP_PREFETCH{$path}; 2207 $MAP_PREFETCH{$path} |= $load;
2208
1982 $MAP_PREFETCHER ||= cf::async { 2209 $MAP_PREFETCHER ||= cf::async {
2210 $Coro::current->{desc} = "map prefetcher";
2211
1983 while (%MAP_PREFETCH) { 2212 while (%MAP_PREFETCH) {
1984 for my $path (keys %MAP_PREFETCH) { 2213 while (my ($k, $v) = each %MAP_PREFETCH) {
1985 if (my $map = find $path) { 2214 if (my $map = find $k) {
1986 $map->load; 2215 $map->load if $v;
1987 } 2216 }
1988 2217
1989 delete $MAP_PREFETCH{$path}; 2218 delete $MAP_PREFETCH{$k};
1990 } 2219 }
1991 } 2220 }
1992 undef $MAP_PREFETCHER; 2221 undef $MAP_PREFETCHER;
1993 }; 2222 };
1994 $MAP_PREFETCHER->prio (6); 2223 $MAP_PREFETCHER->prio (6);
1995 2224
1996 () 2225 ()
1997} 2226}
1998 2227
2228# common code, used by both ->save and ->swapout
1999sub save { 2229sub _save {
2000 my ($self) = @_; 2230 my ($self) = @_;
2001
2002 my $lock = cf::lock_acquire "map_data:" . $self->path;
2003 2231
2004 $self->{last_save} = $cf::RUNTIME; 2232 $self->{last_save} = $cf::RUNTIME;
2005 2233
2006 return unless $self->dirty; 2234 return unless $self->dirty;
2007 2235
… …
2013 return if $self->{deny_save}; 2241 return if $self->{deny_save};
2014 2242
2015 local $self->{last_access} = $self->last_access;#d# 2243 local $self->{last_access} = $self->last_access;#d#
2016 2244
2017 cf::async { 2245 cf::async {
2246 $Coro::current->{desc} = "map player save";
2018 $_->contr->save for $self->players; 2247 $_->contr->save for $self->players;
2019 }; 2248 };
2249
2250 cf::get_slot 0.02;
2020 2251
2021 if ($uniq) { 2252 if ($uniq) {
2022 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2253 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
2023 $self->_save_objects ($uniq, cf::IO_UNIQUES); 2254 $self->_save_objects ($uniq, cf::IO_UNIQUES);
2024 } else { 2255 } else {
2025 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES); 2256 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS | cf::IO_UNIQUES);
2026 } 2257 }
2027} 2258}
2028 2259
2260sub save {
2261 my ($self) = @_;
2262
2263 my $lock = cf::lock_acquire "map_data:$self->{path}";
2264
2265 $self->_save;
2266}
2267
2029sub swap_out { 2268sub swap_out {
2030 my ($self) = @_; 2269 my ($self) = @_;
2031 2270
2032 # save first because save cedes
2033 $self->save;
2034
2035 my $lock = cf::lock_acquire "map_data:" . $self->path; 2271 my $lock = cf::lock_acquire "map_data:$self->{path}";
2036 2272
2273 return if $self->in_memory != cf::MAP_ACTIVE;
2274 return if $self->{deny_save};
2037 return if $self->players; 2275 return if $self->players;
2038 return if $self->in_memory != cf::MAP_IN_MEMORY;
2039 return if $self->{deny_save};
2040 2276
2277 # first deactivate the map and "unlink" it from the core
2278 $self->deactivate;
2279 $_->clear_links_to ($self) for values %cf::MAP;
2280 $self->in_memory (cf::MAP_SWAPPED);
2281
2282 # then atomically save
2283 $self->_save;
2284
2285 # then free the map
2041 $self->clear; 2286 $self->clear;
2042 $self->in_memory (cf::MAP_SWAPPED);
2043} 2287}
2044 2288
2045sub reset_at { 2289sub reset_at {
2046 my ($self) = @_; 2290 my ($self) = @_;
2047 2291
… …
2065 2309
2066 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2310 my $lock = cf::lock_acquire "map_data:$self->{path}";
2067 2311
2068 return if $self->players; 2312 return if $self->players;
2069 2313
2070 warn "resetting map ", $self->path; 2314 warn "resetting map ", $self->path, "\n";
2071 2315
2072 $self->in_memory (cf::MAP_SWAPPED); 2316 $self->in_memory (cf::MAP_SWAPPED);
2073 2317
2074 # need to save uniques path 2318 # need to save uniques path
2075 unless ($self->{deny_save}) { 2319 unless ($self->{deny_save}) {
… …
2079 if $uniq; 2323 if $uniq;
2080 } 2324 }
2081 2325
2082 delete $cf::MAP{$self->path}; 2326 delete $cf::MAP{$self->path};
2083 2327
2328 $self->deactivate;
2329 $_->clear_links_to ($self) for values %cf::MAP;
2084 $self->clear; 2330 $self->clear;
2085
2086 $_->clear_links_to ($self) for values %cf::MAP;
2087 2331
2088 $self->unlink_save; 2332 $self->unlink_save;
2089 $self->destroy; 2333 $self->destroy;
2090} 2334}
2091 2335
2092my $nuke_counter = "aaaa"; 2336my $nuke_counter = "aaaa";
2093 2337
2094sub nuke { 2338sub nuke {
2095 my ($self) = @_; 2339 my ($self) = @_;
2096 2340
2341 {
2342 my $lock = cf::lock_acquire "map_data:$self->{path}";
2343
2097 delete $cf::MAP{$self->path}; 2344 delete $cf::MAP{$self->path};
2098 2345
2099 $self->unlink_save; 2346 $self->unlink_save;
2100 2347
2101 bless $self, "cf::map"; 2348 bless $self, "cf::map::wrap";
2102 delete $self->{deny_reset}; 2349 delete $self->{deny_reset};
2103 $self->{deny_save} = 1; 2350 $self->{deny_save} = 1;
2104 $self->reset_timeout (1); 2351 $self->reset_timeout (1);
2105 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2352 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
2106 2353
2107 $cf::MAP{$self->path} = $self; 2354 $cf::MAP{$self->path} = $self;
2355 }
2108 2356
2109 $self->reset; # polite request, might not happen 2357 $self->reset; # polite request, might not happen
2110} 2358}
2111 2359
2112=item $maps = cf::map::tmp_maps 2360=item $maps = cf::map::tmp_maps
… …
2154 2402
2155sub unique_maps() { 2403sub unique_maps() {
2156 [ 2404 [
2157 map { 2405 map {
2158 utf8::decode $_; 2406 utf8::decode $_;
2159 /\.map$/ 2407 s/\.map$//; # TODO future compatibility hack
2408 /\.pst$/ || !/^$PATH_SEP/o # TODO unique maps apparebntly lack the .map suffix :/
2409 ? ()
2160 ? normalise $_ 2410 : normalise $_
2161 : ()
2162 } @{ aio_readdir $UNIQUEDIR or [] } 2411 } @{ aio_readdir $UNIQUEDIR or [] }
2163 ] 2412 ]
2164} 2413}
2165 2414
2166package cf; 2415=item cf::map::static_maps
2416
2417Returns an arrayref if paths of all static maps (all preinstalled F<.map>
2418file in the shared directory excluding F</styles> and F</editor>). May
2419block.
2420
2421=cut
2422
2423sub static_maps() {
2424 my @dirs = "";
2425 my @maps;
2426
2427 while (@dirs) {
2428 my $dir = shift @dirs;
2429
2430 next if $dir eq "/styles" || $dir eq "/editor";
2431
2432 my ($dirs, $files) = Coro::AIO::aio_scandir "$MAPDIR$dir", 2
2433 or return;
2434
2435 for (@$files) {
2436 s/\.map$// or next;
2437 utf8::decode $_;
2438 push @maps, "$dir/$_";
2439 }
2440
2441 push @dirs, map "$dir/$_", @$dirs;
2442 }
2443
2444 \@maps
2445}
2167 2446
2168=back 2447=back
2169 2448
2170=head3 cf::object 2449=head3 cf::object
2171 2450
… …
2175 2454
2176=over 4 2455=over 4
2177 2456
2178=item $ob->inv_recursive 2457=item $ob->inv_recursive
2179 2458
2180Returns the inventory of the object _and_ their inventories, recursively. 2459Returns the inventory of the object I<and> their inventories, recursively,
2460but I<not> the object itself.
2181 2461
2182=cut 2462=cut
2183 2463
2184sub inv_recursive_; 2464sub inv_recursive_;
2185sub inv_recursive_ { 2465sub inv_recursive_ {
… …
2188 2468
2189sub inv_recursive { 2469sub inv_recursive {
2190 inv_recursive_ inv $_[0] 2470 inv_recursive_ inv $_[0]
2191} 2471}
2192 2472
2473=item $ref = $ob->ref
2474
2475Creates and returns a persistent reference to an object that can be stored as a string.
2476
2477=item $ob = cf::object::deref ($refstring)
2478
2479returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2480even if the object actually exists. May block.
2481
2482=cut
2483
2484sub deref {
2485 my ($ref) = @_;
2486
2487 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2488 my ($uuid, $name) = ($1, $2);
2489 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2490 or return;
2491 $pl->ob->uuid eq $uuid
2492 or return;
2493
2494 $pl->ob
2495 } else {
2496 warn "$ref: cannot resolve object reference\n";
2497 undef
2498 }
2499}
2500
2193package cf; 2501package cf;
2194 2502
2195=back 2503=back
2196 2504
2197=head3 cf::object::player 2505=head3 cf::object::player
… …
2203Sends a message to the player, as if the npc C<$npc> replied. C<$npc> 2511Sends a message to the player, as if the npc C<$npc> replied. C<$npc>
2204can be C<undef>. Does the right thing when the player is currently in a 2512can be C<undef>. Does the right thing when the player is currently in a
2205dialogue with the given NPC character. 2513dialogue with the given NPC character.
2206 2514
2207=cut 2515=cut
2516
2517our $SAY_CHANNEL = {
2518 id => "say",
2519 title => "Map",
2520 reply => "say ",
2521 tooltip => "Things said to and replied from NPCs near you and other players on the same map only.",
2522};
2523
2524our $CHAT_CHANNEL = {
2525 id => "chat",
2526 title => "Chat",
2527 reply => "chat ",
2528 tooltip => "Player chat and shouts, global to the server.",
2529};
2208 2530
2209# rough implementation of a future "reply" method that works 2531# rough implementation of a future "reply" method that works
2210# with dialog boxes. 2532# with dialog boxes.
2211#TODO: the first argument must go, split into a $npc->reply_to ( method 2533#TODO: the first argument must go, split into a $npc->reply_to ( method
2212sub cf::object::player::reply($$$;$) { 2534sub cf::object::player::reply($$$;$) {
… …
2219 2541
2220 } else { 2542 } else {
2221 my $pl = $self->contr; 2543 my $pl = $self->contr;
2222 2544
2223 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) { 2545 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2224 my $diag = $pl->{npc_dialog}; 2546 my $dialog = $pl->{npc_dialog};
2225 $diag->{pl}->ext_reply ( 2547 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2226 $diag->{id},
2227 msgtype => "reply",
2228 msg => $diag->{pl}->expand_cfpod ($msg),
2229 add_topics => []
2230 );
2231 2548
2232 } else { 2549 } else {
2233 $msg = $npc->name . " says: $msg" if $npc; 2550 $msg = $npc->name . " says: $msg" if $npc;
2234 $self->message ($msg, $flags); 2551 $self->send_msg ($SAY_CHANNEL => $msg, $flags);
2235 } 2552 }
2236 } 2553 }
2554}
2555
2556=item $object->send_msg ($channel, $msg, $color, [extra...])
2557
2558=cut
2559
2560sub cf::object::send_msg {
2561 my $pl = shift->contr
2562 or return;
2563 $pl->send_msg (@_);
2237} 2564}
2238 2565
2239=item $player_object->may ("access") 2566=item $player_object->may ("access")
2240 2567
2241Returns wether the given player is authorized to access resource "access" 2568Returns wether the given player is authorized to access resource "access"
… …
2254 2581
2255=item $player_object->enter_link 2582=item $player_object->enter_link
2256 2583
2257Freezes the player and moves him/her to a special map (C<{link}>). 2584Freezes the player and moves him/her to a special map (C<{link}>).
2258 2585
2259The player should be reasonably safe there for short amounts of time. You 2586The player should be reasonably safe there for short amounts of time (e.g.
2260I<MUST> call C<leave_link> as soon as possible, though. 2587for loading a map). You I<MUST> call C<leave_link> as soon as possible,
2588though, as the palyer cannot control the character while it is on the link
2589map.
2261 2590
2262Will never block. 2591Will never block.
2263 2592
2264=item $player_object->leave_link ($map, $x, $y) 2593=item $player_object->leave_link ($map, $x, $y)
2265 2594
… …
2290 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2619 return if UNIVERSAL::isa $self->map, "ext::map_link";
2291 2620
2292 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2621 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
2293 if $self->map && $self->map->{path} ne "{link}"; 2622 if $self->map && $self->map->{path} ne "{link}";
2294 2623
2295 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2624 $self->enter_map ($LINK_MAP || link_map, 3, 3);
2296} 2625}
2297 2626
2298sub cf::object::player::leave_link { 2627sub cf::object::player::leave_link {
2299 my ($self, $map, $x, $y) = @_; 2628 my ($self, $map, $x, $y) = @_;
2300 2629
… …
2317 ($x, $y) = (-1, -1) 2646 ($x, $y) = (-1, -1)
2318 unless (defined $x) && (defined $y); 2647 unless (defined $x) && (defined $y);
2319 2648
2320 # use -1 or undef as default coordinates, not 0, 0 2649 # use -1 or undef as default coordinates, not 0, 0
2321 ($x, $y) = ($map->enter_x, $map->enter_y) 2650 ($x, $y) = ($map->enter_x, $map->enter_y)
2322 if $x <=0 && $y <= 0; 2651 if $x <= 0 && $y <= 0;
2323 2652
2324 $map->load; 2653 $map->load;
2325 $map->load_diag; 2654 $map->load_neighbours;
2326 2655
2327 return unless $self->contr->active; 2656 return unless $self->contr->active;
2328 $self->activate_recursive;
2329 2657
2330 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2658 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
2331 $self->enter_map ($map, $x, $y); 2659 $self->enter_map ($map, $x, $y);
2660
2661 # only activate afterwards, to support waiting in hooks
2662 $self->activate_recursive;
2332} 2663}
2333 2664
2334=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]]) 2665=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
2335 2666
2336Moves the player to the given map-path and coordinates by first freezing 2667Moves the player to the given map-path and coordinates by first freezing
2337her, loading and preparing them map, calling the provided $check callback 2668her, loading and preparing them map, calling the provided $check callback
2338that has to return the map if sucecssful, and then unfreezes the player on 2669that has to return the map if sucecssful, and then unfreezes the player on
2339the new (success) or old (failed) map position. In either case, $done will 2670the new (success) or old (failed) map position. In either case, $done will
2340be called at the end of this process. 2671be called at the end of this process.
2341 2672
2673Note that $check will be called with a potentially non-loaded map, so if
2674it needs a loaded map it has to call C<< ->load >>.
2675
2342=cut 2676=cut
2343 2677
2344our $GOTOGEN; 2678our $GOTOGEN;
2345 2679
2346sub cf::object::player::goto { 2680sub cf::object::player::goto {
… …
2350 my $gen = $self->{_goto_generation} = ++$GOTOGEN; 2684 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
2351 2685
2352 $self->enter_link; 2686 $self->enter_link;
2353 2687
2354 (async { 2688 (async {
2689 $Coro::current->{desc} = "player::goto $path $x $y";
2690
2691 # *tag paths override both path and x|y
2692 if ($path =~ /^\*(.*)$/) {
2693 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2694 my $ob = $obs[rand @obs];
2695
2696 # see if we actually can go there
2697 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2698 $ob = $obs[rand @obs];
2699 } else {
2700 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2701 }
2702 # else put us there anyways for now #d#
2703
2704 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2705 } else {
2706 ($path, $x, $y) = (undef, undef, undef);
2707 }
2708 }
2709
2355 my $map = eval { 2710 my $map = eval {
2356 my $map = cf::map::find $path; 2711 my $map = defined $path ? cf::map::find $path : undef;
2357 2712
2358 if ($map) { 2713 if ($map) {
2359 $map = $map->customise_for ($self); 2714 $map = $map->customise_for ($self);
2360 $map = $check->($map) if $check && $map; 2715 $map = $check->($map) if $check && $map;
2361 } else { 2716 } else {
2362 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED); 2717 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2363 } 2718 }
2364 2719
2365 $map 2720 $map
2366 }; 2721 };
2367 2722
… …
2403} 2758}
2404 2759
2405sub prepare_random_map { 2760sub prepare_random_map {
2406 my ($exit) = @_; 2761 my ($exit) = @_;
2407 2762
2408 my $guard = cf::lock_acquire "exit_prepare:$exit";
2409
2410 # all this does is basically replace the /! path by 2763 # all this does is basically replace the /! path by
2411 # a new random map path (?random/...) with a seed 2764 # a new random map path (?random/...) with a seed
2412 # that depends on the exit object 2765 # that depends on the exit object
2413 2766
2414 my $rmp = parse_random_map_params $exit->msg; 2767 my $rmp = parse_random_map_params $exit->msg;
… …
2416 if ($exit->map) { 2769 if ($exit->map) {
2417 $rmp->{region} = $exit->region->name; 2770 $rmp->{region} = $exit->region->name;
2418 $rmp->{origin_map} = $exit->map->path; 2771 $rmp->{origin_map} = $exit->map->path;
2419 $rmp->{origin_x} = $exit->x; 2772 $rmp->{origin_x} = $exit->x;
2420 $rmp->{origin_y} = $exit->y; 2773 $rmp->{origin_y} = $exit->y;
2774
2775 $exit->map->touch;
2421 } 2776 }
2422 2777
2423 $rmp->{random_seed} ||= $exit->random_seed; 2778 $rmp->{random_seed} ||= $exit->random_seed;
2424 2779
2425 my $data = cf::to_json $rmp; 2780 my $data = JSON::XS->new->utf8->pretty->canonical->encode ($rmp);
2426 my $md5 = Digest::MD5::md5_hex $data; 2781 my $md5 = Digest::MD5::md5_hex $data;
2427 my $meta = "$RANDOMDIR/$md5.meta"; 2782 my $meta = "$RANDOMDIR/$md5.meta";
2428 2783
2429 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2784 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
2430 aio_write $fh, 0, (length $data), $data, 0; 2785 aio_write $fh, 0, (length $data), $data, 0;
2431 undef $fh; 2786 undef $fh;
2432 aio_rename "$meta~", $meta; 2787 aio_rename "$meta~", $meta;
2433 2788
2789 my $slaying = "?random/$md5";
2790
2791 if ($exit->valid) {
2434 $exit->slaying ("?random/$md5"); 2792 $exit->slaying ("?random/$md5");
2435 $exit->msg (undef); 2793 $exit->msg (undef);
2794 }
2436 } 2795 }
2437} 2796}
2438 2797
2439sub cf::object::player::enter_exit { 2798sub cf::object::player::enter_exit {
2440 my ($self, $exit) = @_; 2799 my ($self, $exit) = @_;
2441 2800
2442 return unless $self->type == cf::PLAYER; 2801 return unless $self->type == cf::PLAYER;
2443 2802
2444 if ($exit->slaying eq "/!") {
2445 #TODO: this should de-fi-ni-te-ly not be a sync-job
2446 # the problem is that $exit might not survive long enough
2447 # so it needs to be done right now, right here
2448 cf::sync_job { prepare_random_map $exit };
2449 }
2450
2451 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2452 my $hp = $exit->stats->hp;
2453 my $sp = $exit->stats->sp;
2454
2455 $self->enter_link; 2803 $self->enter_link;
2456 2804
2457 # if exit is damned, update players death & WoR home-position
2458 $self->contr->savebed ($slaying, $hp, $sp)
2459 if $exit->flag (FLAG_DAMNED);
2460
2461 (async { 2805 (async {
2462 $self->deactivate_recursive; # just to be sure 2806 $Coro::current->{desc} = "enter_exit";
2807
2463 unless (eval { 2808 unless (eval {
2809 $self->deactivate_recursive; # just to be sure
2810
2811 # random map handling
2812 {
2813 my $guard = cf::lock_acquire "exit_prepare:$exit";
2814
2815 prepare_random_map $exit
2816 if $exit->slaying eq "/!";
2817 }
2818
2819 my $map = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
2820 my $x = $exit->stats->hp;
2821 my $y = $exit->stats->sp;
2822
2464 $self->goto ($slaying, $hp, $sp); 2823 $self->goto ($map, $x, $y);
2465 2824
2825 # if exit is damned, update players death & WoR home-position
2826 $self->contr->savebed ($map, $x, $y)
2827 if $exit->flag (cf::FLAG_DAMNED);
2828
2466 1; 2829 1
2467 }) { 2830 }) {
2468 $self->message ("Something went wrong deep within the crossfire server. " 2831 $self->message ("Something went wrong deep within the deliantra server. "
2469 . "I'll try to bring you back to the map you were before. " 2832 . "I'll try to bring you back to the map you were before. "
2470 . "Please report this to the dungeon master!", 2833 . "Please report this to the dungeon master!",
2471 cf::NDI_UNIQUE | cf::NDI_RED); 2834 cf::NDI_UNIQUE | cf::NDI_RED);
2472 2835
2473 warn "ERROR in enter_exit: $@"; 2836 warn "ERROR in enter_exit: $@";
… …
2490sub cf::client::send_drawinfo { 2853sub cf::client::send_drawinfo {
2491 my ($self, $text, $flags) = @_; 2854 my ($self, $text, $flags) = @_;
2492 2855
2493 utf8::encode $text; 2856 utf8::encode $text;
2494 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2857 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2858}
2859
2860=item $client->send_big_packet ($pkt)
2861
2862Like C<send_packet>, but tries to compress large packets, and fragments
2863them as required.
2864
2865=cut
2866
2867our $MAXFRAGSIZE = cf::MAXSOCKBUF - 64;
2868
2869sub cf::client::send_big_packet {
2870 my ($self, $pkt) = @_;
2871
2872 # try lzf for large packets
2873 $pkt = "lzf " . Compress::LZF::compress $pkt
2874 if 1024 <= length $pkt and $self->{can_lzf};
2875
2876 # split very large packets
2877 if ($MAXFRAGSIZE < length $pkt and $self->{can_lzf}) {
2878 $self->send_packet ("frag $_") for unpack "(a$MAXFRAGSIZE)*", $pkt;
2879 $pkt = "frag";
2880 }
2881
2882 $self->send_packet ($pkt);
2495} 2883}
2496 2884
2497=item $client->send_msg ($channel, $msg, $color, [extra...]) 2885=item $client->send_msg ($channel, $msg, $color, [extra...])
2498 2886
2499Send a drawinfo or msg packet to the client, formatting the msg for the 2887Send a drawinfo or msg packet to the client, formatting the msg for the
… …
2501the message, with C<log> being the default. If C<$color> is negative, suppress 2889the message, with C<log> being the default. If C<$color> is negative, suppress
2502the message unless the client supports the msg packet. 2890the message unless the client supports the msg packet.
2503 2891
2504=cut 2892=cut
2505 2893
2894# non-persistent channels (usually the info channel)
2895our %CHANNEL = (
2896 "c/motd" => {
2897 id => "infobox",
2898 title => "MOTD",
2899 reply => undef,
2900 tooltip => "The message of the day",
2901 },
2902 "c/identify" => {
2903 id => "infobox",
2904 title => "Identify",
2905 reply => undef,
2906 tooltip => "Items recently identified",
2907 },
2908 "c/examine" => {
2909 id => "infobox",
2910 title => "Examine",
2911 reply => undef,
2912 tooltip => "Signs and other items you examined",
2913 },
2914 "c/shopinfo" => {
2915 id => "infobox",
2916 title => "Shop Info",
2917 reply => undef,
2918 tooltip => "What your bargaining skill tells you about the shop",
2919 },
2920 "c/book" => {
2921 id => "infobox",
2922 title => "Book",
2923 reply => undef,
2924 tooltip => "The contents of a note or book",
2925 },
2926 "c/lookat" => {
2927 id => "infobox",
2928 title => "Look",
2929 reply => undef,
2930 tooltip => "What you saw there",
2931 },
2932 "c/who" => {
2933 id => "infobox",
2934 title => "Players",
2935 reply => undef,
2936 tooltip => "Shows players who are currently online",
2937 },
2938 "c/body" => {
2939 id => "infobox",
2940 title => "Body Parts",
2941 reply => undef,
2942 tooltip => "Shows which body parts you posess and are available",
2943 },
2944 "c/statistics" => {
2945 id => "infobox",
2946 title => "Statistics",
2947 reply => undef,
2948 tooltip => "Shows your primary statistics",
2949 },
2950 "c/skills" => {
2951 id => "infobox",
2952 title => "Skills",
2953 reply => undef,
2954 tooltip => "Shows your experience per skill and item power",
2955 },
2956 "c/shopitems" => {
2957 id => "infobox",
2958 title => "Shop Items",
2959 reply => undef,
2960 tooltip => "Shows the items currently for sale in this shop",
2961 },
2962 "c/resistances" => {
2963 id => "infobox",
2964 title => "Resistances",
2965 reply => undef,
2966 tooltip => "Shows your resistances",
2967 },
2968 "c/pets" => {
2969 id => "infobox",
2970 title => "Pets",
2971 reply => undef,
2972 tooltip => "Shows information abotu your pets/a specific pet",
2973 },
2974 "c/perceiveself" => {
2975 id => "infobox",
2976 title => "Perceive Self",
2977 reply => undef,
2978 tooltip => "You gained detailed knowledge about yourself",
2979 },
2980 "c/uptime" => {
2981 id => "infobox",
2982 title => "Uptime",
2983 reply => undef,
2984 tooltip => "How long the server has been running since last restart",
2985 },
2986 "c/mapinfo" => {
2987 id => "infobox",
2988 title => "Map Info",
2989 reply => undef,
2990 tooltip => "Information related to the maps",
2991 },
2992 "c/party" => {
2993 id => "party",
2994 title => "Party",
2995 reply => "gsay ",
2996 tooltip => "Messages and chat related to your party",
2997 },
2998 "c/death" => {
2999 id => "death",
3000 title => "Death",
3001 reply => undef,
3002 tooltip => "Reason for and more info about your most recent death",
3003 },
3004 "c/say" => $SAY_CHANNEL,
3005 "c/chat" => $CHAT_CHANNEL,
3006);
3007
2506sub cf::client::send_msg { 3008sub cf::client::send_msg {
2507 my ($self, $channel, $msg, $color, @extra) = @_; 3009 my ($self, $channel, $msg, $color, @extra) = @_;
2508 3010
2509 $msg = $self->pl->expand_cfpod ($msg); 3011 $msg = $self->pl->expand_cfpod ($msg)
3012 unless $color & cf::NDI_VERBATIM;
2510 3013
2511 $color &= ~cf::NDI_UNIQUE; # just in case... 3014 $color &= cf::NDI_CLIENT_MASK; # just in case...
2512 3015
3016 # check predefined channels, for the benefit of C
3017 if ($CHANNEL{$channel}) {
3018 $channel = $CHANNEL{$channel};
3019
3020 $self->ext_msg (channel_info => $channel);
3021 $channel = $channel->{id};
3022
2513 if (ref $channel) { 3023 } elsif (ref $channel) {
2514 # send meta info to client, if not yet sent 3024 # send meta info to client, if not yet sent
2515 unless (exists $self->{channel}{$channel->{id}}) { 3025 unless (exists $self->{channel}{$channel->{id}}) {
2516 $self->{channel}{$channel->{id}} = $channel; 3026 $self->{channel}{$channel->{id}} = $channel;
2517 $self->ext_event (channel_info => %$channel); 3027 $self->ext_msg (channel_info => $channel);
2518 } 3028 }
2519 3029
2520 $channel = $channel->{id}; 3030 $channel = $channel->{id};
2521 } 3031 }
2522 3032
2523 return unless @extra || length $msg; 3033 return unless @extra || length $msg;
2524 3034
2525 if ($self->can_msg) { 3035 # default colour, mask it out
2526 $self->send_packet ("msg " . $self->{json_coder}->encode ([$color, $channel, $msg, @extra])); 3036 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2527 } else { 3037 if $color & cf::NDI_DEF;
2528 # replace some tags by gcfclient-compatible ones
2529 for ($msg) {
2530 1 while
2531 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2532 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2533 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2534 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2535 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2536 }
2537 3038
2538 if ($color >= 0) { 3039 my $pkt = "msg "
2539 if (0 && $msg =~ /\[/) { 3040 . $self->{json_coder}->encode (
2540 $self->send_packet ("drawextinfo $color 4 0 $msg") 3041 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]
2541 } else { 3042 );
2542 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2543 $self->send_packet ("drawinfo $color $msg")
2544 }
2545 }
2546 }
2547}
2548 3043
3044 $self->send_big_packet ($pkt);
3045}
3046
2549=item $client->ext_event ($type, %msg) 3047=item $client->ext_msg ($type, @msg)
2550 3048
2551Sends an ext event to the client. 3049Sends an ext event to the client.
2552 3050
2553=cut 3051=cut
2554 3052
2555sub cf::client::ext_event($$%) { 3053sub cf::client::ext_msg($$@) {
2556 my ($self, $type, %msg) = @_; 3054 my ($self, $type, @msg) = @_;
2557 3055
2558 return unless $self->extcmd; 3056 if ($self->extcmd == 2) {
2559 3057 $self->send_big_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
3058 } elsif ($self->extcmd == 1) { # TODO: remove
2560 $msg{msgtype} = "event_$type"; 3059 push @msg, msgtype => "event_$type";
2561 $self->send_packet ("ext " . $self->{json_coder}->encode (\%msg)); 3060 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3061 }
3062}
3063
3064=item $client->ext_reply ($msgid, @msg)
3065
3066Sends an ext reply to the client.
3067
3068=cut
3069
3070sub cf::client::ext_reply($$@) {
3071 my ($self, $id, @msg) = @_;
3072
3073 if ($self->extcmd == 2) {
3074 $self->send_big_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
3075 } elsif ($self->extcmd == 1) {
3076 #TODO: version 1, remove
3077 unshift @msg, msgtype => "reply", msgid => $id;
3078 $self->send_big_packet ("ext " . $self->{json_coder}->encode ({@msg}));
3079 }
2562} 3080}
2563 3081
2564=item $success = $client->query ($flags, "text", \&cb) 3082=item $success = $client->query ($flags, "text", \&cb)
2565 3083
2566Queues a query to the client, calling the given callback with 3084Queues a query to the client, calling the given callback with
… …
2621 my ($ns, $buf) = @_; 3139 my ($ns, $buf) = @_;
2622 3140
2623 my $msg = eval { $ns->{json_coder}->decode ($buf) }; 3141 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2624 3142
2625 if (ref $msg) { 3143 if (ref $msg) {
3144 my ($type, $reply, @payload) =
3145 "ARRAY" eq ref $msg
3146 ? @$msg
3147 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
3148
3149 my @reply;
3150
2626 if (my $cb = $EXTICMD{$msg->{msgtype}}) { 3151 if (my $cb = $EXTICMD{$type}) {
2627 if (my %reply = $cb->($ns, $msg)) { 3152 @reply = $cb->($ns, @payload);
2628 $reply{msgid} = $msg->{msgid};
2629 $ns->send ("ext " . $ns->{json_coder}->encode (\%reply));
2630 }
2631 } 3153 }
3154
3155 $ns->ext_reply ($reply, @reply)
3156 if $reply;
3157
2632 } else { 3158 } else {
2633 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n"; 3159 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2634 } 3160 }
2635 3161
2636 cf::override; 3162 cf::override;
… …
2658 3184
2659 $coro 3185 $coro
2660} 3186}
2661 3187
2662cf::client->attach ( 3188cf::client->attach (
2663 on_destroy => sub { 3189 on_client_destroy => sub {
2664 my ($ns) = @_; 3190 my ($ns) = @_;
2665 3191
2666 $_->cancel for values %{ (delete $ns->{_coro}) || {} }; 3192 $_->cancel for values %{ (delete $ns->{_coro}) || {} };
2667 }, 3193 },
2668); 3194);
… …
2683our $safe = new Safe "safe"; 3209our $safe = new Safe "safe";
2684our $safe_hole = new Safe::Hole; 3210our $safe_hole = new Safe::Hole;
2685 3211
2686$SIG{FPE} = 'IGNORE'; 3212$SIG{FPE} = 'IGNORE';
2687 3213
2688$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 3214$safe->permit_only (Opcode::opset qw(
3215 :base_core :base_mem :base_orig :base_math :base_loop
3216 grepstart grepwhile mapstart mapwhile
3217 sort time
3218));
2689 3219
2690# here we export the classes and methods available to script code 3220# here we export the classes and methods available to script code
2691 3221
2692=pod 3222=pod
2693 3223
2694The following functions and methods are available within a safe environment: 3224The following functions and methods are available within a safe environment:
2695 3225
2696 cf::object 3226 cf::object
2697 contr pay_amount pay_player map x y force_find force_add 3227 contr pay_amount pay_player map x y force_find force_add destroy
2698 insert remove 3228 insert remove name archname title slaying race decrease split
3229 value
2699 3230
2700 cf::object::player 3231 cf::object::player
2701 player 3232 player
2702 3233
2703 cf::player 3234 cf::player
… …
2708 3239
2709=cut 3240=cut
2710 3241
2711for ( 3242for (
2712 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y 3243 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
2713 insert remove)], 3244 insert remove inv nrof name archname title slaying race
3245 decrease split destroy change_exp value msg lore send_msg)],
2714 ["cf::object::player" => qw(player)], 3246 ["cf::object::player" => qw(player)],
2715 ["cf::player" => qw(peaceful)], 3247 ["cf::player" => qw(peaceful send_msg)],
2716 ["cf::map" => qw(trigger)], 3248 ["cf::map" => qw(trigger)],
2717) { 3249) {
2718 no strict 'refs'; 3250 no strict 'refs';
2719 my ($pkg, @funs) = @$_; 3251 my ($pkg, @funs) = @$_;
2720 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"}) 3252 *{"safe::$pkg\::$_"} = $safe_hole->wrap (\&{"$pkg\::$_"})
… …
2738 3270
2739 my $qcode = $code; 3271 my $qcode = $code;
2740 $qcode =~ s/"/‟/g; # not allowed in #line filenames 3272 $qcode =~ s/"/‟/g; # not allowed in #line filenames
2741 $qcode =~ s/\n/\\n/g; 3273 $qcode =~ s/\n/\\n/g;
2742 3274
3275 %vars = (_dummy => 0) unless %vars;
3276
3277 my @res;
2743 local $_; 3278 local $_;
2744 local @safe::cf::_safe_eval_args = values %vars;
2745 3279
2746 my $eval = 3280 my $eval =
2747 "do {\n" 3281 "do {\n"
2748 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n" 3282 . "my (" . (join ",", map "\$$_", keys %vars) . ") = \@cf::_safe_eval_args;\n"
2749 . "#line 0 \"{$qcode}\"\n" 3283 . "#line 0 \"{$qcode}\"\n"
2750 . $code 3284 . $code
2751 . "\n}" 3285 . "\n}"
2752 ; 3286 ;
2753 3287
3288 if ($CFG{safe_eval}) {
2754 sub_generation_inc; 3289 sub_generation_inc;
3290 local @safe::cf::_safe_eval_args = values %vars;
2755 my @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval); 3291 @res = wantarray ? $safe->reval ($eval) : scalar $safe->reval ($eval);
2756 sub_generation_inc; 3292 sub_generation_inc;
3293 } else {
3294 local @cf::_safe_eval_args = values %vars;
3295 @res = wantarray ? eval eval : scalar eval $eval;
3296 }
2757 3297
2758 if ($@) { 3298 if ($@) {
2759 warn "$@"; 3299 warn "$@";
2760 warn "while executing safe code '$code'\n"; 3300 warn "while executing safe code '$code'\n";
2761 warn "with arguments " . (join " ", %vars) . "\n"; 3301 warn "with arguments " . (join " ", %vars) . "\n";
… …
2780=cut 3320=cut
2781 3321
2782sub register_script_function { 3322sub register_script_function {
2783 my ($fun, $cb) = @_; 3323 my ($fun, $cb) = @_;
2784 3324
2785 no strict 'refs'; 3325 $fun = "safe::$fun" if $CFG{safe_eval};
2786 *{"safe::$fun"} = $safe_hole->wrap ($cb); 3326 *$fun = $safe_hole->wrap ($cb);
2787} 3327}
2788 3328
2789=back 3329=back
2790 3330
2791=cut 3331=cut
… …
2793############################################################################# 3333#############################################################################
2794# the server's init and main functions 3334# the server's init and main functions
2795 3335
2796sub load_facedata($) { 3336sub load_facedata($) {
2797 my ($path) = @_; 3337 my ($path) = @_;
3338
3339 # HACK to clear player env face cache, we need some signal framework
3340 # for this (global event?)
3341 %ext::player_env::MUSIC_FACE_CACHE = ();
3342
3343 my $enc = JSON::XS->new->utf8->canonical->relaxed;
2798 3344
2799 warn "loading facedata from $path\n"; 3345 warn "loading facedata from $path\n";
2800 3346
2801 my $facedata; 3347 my $facedata;
2802 0 < aio_load $path, $facedata 3348 0 < aio_load $path, $facedata
… …
2805 $facedata = Coro::Storable::thaw $facedata; 3351 $facedata = Coro::Storable::thaw $facedata;
2806 3352
2807 $facedata->{version} == 2 3353 $facedata->{version} == 2
2808 or cf::cleanup "$path: version mismatch, cannot proceed."; 3354 or cf::cleanup "$path: version mismatch, cannot proceed.";
2809 3355
3356 # patch in the exptable
3357 my $exp_table = $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]);
3358 $facedata->{resource}{"res/exp_table"} = {
3359 type => FT_RSRC,
3360 data => $exp_table,
3361 hash => (Digest::MD5::md5 $exp_table),
3362 };
3363 cf::cede_to_tick;
3364
2810 { 3365 {
2811 my $faces = $facedata->{faceinfo}; 3366 my $faces = $facedata->{faceinfo};
2812 3367
2813 while (my ($face, $info) = each %$faces) { 3368 while (my ($face, $info) = each %$faces) {
2814 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3369 my $idx = (cf::face::find $face) || cf::face::alloc $face;
3370
2815 cf::face::set_visibility $idx, $info->{visibility}; 3371 cf::face::set_visibility $idx, $info->{visibility};
2816 cf::face::set_magicmap $idx, $info->{magicmap}; 3372 cf::face::set_magicmap $idx, $info->{magicmap};
2817 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3373 cf::face::set_data $idx, 0, $info->{data32}, $info->{hash32};
2818 cf::face::set_data $idx, 1, $info->{data64}, $info->{chksum64}; 3374 cf::face::set_data $idx, 1, $info->{data64}, $info->{hash64};
2819 3375
2820 cf::cede_to_tick; 3376 cf::cede_to_tick;
2821 } 3377 }
2822 3378
2823 while (my ($face, $info) = each %$faces) { 3379 while (my ($face, $info) = each %$faces) {
2824 next unless $info->{smooth}; 3380 next unless $info->{smooth};
3381
2825 my $idx = cf::face::find $face 3382 my $idx = cf::face::find $face
2826 or next; 3383 or next;
3384
2827 if (my $smooth = cf::face::find $info->{smooth}) { 3385 if (my $smooth = cf::face::find $info->{smooth}) {
2828 cf::face::set_smooth $idx, $smooth; 3386 cf::face::set_smooth $idx, $smooth;
2829 cf::face::set_smoothlevel $idx, $info->{smoothlevel}; 3387 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2830 } else { 3388 } else {
2831 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3389 warn "smooth face '$info->{smooth}' not found for face '$face'";
… …
2845 3403
2846 cf::anim::invalidate_all; # d'oh 3404 cf::anim::invalidate_all; # d'oh
2847 } 3405 }
2848 3406
2849 { 3407 {
2850 # TODO: for gcfclient pleasure, we should give resources
2851 # that gcfclient doesn't grok a >10000 face index.
2852 my $res = $facedata->{resource}; 3408 my $res = $facedata->{resource};
2853 my $enc = JSON::XS->new->utf8->canonical;
2854 3409
2855 while (my ($name, $info) = each %$res) { 3410 while (my ($name, $info) = each %$res) {
2856 my $meta = $enc->encode ({ 3411 if (defined $info->{type}) {
2857 name => $name,
2858 type => $info->{type},
2859 copyright => $info->{copyright}, #TODO#
2860 });
2861
2862 my $idx = (cf::face::find $name) || cf::face::alloc $name; 3412 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2863 3413
2864 if ($name =~ /\.jpg$/) {
2865 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 3414 cf::face::set_data $idx, 0, $info->{data}, $info->{hash};
2866 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 3415 cf::face::set_type $idx, $info->{type};
2867 } else { 3416 } else {
2868 my $data = pack "(w/a*)*", $meta, $info->{data}; 3417 $RESOURCE{$name} = $info;
2869 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2870
2871 cf::face::set_type $idx, 1;
2872 cf::face::set_data $idx, 0, $data, $chk;
2873 } 3418 }
2874 3419
2875 cf::cede_to_tick; 3420 cf::cede_to_tick;
2876 } 3421 }
2877 } 3422 }
2878 3423
3424 cf::global->invoke (EVENT_GLOBAL_RESOURCE_UPDATE);
3425
2879 1 3426 1
2880} 3427}
2881 3428
3429cf::global->attach (on_resource_update => sub {
3430 if (my $soundconf = $RESOURCE{"res/sound.conf"}) {
3431 $soundconf = JSON::XS->new->utf8->relaxed->decode ($soundconf->{data});
3432
3433 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3434 my $sound = $soundconf->{compat}[$_]
3435 or next;
3436
3437 my $face = cf::face::find "sound/$sound->[1]";
3438 cf::sound::set $sound->[0] => $face;
3439 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3440 }
3441
3442 while (my ($k, $v) = each %{$soundconf->{event}}) {
3443 my $face = cf::face::find "sound/$v";
3444 cf::sound::set $k => $face;
3445 }
3446 }
3447});
3448
3449register_exticmd fx_want => sub {
3450 my ($ns, $want) = @_;
3451
3452 while (my ($k, $v) = each %$want) {
3453 $ns->fx_want ($k, $v);
3454 }
3455};
3456
3457sub load_resource_file($) {
3458 my $guard = lock_acquire "load_resource_file";
3459
3460 my $status = load_resource_file_ $_[0];
3461 get_slot 0.1, 100;
3462 cf::arch::commit_load;
3463
3464 $status
3465}
3466
2882sub reload_regions { 3467sub reload_regions {
3468 # HACK to clear player env face cache, we need some signal framework
3469 # for this (global event?)
3470 %ext::player_env::MUSIC_FACE_CACHE = ();
3471
2883 load_resource_file "$MAPDIR/regions" 3472 load_resource_file "$MAPDIR/regions"
2884 or die "unable to load regions file\n"; 3473 or die "unable to load regions file\n";
2885 3474
2886 for (cf::region::list) { 3475 for (cf::region::list) {
2887 $_->{match} = qr/$_->{match}/ 3476 $_->{match} = qr/$_->{match}/
… …
2895} 3484}
2896 3485
2897sub reload_archetypes { 3486sub reload_archetypes {
2898 load_resource_file "$DATADIR/archetypes" 3487 load_resource_file "$DATADIR/archetypes"
2899 or die "unable to load archetypes\n"; 3488 or die "unable to load archetypes\n";
2900 #d# NEED to laod twice to resolve forward references
2901 # this really needs to be done in an extra post-pass
2902 # (which needs to be synchronous, so solve it differently)
2903 load_resource_file "$DATADIR/archetypes"
2904 or die "unable to load archetypes\n";
2905} 3489}
2906 3490
2907sub reload_treasures { 3491sub reload_treasures {
2908 load_resource_file "$DATADIR/treasures" 3492 load_resource_file "$DATADIR/treasures"
2909 or die "unable to load treasurelists\n"; 3493 or die "unable to load treasurelists\n";
2910} 3494}
2911 3495
2912sub reload_resources { 3496sub reload_resources {
2913 warn "reloading resource files...\n"; 3497 warn "reloading resource files...\n";
2914 3498
3499 reload_facedata;
3500 reload_archetypes;
2915 reload_regions; 3501 reload_regions;
2916 reload_facedata;
2917 #reload_archetypes;#d#
2918 reload_archetypes;
2919 reload_treasures; 3502 reload_treasures;
2920 3503
2921 warn "finished reloading resource files\n"; 3504 warn "finished reloading resource files\n";
2922} 3505}
2923 3506
2924sub init { 3507sub reload_config {
2925 reload_resources; 3508 warn "reloading config file...\n";
2926}
2927 3509
2928sub cfg_load {
2929 open my $fh, "<:utf8", "$CONFDIR/config" 3510 open my $fh, "<:utf8", "$CONFDIR/config"
2930 or return; 3511 or return;
2931 3512
2932 local $/; 3513 local $/;
2933 *CFG = YAML::Syck::Load <$fh>; 3514 *CFG = YAML::XS::Load scalar <$fh>;
2934 3515
2935 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37]; 3516 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2936 3517
2937 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset}; 3518 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2938 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset}; 3519 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
… …
2942 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()" 3523 $CFG{mlockall} ? eval "mlockall()" : eval "munlockall()"
2943 and die "WARNING: m(un)lockall failed: $!\n"; 3524 and die "WARNING: m(un)lockall failed: $!\n";
2944 }; 3525 };
2945 warn $@ if $@; 3526 warn $@ if $@;
2946 } 3527 }
3528
3529 warn "finished reloading resource files\n";
3530}
3531
3532sub pidfile() {
3533 sysopen my $fh, $PIDFILE, O_RDWR | O_CREAT
3534 or die "$PIDFILE: $!";
3535 flock $fh, &Fcntl::LOCK_EX
3536 or die "$PIDFILE: flock: $!";
3537 $fh
3538}
3539
3540# make sure only one server instance is running at any one time
3541sub atomic {
3542 my $fh = pidfile;
3543
3544 my $pid = <$fh>;
3545 kill 9, $pid if $pid > 0;
3546
3547 seek $fh, 0, 0;
3548 print $fh $$;
3549}
3550
3551sub main_loop {
3552 warn "EV::loop starting\n";
3553 if (1) {
3554 EV::loop;
3555 }
3556 warn "EV::loop returned\n";
3557 goto &main_loop unless $REALLY_UNLOOP;
2947} 3558}
2948 3559
2949sub main { 3560sub main {
3561 cf::init_globals; # initialise logging
3562
3563 LOG llevInfo, "Welcome to Deliantra, v" . VERSION;
3564 LOG llevInfo, "Copyright (C) 2005-2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team.";
3565 LOG llevInfo, "Copyright (C) 1994 Mark Wedel.";
3566 LOG llevInfo, "Copyright (C) 1992 Frank Tore Johansen.";
3567
3568 $Coro::current->prio (Coro::PRIO_MAX); # give the main loop max. priority
3569
2950 # we must not ever block the main coroutine 3570 # we must not ever block the main coroutine
2951 local $Coro::idle = sub { 3571 local $Coro::idle = sub {
2952 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3572 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2953 (async { 3573 (async {
2954 Event::one_event; 3574 $Coro::current->{desc} = "IDLE BUG HANDLER";
3575 EV::loop EV::LOOP_ONESHOT;
2955 })->prio (Coro::PRIO_MAX); 3576 })->prio (Coro::PRIO_MAX);
2956 }; 3577 };
2957 3578
2958 cfg_load; 3579 evthread_start IO::AIO::poll_fileno;
3580
3581 cf::sync_job {
3582 cf::init_experience;
3583 cf::init_anim;
3584 cf::init_attackmess;
3585 cf::init_dynamic;
3586
3587 cf::load_settings;
3588 cf::load_materials;
3589
3590 reload_resources;
3591 reload_config;
2959 db_init; 3592 db_init;
3593
3594 cf::init_uuid;
3595 cf::init_signals;
3596 cf::init_skills;
3597
3598 cf::init_beforeplay;
3599
3600 atomic;
3601
2960 load_extensions; 3602 load_extensions;
2961 3603
2962 $TICK_WATCHER->start; 3604 utime time, time, $RUNTIMEFILE;
2963 Event::loop; 3605
3606 # no (long-running) fork's whatsoever before this point(!)
3607 use POSIX ();
3608 POSIX::close delete $ENV{LOCKUTIL_LOCK_FD} if exists $ENV{LOCKUTIL_LOCK_FD};
3609
3610 (pop @POST_INIT)->(0) while @POST_INIT;
3611 };
3612
3613 cf::object::thawer::errors_are_fatal 0;
3614 warn "parse errors in files are no longer fatal from this point on.\n";
3615
3616 main_loop;
2964} 3617}
2965 3618
2966############################################################################# 3619#############################################################################
2967# initialisation and cleanup 3620# initialisation and cleanup
2968 3621
2969# install some emergency cleanup handlers 3622# install some emergency cleanup handlers
2970BEGIN { 3623BEGIN {
3624 our %SIGWATCHER = ();
2971 for my $signal (qw(INT HUP TERM)) { 3625 for my $signal (qw(INT HUP TERM)) {
2972 Event->signal ( 3626 $SIGWATCHER{$signal} = AE::signal $signal, sub {
2973 reentrant => 0,
2974 data => WF_AUTOCANCEL,
2975 signal => $signal,
2976 prio => 0,
2977 cb => sub {
2978 cf::cleanup "SIG$signal"; 3627 cf::cleanup "SIG$signal";
2979 },
2980 ); 3628 };
2981 } 3629 }
2982} 3630}
2983 3631
2984sub write_runtime { 3632sub write_runtime_sync {
2985 my $runtime = "$LOCALDIR/runtime"; 3633 my $t0 = AE::time;
2986 3634
2987 # first touch the runtime file to show we are still running: 3635 # first touch the runtime file to show we are still running:
2988 # the fsync below can take a very very long time. 3636 # the fsync below can take a very very long time.
2989 3637
2990 IO::AIO::aio_utime $runtime, undef, undef; 3638 IO::AIO::aio_utime $RUNTIMEFILE, undef, undef;
2991 3639
2992 my $guard = cf::lock_acquire "write_runtime"; 3640 my $guard = cf::lock_acquire "write_runtime";
2993 3641
2994 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 3642 my $fh = aio_open "$RUNTIMEFILE~", O_WRONLY | O_CREAT | O_TRUNC, 0644
2995 or return; 3643 or return;
2996 3644
2997 my $value = $cf::RUNTIME + 90 + 10; 3645 my $value = $cf::RUNTIME + 90 + 10;
2998 # 10 is the runtime save interval, for a monotonic clock 3646 # 10 is the runtime save interval, for a monotonic clock
2999 # 60 allows for the watchdog to kill the server. 3647 # 60 allows for the watchdog to kill the server.
… …
3009 aio_utime $fh, undef, undef; 3657 aio_utime $fh, undef, undef;
3010 3658
3011 close $fh 3659 close $fh
3012 or return; 3660 or return;
3013 3661
3014 aio_rename "$runtime~", $runtime 3662 aio_rename "$RUNTIMEFILE~", $RUNTIMEFILE
3015 and return; 3663 and return;
3016 3664
3017 warn "runtime file written.\n"; 3665 warn sprintf "runtime file written (%gs).\n", AE::time - $t0;
3018 3666
3019 1 3667 1
3668}
3669
3670our $uuid_lock;
3671our $uuid_skip;
3672
3673sub write_uuid_sync($) {
3674 $uuid_skip ||= $_[0];
3675
3676 return if $uuid_lock;
3677 local $uuid_lock = 1;
3678
3679 my $uuid = "$LOCALDIR/uuid";
3680
3681 my $fh = aio_open "$uuid~", O_WRONLY | O_CREAT, 0644
3682 or return;
3683
3684 my $value = uuid_seq uuid_cur;
3685
3686 unless ($value) {
3687 warn "cowardly refusing to write zero uuid value!\n";
3688 return;
3689 }
3690
3691 my $value = uuid_str $value + $uuid_skip;
3692 $uuid_skip = 0;
3693
3694 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3695 and return;
3696
3697 # always fsync - this file is important
3698 aio_fsync $fh
3699 and return;
3700
3701 close $fh
3702 or return;
3703
3704 aio_rename "$uuid~", $uuid
3705 and return;
3706
3707 warn "uuid file written ($value).\n";
3708
3709 1
3710
3711}
3712
3713sub write_uuid($$) {
3714 my ($skip, $sync) = @_;
3715
3716 $sync ? write_uuid_sync $skip
3717 : async { write_uuid_sync $skip };
3020} 3718}
3021 3719
3022sub emergency_save() { 3720sub emergency_save() {
3023 my $freeze_guard = cf::freeze_mainloop; 3721 my $freeze_guard = cf::freeze_mainloop;
3024 3722
3025 warn "enter emergency perl save\n"; 3723 warn "emergency_perl_save: enter\n";
3026 3724
3027 cf::sync_job { 3725 cf::sync_job {
3726 # this is a trade-off: we want to be very quick here, so
3727 # save all maps without fsync, and later call a global sync
3728 # (which in turn might be very very slow)
3729 local $USE_FSYNC = 0;
3730
3028 # use a peculiar iteration method to avoid tripping on perl 3731 # use a peculiar iteration method to avoid tripping on perl
3029 # refcount bugs in for. also avoids problems with players 3732 # refcount bugs in for. also avoids problems with players
3030 # and maps saved/destroyed asynchronously. 3733 # and maps saved/destroyed asynchronously.
3031 warn "begin emergency player save\n"; 3734 warn "emergency_perl_save: begin player save\n";
3032 for my $login (keys %cf::PLAYER) { 3735 for my $login (keys %cf::PLAYER) {
3033 my $pl = $cf::PLAYER{$login} or next; 3736 my $pl = $cf::PLAYER{$login} or next;
3034 $pl->valid or next; 3737 $pl->valid or next;
3738 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
3035 $pl->save; 3739 $pl->save;
3036 } 3740 }
3037 warn "end emergency player save\n"; 3741 warn "emergency_perl_save: end player save\n";
3038 3742
3039 warn "begin emergency map save\n"; 3743 warn "emergency_perl_save: begin map save\n";
3040 for my $path (keys %cf::MAP) { 3744 for my $path (keys %cf::MAP) {
3041 my $map = $cf::MAP{$path} or next; 3745 my $map = $cf::MAP{$path} or next;
3042 $map->valid or next; 3746 $map->valid or next;
3043 $map->save; 3747 $map->save;
3044 } 3748 }
3045 warn "end emergency map save\n"; 3749 warn "emergency_perl_save: end map save\n";
3046 3750
3047 warn "begin emergency database checkpoint\n"; 3751 warn "emergency_perl_save: begin database checkpoint\n";
3048 BDB::db_env_txn_checkpoint $DB_ENV; 3752 BDB::db_env_txn_checkpoint $DB_ENV;
3049 warn "end emergency database checkpoint\n"; 3753 warn "emergency_perl_save: end database checkpoint\n";
3754
3755 warn "emergency_perl_save: begin write uuid\n";
3756 write_uuid_sync 1;
3757 warn "emergency_perl_save: end write uuid\n";
3050 }; 3758 };
3051 3759
3760 warn "emergency_perl_save: starting sync()\n";
3761 IO::AIO::aio_sync sub {
3762 warn "emergency_perl_save: finished sync()\n";
3763 };
3764
3052 warn "leave emergency perl save\n"; 3765 warn "emergency_perl_save: leave\n";
3053} 3766}
3054 3767
3055sub post_cleanup { 3768sub post_cleanup {
3056 my ($make_core) = @_; 3769 my ($make_core) = @_;
3057 3770
3058 warn Carp::longmess "post_cleanup backtrace" 3771 warn Carp::longmess "post_cleanup backtrace"
3059 if $make_core; 3772 if $make_core;
3773
3774 my $fh = pidfile;
3775 unlink $PIDFILE if <$fh> == $$;
3776}
3777
3778# a safer delete_package, copied from Symbol
3779sub clear_package($) {
3780 my $pkg = shift;
3781
3782 # expand to full symbol table name if needed
3783 unless ($pkg =~ /^main::.*::$/) {
3784 $pkg = "main$pkg" if $pkg =~ /^::/;
3785 $pkg = "main::$pkg" unless $pkg =~ /^main::/;
3786 $pkg .= '::' unless $pkg =~ /::$/;
3787 }
3788
3789 my($stem, $leaf) = $pkg =~ m/(.*::)(\w+::)$/;
3790 my $stem_symtab = *{$stem}{HASH};
3791
3792 defined $stem_symtab and exists $stem_symtab->{$leaf}
3793 or return;
3794
3795 # clear all symbols
3796 my $leaf_symtab = *{$stem_symtab->{$leaf}}{HASH};
3797 for my $name (keys %$leaf_symtab) {
3798 _gv_clear *{"$pkg$name"};
3799# use PApp::Util; PApp::Util::sv_dump *{"$pkg$name"};
3800 }
3060} 3801}
3061 3802
3062sub do_reload_perl() { 3803sub do_reload_perl() {
3063 # can/must only be called in main 3804 # can/must only be called in main
3064 if ($Coro::current != $Coro::main) { 3805 if (in_main) {
3065 warn "can only reload from main coroutine"; 3806 warn "can only reload from main coroutine";
3066 return; 3807 return;
3067 } 3808 }
3068 3809
3810 return if $RELOAD++;
3811
3812 my $t1 = AE::time;
3813
3814 while ($RELOAD) {
3069 warn "reloading..."; 3815 warn "reloading...";
3070 3816
3071 warn "entering sync_job"; 3817 warn "entering sync_job";
3072 3818
3073 cf::sync_job { 3819 cf::sync_job {
3074 cf::write_runtime; # external watchdog should not bark 3820 cf::write_runtime_sync; # external watchdog should not bark
3075 cf::emergency_save; 3821 cf::emergency_save;
3076 cf::write_runtime; # external watchdog should not bark 3822 cf::write_runtime_sync; # external watchdog should not bark
3077 3823
3078 warn "syncing database to disk"; 3824 warn "syncing database to disk";
3079 BDB::db_env_txn_checkpoint $DB_ENV; 3825 BDB::db_env_txn_checkpoint $DB_ENV;
3080 3826
3081 # if anything goes wrong in here, we should simply crash as we already saved 3827 # if anything goes wrong in here, we should simply crash as we already saved
3082 3828
3083 warn "cancelling all WF_AUTOCANCEL watchers";
3084 for (Event::all_watchers) {
3085 $_->cancel if $_->data & WF_AUTOCANCEL;
3086 }
3087
3088 warn "flushing outstanding aio requests"; 3829 warn "flushing outstanding aio requests";
3089 for (;;) {
3090 BDB::flush;
3091 IO::AIO::flush;
3092 Coro::cede;
3093 last unless IO::AIO::nreqs || BDB::nreqs; 3830 while (IO::AIO::nreqs || BDB::nreqs) {
3094 warn "iterate..."; 3831 Coro::EV::timer_once 0.01; # let the sync_job do it's thing
3095 }
3096
3097 ++$RELOAD;
3098
3099 warn "cancelling all extension coros";
3100 $_->cancel for values %EXT_CORO;
3101 %EXT_CORO = ();
3102
3103 warn "removing commands";
3104 %COMMAND = ();
3105
3106 warn "removing ext/exti commands";
3107 %EXTCMD = ();
3108 %EXTICMD = ();
3109
3110 warn "unloading/nuking all extensions";
3111 for my $pkg (@EXTS) {
3112 warn "... unloading $pkg";
3113
3114 if (my $cb = $pkg->can ("unload")) {
3115 eval {
3116 $cb->($pkg);
3117 1
3118 } or warn "$pkg unloaded, but with errors: $@";
3119 } 3832 }
3120 3833
3121 warn "... nuking $pkg"; 3834 warn "cancelling all extension coros";
3122 Symbol::delete_package $pkg; 3835 $_->cancel for values %EXT_CORO;
3123 } 3836 %EXT_CORO = ();
3124 3837
3125 warn "unloading all perl modules loaded from $LIBDIR"; 3838 warn "removing commands";
3126 while (my ($k, $v) = each %INC) { 3839 %COMMAND = ();
3127 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3128 3840
3841 warn "removing ext/exti commands";
3842 %EXTCMD = ();
3843 %EXTICMD = ();
3844
3845 warn "unloading/nuking all extensions";
3846 for my $pkg (@EXTS) {
3129 warn "... unloading $k"; 3847 warn "... unloading $pkg";
3130 delete $INC{$k};
3131 3848
3132 $k =~ s/\.pm$//;
3133 $k =~ s/\//::/g;
3134
3135 if (my $cb = $k->can ("unload_module")) { 3849 if (my $cb = $pkg->can ("unload")) {
3850 eval {
3136 $cb->(); 3851 $cb->($pkg);
3852 1
3853 } or warn "$pkg unloaded, but with errors: $@";
3854 }
3855
3856 warn "... clearing $pkg";
3857 clear_package $pkg;
3137 } 3858 }
3138 3859
3139 Symbol::delete_package $k; 3860 warn "unloading all perl modules loaded from $LIBDIR";
3861 while (my ($k, $v) = each %INC) {
3862 next unless $v =~ /^\Q$LIBDIR\E\/.*\.pm$/;
3863
3864 warn "... unloading $k";
3865 delete $INC{$k};
3866
3867 $k =~ s/\.pm$//;
3868 $k =~ s/\//::/g;
3869
3870 if (my $cb = $k->can ("unload_module")) {
3871 $cb->();
3872 }
3873
3874 clear_package $k;
3140 } 3875 }
3141 3876
3142 warn "getting rid of safe::, as good as possible"; 3877 warn "getting rid of safe::, as good as possible";
3143 Symbol::delete_package "safe::$_" 3878 clear_package "safe::$_"
3144 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3879 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
3145 3880
3146 warn "unloading cf.pm \"a bit\""; 3881 warn "unloading cf.pm \"a bit\"";
3147 delete $INC{"cf.pm"}; 3882 delete $INC{"cf.pm"};
3148 delete $INC{"cf/pod.pm"}; 3883 delete $INC{"cf/$_.pm"} for @EXTRA_MODULES;
3149 3884
3150 # don't, removes xs symbols, too, 3885 # don't, removes xs symbols, too,
3151 # and global variables created in xs 3886 # and global variables created in xs
3152 #Symbol::delete_package __PACKAGE__; 3887 #clear_package __PACKAGE__;
3153 3888
3154 warn "unload completed, starting to reload now"; 3889 warn "unload completed, starting to reload now";
3155 3890
3156 warn "reloading cf.pm"; 3891 warn "reloading cf.pm";
3157 require cf; 3892 require cf;
3158 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3893 cf::_connect_to_perl_1;
3159 3894
3160 warn "loading config and database again"; 3895 warn "loading config and database again";
3161 cf::cfg_load; 3896 cf::reload_config;
3162 3897
3163 warn "loading extensions"; 3898 warn "loading extensions";
3164 cf::load_extensions; 3899 cf::load_extensions;
3165 3900
3901 if ($REATTACH_ON_RELOAD) {
3166 warn "reattaching attachments to objects/players"; 3902 warn "reattaching attachments to objects/players";
3167 _global_reattach; # objects, sockets 3903 _global_reattach; # objects, sockets
3168 warn "reattaching attachments to maps"; 3904 warn "reattaching attachments to maps";
3169 reattach $_ for values %MAP; 3905 reattach $_ for values %MAP;
3170 warn "reattaching attachments to players"; 3906 warn "reattaching attachments to players";
3171 reattach $_ for values %PLAYER; 3907 reattach $_ for values %PLAYER;
3908 }
3172 3909
3910 warn "running post_init jobs";
3911 (pop @POST_INIT)->(1) while @POST_INIT;
3912
3173 warn "leaving sync_job"; 3913 warn "leaving sync_job";
3174 3914
3175 1 3915 1
3176 } or do { 3916 } or do {
3177 warn $@; 3917 warn $@;
3178 warn "error while reloading, exiting."; 3918 cf::cleanup "error while reloading, exiting.";
3179 exit 1;
3180 }; 3919 };
3181 3920
3182 warn "reloaded"; 3921 warn "reloaded";
3922 --$RELOAD;
3923 }
3924
3925 $t1 = AE::time - $t1;
3926 warn "reload completed in ${t1}s\n";
3183}; 3927};
3184 3928
3185our $RELOAD_WATCHER; # used only during reload 3929our $RELOAD_WATCHER; # used only during reload
3186 3930
3187sub reload_perl() { 3931sub reload_perl() {
3188 # doing reload synchronously and two reloads happen back-to-back, 3932 # doing reload synchronously and two reloads happen back-to-back,
3189 # coro crashes during coro_state_free->destroy here. 3933 # coro crashes during coro_state_free->destroy here.
3190 3934
3191 $RELOAD_WATCHER ||= Event->timer ( 3935 $RELOAD_WATCHER ||= cf::async {
3192 reentrant => 0, 3936 Coro::AIO::aio_wait cache_extensions;
3193 after => 0, 3937
3194 data => WF_AUTOCANCEL, 3938 $RELOAD_WATCHER = AE::timer $TICK * 1.5, 0, sub {
3195 cb => sub {
3196 do_reload_perl; 3939 do_reload_perl;
3197 undef $RELOAD_WATCHER; 3940 undef $RELOAD_WATCHER;
3198 }, 3941 };
3199 ); 3942 };
3200} 3943}
3201 3944
3202register_command "reload" => sub { 3945register_command "reload" => sub {
3203 my ($who, $arg) = @_; 3946 my ($who, $arg) = @_;
3204 3947
3205 if ($who->flag (FLAG_WIZ)) { 3948 if ($who->flag (FLAG_WIZ)) {
3206 $who->message ("reloading server."); 3949 $who->message ("reloading server.");
3950 async {
3951 $Coro::current->{desc} = "perl_reload";
3207 async { reload_perl }; 3952 reload_perl;
3953 };
3208 } 3954 }
3209}; 3955};
3210 3956
3211unshift @INC, $LIBDIR; 3957unshift @INC, $LIBDIR;
3212 3958
… …
3214 3960
3215our @WAIT_FOR_TICK; 3961our @WAIT_FOR_TICK;
3216our @WAIT_FOR_TICK_BEGIN; 3962our @WAIT_FOR_TICK_BEGIN;
3217 3963
3218sub wait_for_tick { 3964sub wait_for_tick {
3219 return unless $TICK_WATCHER->is_active;
3220 return if $Coro::current == $Coro::main; 3965 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3221 3966
3222 my $signal = new Coro::Signal; 3967 my $signal = new Coro::Signal;
3223 push @WAIT_FOR_TICK, $signal; 3968 push @WAIT_FOR_TICK, $signal;
3224 $signal->wait; 3969 $signal->wait;
3225} 3970}
3226 3971
3227sub wait_for_tick_begin { 3972sub wait_for_tick_begin {
3228 return unless $TICK_WATCHER->is_active;
3229 return if $Coro::current == $Coro::main; 3973 return Coro::cede if tick_inhibit || $Coro::current == $Coro::main;
3230 3974
3231 my $signal = new Coro::Signal; 3975 my $signal = new Coro::Signal;
3232 push @WAIT_FOR_TICK_BEGIN, $signal; 3976 push @WAIT_FOR_TICK_BEGIN, $signal;
3233 $signal->wait; 3977 $signal->wait;
3234} 3978}
3235 3979
3236 my $min = 1e6;#d# 3980sub tick {
3237 my $avg = 10;
3238$TICK_WATCHER = Event->timer (
3239 reentrant => 0,
3240 parked => 1,
3241 prio => 0,
3242 at => $NEXT_TICK || $TICK,
3243 data => WF_AUTOCANCEL,
3244 cb => sub {
3245 if ($Coro::current != $Coro::main) { 3981 if ($Coro::current != $Coro::main) {
3246 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3982 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
3247 unless ++$bug_warning > 10; 3983 unless ++$bug_warning > 10;
3248 return; 3984 return;
3249 } 3985 }
3250 3986
3251 $NOW = $tick_start = Event::time;
3252
3253 cf::server_tick; # one server iteration 3987 cf::server_tick; # one server iteration
3254 3988
3255 0 && sync_job {#d# 3989 #for(1..3e6){} AE::now_update; $NOW=AE::now; # generate load #d#
3256 for(1..10) {
3257 my $t = Event::time;
3258 my $map = my $map = new_from_path cf::map "/tmp/x.map"
3259 or die;
3260 3990
3261 $map->width (50); 3991 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3262 $map->height (50); 3992 $NEXT_RUNTIME_WRITE = List::Util::max $NEXT_RUNTIME_WRITE + 10, $NOW + 5.;
3263 $map->alloc; 3993 Coro::async_pool {
3264 $map->_load_objects ("/tmp/x.map", 1); 3994 $Coro::current->{desc} = "runtime saver";
3265 my $t = Event::time - $t; 3995 write_runtime_sync
3266 3996 or warn "ERROR: unable to write runtime file: $!";
3267 #next unless $t < 0.0013;#d#
3268 if ($t < $min) {
3269 $min = $t;
3270 }
3271 $avg = $avg * 0.99 + $t * 0.01;
3272 }
3273 warn "XXXXXXXXXXXXXXXXXX min $min avg $avg\n";#d#
3274 exit 0;
3275 # 2007-05-22 02:33:04.569 min 0.00112509727478027 avg 0.0012259249572477
3276 }; 3997 };
3998 }
3277 3999
3278 $RUNTIME += $TICK;
3279 $NEXT_TICK += $TICK;
3280
3281 if ($NOW >= $NEXT_RUNTIME_WRITE) {
3282 $NEXT_RUNTIME_WRITE = $NOW + 10;
3283 Coro::async_pool {
3284 write_runtime
3285 or warn "ERROR: unable to write runtime file: $!";
3286 };
3287 }
3288
3289# my $AFTER = Event::time;
3290# warn $AFTER - $NOW;#d#
3291
3292 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) { 4000 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
3293 $sig->send; 4001 $sig->send;
3294 } 4002 }
3295 while (my $sig = shift @WAIT_FOR_TICK) { 4003 while (my $sig = shift @WAIT_FOR_TICK) {
3296 $sig->send; 4004 $sig->send;
3297 } 4005 }
3298 4006
3299 $NOW = Event::time; 4007 $LOAD = ($NOW - $TICK_START) / $TICK;
3300
3301 # if we are delayed by four ticks or more, skip them all
3302 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
3303
3304 $TICK_WATCHER->at ($NEXT_TICK);
3305 $TICK_WATCHER->start;
3306
3307 $LOAD = ($NOW - $tick_start) / $TICK;
3308 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25; 4008 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3309 4009
3310 _post_tick; 4010 if (0) {
3311 4011 if ($NEXT_TICK) {
3312 4012 my $jitter = $TICK_START - $NEXT_TICK;
4013 $JITTER = $JITTER * 0.75 + $jitter * 0.25;
4014 warn "jitter $JITTER\n";#d#
4015 }
3313 }, 4016 }
3314); 4017}
3315 4018
3316{ 4019{
3317 BDB::max_poll_time $TICK * 0.1; 4020 # configure BDB
3318 $BDB_POLL_WATCHER = Event->io ( 4021
3319 reentrant => 0,
3320 fd => BDB::poll_fileno,
3321 poll => 'r',
3322 prio => 0,
3323 data => WF_AUTOCANCEL,
3324 cb => \&BDB::poll_cb,
3325 );
3326 BDB::min_parallel 8; 4022 BDB::min_parallel 16;
3327 4023 BDB::max_poll_reqs $TICK * 0.1;
3328 BDB::set_sync_prepare { 4024 $AnyEvent::BDB::WATCHER->priority (1);
3329 my $status;
3330 my $current = $Coro::current;
3331 (
3332 sub {
3333 $status = $!;
3334 $current->ready; undef $current;
3335 },
3336 sub {
3337 Coro::schedule while defined $current;
3338 $! = $status;
3339 },
3340 )
3341 };
3342 4025
3343 unless ($DB_ENV) { 4026 unless ($DB_ENV) {
3344 $DB_ENV = BDB::db_env_create; 4027 $DB_ENV = BDB::db_env_create;
4028 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT);
4029 $DB_ENV->set_flags (&BDB::LOG_AUTOREMOVE ) if BDB::VERSION v0, v4.7;
4030 $DB_ENV->log_set_config (&BDB::LOG_AUTO_REMOVE) if BDB::VERSION v4.7;
4031 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
4032 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
3345 4033
3346 cf::sync_job { 4034 cf::sync_job {
3347 eval { 4035 eval {
3348 BDB::db_env_open 4036 BDB::db_env_open
3349 $DB_ENV, 4037 $DB_ENV,
… …
3351 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 4039 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
3352 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 4040 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
3353 0666; 4041 0666;
3354 4042
3355 cf::cleanup "db_env_open($BDBDIR): $!" if $!; 4043 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
3356
3357 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
3358 $DB_ENV->set_lk_detect;
3359 }; 4044 };
3360 4045
3361 cf::cleanup "db_env_open(db): $@" if $@; 4046 cf::cleanup "db_env_open(db): $@" if $@;
3362 }; 4047 };
3363 } 4048 }
4049
4050 $BDB_DEADLOCK_WATCHER = EV::periodic 0, 3, 0, sub {
4051 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
4052 };
4053 $BDB_CHECKPOINT_WATCHER = EV::periodic 0, 60, 0, sub {
4054 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
4055 };
4056 $BDB_TRICKLE_WATCHER = EV::periodic 0, 10, 0, sub {
4057 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
4058 };
3364} 4059}
3365 4060
3366{ 4061{
4062 # configure IO::AIO
4063
3367 IO::AIO::min_parallel 8; 4064 IO::AIO::min_parallel 8;
3368
3369 undef $Coro::AIO::WATCHER;
3370 IO::AIO::max_poll_time $TICK * 0.1; 4065 IO::AIO::max_poll_time $TICK * 0.1;
3371 $AIO_POLL_WATCHER = Event->io ( 4066 undef $AnyEvent::AIO::WATCHER;
3372 reentrant => 0,
3373 data => WF_AUTOCANCEL,
3374 fd => IO::AIO::poll_fileno,
3375 poll => 'r',
3376 prio => 6,
3377 cb => \&IO::AIO::poll_cb,
3378 );
3379} 4067}
3380 4068
3381my $_log_backtrace; 4069my $_log_backtrace;
3382 4070
3383sub _log_backtrace { 4071sub _log_backtrace {
… …
3386 $msg =~ s/\n//; 4074 $msg =~ s/\n//;
3387 4075
3388 # limit the # of concurrent backtraces 4076 # limit the # of concurrent backtraces
3389 if ($_log_backtrace < 2) { 4077 if ($_log_backtrace < 2) {
3390 ++$_log_backtrace; 4078 ++$_log_backtrace;
4079 my $perl_bt = Carp::longmess $msg;
3391 async { 4080 async {
4081 $Coro::current->{desc} = "abt $msg";
4082
3392 my @bt = fork_call { 4083 my @bt = fork_call {
3393 @addr = map { sprintf "%x", $_ } @addr; 4084 @addr = map { sprintf "%x", $_ } @addr;
3394 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X; 4085 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3395 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |" 4086 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3396 or die "addr2line: $!"; 4087 or die "addr2line: $!";
… …
3404 } 4095 }
3405 4096
3406 @funcs 4097 @funcs
3407 }; 4098 };
3408 4099
3409 LOG llevInfo, "[ABT] $msg\n"; 4100 LOG llevInfo, "[ABT] $perl_bt\n";
4101 LOG llevInfo, "[ABT] --- C backtrace follows ---\n";
3410 LOG llevInfo, "[ABT] $_\n" for @bt; 4102 LOG llevInfo, "[ABT] $_\n" for @bt;
3411 --$_log_backtrace; 4103 --$_log_backtrace;
3412 }; 4104 };
3413 } else { 4105 } else {
3414 LOG llevInfo, "[ABT] $msg\n"; 4106 LOG llevInfo, "[ABT] $msg\n";
3415 LOG llevInfo, "[ABT] [suppressed]\n"; 4107 LOG llevInfo, "[ABT] [suppressed]\n";
3416 } 4108 }
3417} 4109}
3418 4110
3419# load additional modules 4111# load additional modules
3420use cf::pod; 4112require "cf/$_.pm" for @EXTRA_MODULES;
4113cf::_connect_to_perl_2;
3421 4114
3422END { cf::emergency_save } 4115END { cf::emergency_save }
3423 4116
34241 41171
3425 4118

Diff Legend

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