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.226 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.391 by root, Fri Oct 26 04:22:05 2007 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Symbol; 6use Symbol;
7use List::Util; 7use List::Util;
8use Storable; 8use Socket;
9use Event; 9use Event;
10use Opcode; 10use Opcode;
11use Safe; 11use Safe;
12use Safe::Hole; 12use Safe::Hole;
13use Storable ();
13 14
14use Coro 3.52 (); 15use Coro 4.1 ();
15use Coro::State; 16use Coro::State;
17use Coro::Handle;
16use Coro::Event; 18use Coro::Event;
17use Coro::Timer; 19use Coro::Timer;
18use Coro::Signal; 20use Coro::Signal;
19use Coro::Semaphore; 21use Coro::Semaphore;
20use Coro::AIO; 22use Coro::AIO;
23use Coro::Storable;
24use Coro::Util ();
21 25
26use JSON::XS ();
22use BDB (); 27use BDB ();
23use Data::Dumper; 28use Data::Dumper;
24use Digest::MD5; 29use Digest::MD5;
25use Fcntl; 30use Fcntl;
26use IO::AIO 2.32 ();
27use YAML::Syck (); 31use YAML::Syck ();
32use IO::AIO 2.51 ();
28use Time::HiRes; 33use Time::HiRes;
29use Compress::LZF; 34use Compress::LZF;
35use Digest::MD5 ();
30 36
37# configure various modules to our taste
38#
39$Storable::canonical = 1; # reduce rsync transfers
31Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator 40Coro::State::cctx_stacksize 256000; # 1-2MB stack, for deep recursions in maze generator
32Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later 41Compress::LZF::sfreeze_cr { }; # prime Compress::LZF so it does not use require later
42
33$Event::Eval = 1; # no idea why this is required, but it is 43$Event::Eval = 1; # no idea why this is required, but it is
34
35sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
36 44
37# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 45# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
38$YAML::Syck::ImplicitUnicode = 1; 46$YAML::Syck::ImplicitUnicode = 1;
39 47
40$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority 48$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
41 49
50sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
51
42our %COMMAND = (); 52our %COMMAND = ();
43our %COMMAND_TIME = (); 53our %COMMAND_TIME = ();
44 54
45our @EXTS = (); # list of extension package names 55our @EXTS = (); # list of extension package names
46our %EXTCMD = (); 56our %EXTCMD = ();
57our %EXTICMD = ();
47our %EXT_CORO = (); # coroutines bound to extensions 58our %EXT_CORO = (); # coroutines bound to extensions
48our %EXT_MAP = (); # pluggable maps 59our %EXT_MAP = (); # pluggable maps
49 60
50our $RELOAD; # number of reloads so far 61our $RELOAD; # number of reloads so far
51our @EVENT; 62our @EVENT;
52our $LIBDIR = datadir . "/ext";
53 63
54our $TICK = MAX_TIME * 1e-6; 64our $CONFDIR = confdir;
65our $DATADIR = datadir;
66our $LIBDIR = "$DATADIR/ext";
67our $PODDIR = "$DATADIR/pod";
68our $MAPDIR = "$DATADIR/" . mapdir;
69our $LOCALDIR = localdir;
70our $TMPDIR = "$LOCALDIR/" . tmpdir;
71our $UNIQUEDIR = "$LOCALDIR/" . uniquedir;
72our $PLAYERDIR = "$LOCALDIR/" . playerdir;
73our $RANDOMDIR = "$LOCALDIR/random";
74our $BDBDIR = "$LOCALDIR/db";
75
76our $TICK = MAX_TIME * 1e-6; # this is a CONSTANT(!)
55our $TICK_WATCHER; 77our $TICK_WATCHER;
56our $AIO_POLL_WATCHER; 78our $AIO_POLL_WATCHER;
57our $NEXT_RUNTIME_WRITE; # when should the runtime file be written 79our $NEXT_RUNTIME_WRITE; # when should the runtime file be written
58our $NEXT_TICK; 80our $NEXT_TICK;
59our $NOW; 81our $NOW;
60our $USE_FSYNC = 1; # use fsync to write maps - default off 82our $USE_FSYNC = 1; # use fsync to write maps - default off
61 83
62our $BDB_POLL_WATCHER; 84our $BDB_POLL_WATCHER;
85our $BDB_DEADLOCK_WATCHER;
86our $BDB_CHECKPOINT_WATCHER;
87our $BDB_TRICKLE_WATCHER;
63our $DB_ENV; 88our $DB_ENV;
64 89
65our %CFG; 90our %CFG;
66 91
67our $UPTIME; $UPTIME ||= time; 92our $UPTIME; $UPTIME ||= time;
68our $RUNTIME; 93our $RUNTIME;
69 94
70our %PLAYER; # all users 95our (%PLAYER, %PLAYER_LOADING); # all users
71our %MAP; # all maps 96our (%MAP, %MAP_LOADING ); # all maps
72our $LINK_MAP; # the special {link} map, which is always available 97our $LINK_MAP; # the special {link} map, which is always available
73our $RANDOM_MAPS = cf::localdir . "/random";
74our $BDB_ENV_DIR = cf::localdir . "/db";
75
76our $WAIT_FOR_TICK; $WAIT_FOR_TICK ||= new Coro::Signal;
77our $WAIT_FOR_TICK_ONE; $WAIT_FOR_TICK_ONE ||= new Coro::Signal;
78 98
79# used to convert map paths into valid unix filenames by replacing / by ∕ 99# used to convert map paths into valid unix filenames by replacing / by ∕
80our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons 100our $PATH_SEP = "∕"; # U+2215, chosen purely for visual reasons
81 101
102our $LOAD; # a number between 0 (idle) and 1 (too many objects)
103our $LOADAVG; # same thing, but with alpha-smoothing
104our $tick_start; # for load detecting purposes
105
82binmode STDOUT; 106binmode STDOUT;
83binmode STDERR; 107binmode STDERR;
84 108
85# read virtual server time, if available 109# read virtual server time, if available
86unless ($RUNTIME || !-e cf::localdir . "/runtime") { 110unless ($RUNTIME || !-e "$LOCALDIR/runtime") {
87 open my $fh, "<", cf::localdir . "/runtime" 111 open my $fh, "<", "$LOCALDIR/runtime"
88 or die "unable to read runtime file: $!"; 112 or die "unable to read runtime file: $!";
89 $RUNTIME = <$fh> + 0.; 113 $RUNTIME = <$fh> + 0.;
90} 114}
91 115
92mkdir cf::localdir; 116mkdir $_
93mkdir cf::localdir . "/" . cf::playerdir; 117 for $LOCALDIR, $TMPDIR, $UNIQUEDIR, $PLAYERDIR, $RANDOMDIR, $BDBDIR;
94mkdir cf::localdir . "/" . cf::tmpdir;
95mkdir cf::localdir . "/" . cf::uniquedir;
96mkdir $RANDOM_MAPS;
97mkdir $BDB_ENV_DIR;
98 118
99our $EMERGENCY_POSITION; 119our $EMERGENCY_POSITION;
100 120
101sub cf::map::normalise; 121sub cf::map::normalise;
102 122
… …
113=item $cf::RUNTIME 133=item $cf::RUNTIME
114 134
115The time this server has run, starts at 0 and is increased by $cf::TICK on 135The time this server has run, starts at 0 and is increased by $cf::TICK on
116every server tick. 136every server tick.
117 137
118=item $cf::LIBDIR 138=item $cf::CONFDIR $cf::DATADIR $cf::LIBDIR $cf::PODDIR
139$cf::MAPDIR $cf::LOCALDIR $cf::TMPDIR $cf::UNIQUEDIR
140$cf::PLAYERDIR $cf::RANDOMDIR $cf::BDBDIR
119 141
120The perl library directory, where extensions and cf-specific modules can 142Various directories - "/etc", read-only install directory, perl-library
121be found. It will be added to C<@INC> automatically. 143directory, pod-directory, read-only maps directory, "/var", "/var/tmp",
144unique-items directory, player file directory, random maps directory and
145database environment.
122 146
123=item $cf::NOW 147=item $cf::NOW
124 148
125The time of the last (current) server tick. 149The time of the last (current) server tick.
126 150
127=item $cf::TICK 151=item $cf::TICK
128 152
129The interval between server ticks, in seconds. 153The interval between server ticks, in seconds.
154
155=item $cf::LOADAVG
156
157The current CPU load on the server (alpha-smoothed), as a value between 0
158(none) and 1 (overloaded), indicating how much time is spent on processing
159objects per tick. Healthy values are < 0.5.
160
161=item $cf::LOAD
162
163The raw value load value from the last tick.
130 164
131=item %cf::CFG 165=item %cf::CFG
132 166
133Configuration for the server, loaded from C</etc/crossfire/config>, or 167Configuration for the server, loaded from C</etc/crossfire/config>, or
134from wherever your confdir points to. 168from wherever your confdir points to.
135 169
136=item $cf::WAIT_FOR_TICK, $cf::WAIT_FOR_TICK_ONE 170=item cf::wait_for_tick, cf::wait_for_tick_begin
137 171
138These are Coro::Signal objects that are C<< ->broadcast >> (WAIT_FOR_TICK) 172These are functions that inhibit the current coroutine one tick. cf::wait_for_tick_begin only
139or C<< ->send >> (WAIT_FOR_TICK_ONE) on after normal server tick 173returns directly I<after> the tick processing (and consequently, can only wake one process
140processing has been done. Call C<< ->wait >> on them to maximise the 174per tick), while cf::wait_for_tick wakes up all waiters after tick processing.
141window of cpu time available, or simply to synchronise to the server tick. 175
176=item @cf::INVOKE_RESULTS
177
178This array contains the results of the last C<invoke ()> call. When
179C<cf::override> is called C<@cf::INVOKE_RESULTS> is set to the parameters of
180that call.
142 181
143=back 182=back
144 183
145=cut 184=cut
146 185
147BEGIN { 186BEGIN {
148 *CORE::GLOBAL::warn = sub { 187 *CORE::GLOBAL::warn = sub {
149 my $msg = join "", @_; 188 my $msg = join "", @_;
150 utf8::encode $msg;
151 189
152 $msg .= "\n" 190 $msg .= "\n"
153 unless $msg =~ /\n$/; 191 unless $msg =~ /\n$/;
192
193 $msg =~ s/([\x00-\x08\x0b-\x1f])/sprintf "\\x%02x", ord $1/ge;
154 194
155 LOG llevError, $msg; 195 LOG llevError, $msg;
156 }; 196 };
157} 197}
158 198
159@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 199@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
160@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 200@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
161@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable'; 201@safe::cf::player::ISA = @cf::player::ISA = 'cf::attachable';
162@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable'; 202@safe::cf::client::ISA = @cf::client::ISA = 'cf::attachable';
163@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable'; 203@safe::cf::map::ISA = @cf::map::ISA = 'cf::attachable';
204@safe::cf::arch::ISA = @cf::arch::ISA = 'cf::object';
164@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; 205@safe::cf::object::player::ISA = @cf::object::player::ISA = 'cf::object'; # not really true (yet)
165 206
166# we bless all objects into (empty) derived classes to force a method lookup 207# we bless all objects into (empty) derived classes to force a method lookup
167# within the Safe compartment. 208# within the Safe compartment.
168for my $pkg (qw( 209for my $pkg (qw(
169 cf::global cf::attachable 210 cf::global cf::attachable
… …
177} 218}
178 219
179$Event::DIED = sub { 220$Event::DIED = sub {
180 warn "error in event callback: @_"; 221 warn "error in event callback: @_";
181}; 222};
223
224#############################################################################
182 225
183=head2 UTILITY FUNCTIONS 226=head2 UTILITY FUNCTIONS
184 227
185=over 4 228=over 4
186 229
… …
205 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge; 248 $d =~ s/([\x00-\x07\x09\x0b\x0c\x0e-\x1f])/sprintf "\\x%02x", ord($1)/ge;
206 $d 249 $d
207 } || "[unable to dump $_[0]: '$@']"; 250 } || "[unable to dump $_[0]: '$@']";
208} 251}
209 252
210use JSON::Syck (); # TODO# replace by JSON::PC once working
211
212=item $ref = cf::from_json $json 253=item $ref = cf::from_json $json
213 254
214Converts a JSON string into the corresponding perl data structure. 255Converts a JSON string into the corresponding perl data structure.
215 256
216=cut
217
218sub from_json($) {
219 $JSON::Syck::ImplicitUnicode = 1; # work around JSON::Syck bugs
220 JSON::Syck::Load $_[0]
221}
222
223=item $json = cf::to_json $ref 257=item $json = cf::to_json $ref
224 258
225Converts a perl data structure into its JSON representation. 259Converts a perl data structure into its JSON representation.
226 260
227=cut 261=cut
228 262
229sub to_json($) { 263our $json_coder = JSON::XS->new->utf8->max_size (1e6); # accept ~1mb max
230 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 264
231 JSON::Syck::Dump $_[0] 265sub to_json ($) { $json_coder->encode ($_[0]) }
232} 266sub from_json ($) { $json_coder->decode ($_[0]) }
233 267
234=item cf::lock_wait $string 268=item cf::lock_wait $string
235 269
236Wait until the given lock is available. See cf::lock_acquire. 270Wait until the given lock is available. See cf::lock_acquire.
237 271
… …
240Wait until the given lock is available and then acquires it and returns 274Wait until the given lock is available and then acquires it and returns
241a Coro::guard object. If the guard object gets destroyed (goes out of scope, 275a Coro::guard object. If the guard object gets destroyed (goes out of scope,
242for example when the coroutine gets canceled), the lock is automatically 276for example when the coroutine gets canceled), the lock is automatically
243returned. 277returned.
244 278
279Locks are *not* recursive, locking from the same coro twice results in a
280deadlocked coro.
281
245Lock names should begin with a unique identifier (for example, cf::map::find 282Lock names should begin with a unique identifier (for example, cf::map::find
246uses map_find and cf::map::load uses map_load). 283uses map_find and cf::map::load uses map_load).
247 284
285=item $locked = cf::lock_active $string
286
287Return true if the lock is currently active, i.e. somebody has locked it.
288
248=cut 289=cut
249 290
250our %LOCK; 291our %LOCK;
292our %LOCKER;#d#
251 293
252sub lock_wait($) { 294sub lock_wait($) {
253 my ($key) = @_; 295 my ($key) = @_;
296
297 if ($LOCKER{$key} == $Coro::current) {#d#
298 Carp::cluck "lock_wait($key) for already-acquired lock";#d#
299 return;#d#
300 }#d#
254 301
255 # wait for lock, if any 302 # wait for lock, if any
256 while ($LOCK{$key}) { 303 while ($LOCK{$key}) {
257 push @{ $LOCK{$key} }, $Coro::current; 304 push @{ $LOCK{$key} }, $Coro::current;
258 Coro::schedule; 305 Coro::schedule;
… …
264 311
265 # wait, to be sure we are not locked 312 # wait, to be sure we are not locked
266 lock_wait $key; 313 lock_wait $key;
267 314
268 $LOCK{$key} = []; 315 $LOCK{$key} = [];
316 $LOCKER{$key} = $Coro::current;#d#
269 317
270 Coro::guard { 318 Coro::guard {
319 delete $LOCKER{$key};#d#
271 # wake up all waiters, to be on the safe side 320 # wake up all waiters, to be on the safe side
272 $_->ready for @{ delete $LOCK{$key} }; 321 $_->ready for @{ delete $LOCK{$key} };
273 } 322 }
323}
324
325sub lock_active($) {
326 my ($key) = @_;
327
328 ! ! $LOCK{$key}
274} 329}
275 330
276sub freeze_mainloop { 331sub freeze_mainloop {
277 return unless $TICK_WATCHER->is_active; 332 return unless $TICK_WATCHER->is_active;
278 333
… …
281 }; 336 };
282 $TICK_WATCHER->stop; 337 $TICK_WATCHER->stop;
283 $guard 338 $guard
284} 339}
285 340
341=item cf::get_slot $time[, $priority[, $name]]
342
343Allocate $time seconds of blocking CPU time at priority C<$priority>:
344This call blocks and returns only when you have at least C<$time> seconds
345of cpu time till the next tick. The slot is only valid till the next cede.
346
347The optional C<$name> can be used to identify the job to run. It might be
348used for statistical purposes and should identify the same time-class.
349
350Useful for short background jobs.
351
352=cut
353
354our @SLOT_QUEUE;
355our $SLOT_QUEUE;
356
357$SLOT_QUEUE->cancel if $SLOT_QUEUE;
358$SLOT_QUEUE = Coro::async {
359 $Coro::current->desc ("timeslot manager");
360
361 my $signal = new Coro::Signal;
362
363 while () {
364 next_job:
365 my $avail = cf::till_tick;
366 if ($avail > 0.01) {
367 for (0 .. $#SLOT_QUEUE) {
368 if ($SLOT_QUEUE[$_][0] < $avail) {
369 my $job = splice @SLOT_QUEUE, $_, 1, ();
370 $job->[2]->send;
371 Coro::cede;
372 goto next_job;
373 }
374 }
375 }
376
377 if (@SLOT_QUEUE) {
378 # we do not use wait_for_tick() as it returns immediately when tick is inactive
379 push @cf::WAIT_FOR_TICK, $signal;
380 $signal->wait;
381 } else {
382 Coro::schedule;
383 }
384 }
385};
386
387sub get_slot($;$$) {
388 my ($time, $pri, $name) = @_;
389
390 $time = $TICK * .6 if $time > $TICK * .6;
391 my $sig = new Coro::Signal;
392
393 push @SLOT_QUEUE, [$time, $pri, $sig, $name];
394 @SLOT_QUEUE = sort { $b->[1] <=> $a->[1] } @SLOT_QUEUE;
395 $SLOT_QUEUE->ready;
396 $sig->wait;
397}
398
286=item cf::async { BLOCK } 399=item cf::async { BLOCK }
287 400
288Currently the same as Coro::async_pool, meaning you cannot use 401Currently the same as Coro::async_pool, meaning you cannot use
289C<on_destroy>, C<join> or other gimmicks on these coroutines. The only 402C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
290thing you are allowed to do is call C<prio> on it. 403thing you are allowed to do is call C<prio> on it.
… …
293 406
294BEGIN { *async = \&Coro::async_pool } 407BEGIN { *async = \&Coro::async_pool }
295 408
296=item cf::sync_job { BLOCK } 409=item cf::sync_job { BLOCK }
297 410
298The design of crossfire+ requires that the main coro ($Coro::main) is 411The design of Crossfire TRT requires that the main coroutine ($Coro::main)
299always able to handle events or runnable, as crossfire+ is only partly 412is always able to handle events or runnable, as Crossfire TRT is only
300reentrant. Thus "blocking" it by e.g. waiting for I/O is not acceptable. 413partly reentrant. Thus "blocking" it by e.g. waiting for I/O is not
414acceptable.
301 415
302If it must be done, put the blocking parts into C<sync_job>. This will run 416If it must be done, put the blocking parts into C<sync_job>. This will run
303the given BLOCK in another coroutine while waiting for the result. The 417the given BLOCK in another coroutine while waiting for the result. The
304server will be frozen during this time, so the block should either finish 418server will be frozen during this time, so the block should either finish
305fast or be very important. 419fast or be very important.
… …
308 422
309sub sync_job(&) { 423sub sync_job(&) {
310 my ($job) = @_; 424 my ($job) = @_;
311 425
312 if ($Coro::current == $Coro::main) { 426 if ($Coro::current == $Coro::main) {
427 my $time = Event::time;
428
313 # this is the main coro, too bad, we have to block 429 # this is the main coro, too bad, we have to block
314 # till the operation succeeds, freezing the server :/ 430 # till the operation succeeds, freezing the server :/
315 431
432 LOG llevError, Carp::longmess "sync job";#d#
433
316 # TODO: use suspend/resume instead 434 # TODO: use suspend/resume instead
317 # (but this is cancel-safe) 435 # (but this is cancel-safe)
318 my $freeze_guard = freeze_mainloop; 436 my $freeze_guard = freeze_mainloop;
319 437
320 my $busy = 1; 438 my $busy = 1;
321 my @res; 439 my @res;
322 440
323 (async { 441 (async {
442 $Coro::current->desc ("sync job coro");
324 @res = eval { $job->() }; 443 @res = eval { $job->() };
325 warn $@ if $@; 444 warn $@ if $@;
326 undef $busy; 445 undef $busy;
327 })->prio (Coro::PRIO_MAX); 446 })->prio (Coro::PRIO_MAX);
328 447
329 while ($busy) { 448 while ($busy) {
449 if (Coro::nready) {
450 Coro::cede_notself;
451 } else {
330 Coro::cede or Event::one_event; 452 Event::one_event;
331 } 453 }
454 }
455
456 $time = Event::time - $time;
457
458 LOG llevError | logBacktrace, Carp::longmess "long sync job"
459 if $time > $TICK * 0.5 && $TICK_WATCHER->is_active;
460
461 $tick_start += $time; # do not account sync jobs to server load
332 462
333 wantarray ? @res : $res[0] 463 wantarray ? @res : $res[0]
334 } else { 464 } else {
335 # we are in another coroutine, how wonderful, everything just works 465 # we are in another coroutine, how wonderful, everything just works
336 466
… …
356 $EXT_CORO{$coro+0} = $coro; 486 $EXT_CORO{$coro+0} = $coro;
357 487
358 $coro 488 $coro
359} 489}
360 490
361sub write_runtime { 491=item fork_call { }, $args
362 my $guard = cf::lock_acquire "write_runtime";
363 492
364 my $runtime = cf::localdir . "/runtime"; 493Executes the given code block with the given arguments in a seperate
494process, returning the results. Everything must be serialisable with
495Coro::Storable. May, of course, block. Note that the executed sub may
496never block itself or use any form of Event handling.
365 497
366 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644 498=cut
367 or return;
368 499
369 my $value = $cf::RUNTIME + 90 + 10; 500sub fork_call(&@) {
370 # 10 is the runtime save interval, for a monotonic clock 501 my ($cb, @args) = @_;
371 # 60 allows for the watchdog to kill the server.
372 502
373 (aio_write $fh, 0, (length $value), $value, 0) <= 0 503 # we seemingly have to make a local copy of the whole thing,
374 and return; 504 # otherwise perl prematurely frees the stuff :/
505 # TODO: investigate and fix (likely this will be rather laborious)
375 506
376 # always fsync - this file is important 507 my @res = Coro::Util::fork_eval {
377 aio_fsync $fh 508 reset_signals;
378 and return; 509 &$cb
510 }, @args;
379 511
380 close $fh 512 wantarray ? @res : $res[-1]
381 or return; 513}
382 514
383 aio_rename "$runtime~", $runtime 515=item $value = cf::db_get $family => $key
384 and return;
385 516
517Returns a single value from the environment database.
518
519=item cf::db_put $family => $key => $value
520
521Stores the given C<$value> in the family. It can currently store binary
522data only (use Compress::LZF::sfreeze_cr/sthaw to convert to/from binary).
523
524=item $db = cf::db_table "name"
525
526Create and/or open a new database table. The string must not be "db" and must be unique
527within each server.
528
529=cut
530
531sub db_table($) {
532 my ($name) = @_;
533 my $db = BDB::db_create $DB_ENV;
534
535 eval {
536 $db->set_flags (BDB::CHKSUM);
537
538 utf8::encode $name;
539 BDB::db_open $db, undef, $name, undef, BDB::BTREE,
540 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
541 cf::cleanup "db_open(db): $!" if $!;
542 };
543 cf::cleanup "db_open(db): $@" if $@;
544
545 $db
546}
547
548our $DB;
549
550sub db_init {
551 cf::sync_job {
552 $DB ||= db_table "db";
553 };
554}
555
556sub db_get($$) {
557 my $key = "$_[0]/$_[1]";
558
559 cf::sync_job {
560 BDB::db_get $DB, undef, $key, my $data;
561
562 $! ? ()
563 : $data
386 1 564 }
565}
566
567sub db_put($$$) {
568 BDB::dbreq_pri 4;
569 BDB::db_put $DB, undef, "$_[0]/$_[1]", $_[2], 0, sub { };
570}
571
572=item cf::cache $id => [$paths...], $processversion => $process
573
574Generic caching function that returns the value of the resource $id,
575caching and regenerating as required.
576
577This function can block.
578
579=cut
580
581sub cache {
582 my ($id, $src, $processversion, $process) = @_;
583
584 my $meta =
585 join "\x00",
586 $processversion,
587 map {
588 aio_stat $_
589 and Carp::croak "$_: $!";
590
591 ($_, (stat _)[7,9])
592 } @$src;
593
594 my $dbmeta = db_get cache => "$id/meta";
595 if ($dbmeta ne $meta) {
596 # changed, we may need to process
597
598 my @data;
599 my $md5;
600
601 for (0 .. $#$src) {
602 0 <= aio_load $src->[$_], $data[$_]
603 or Carp::croak "$src->[$_]: $!";
604 }
605
606 # if processing is expensive, check
607 # checksum first
608 if (1) {
609 $md5 =
610 join "\x00",
611 $processversion,
612 map {
613 cf::cede_to_tick;
614 ($src->[$_], Digest::MD5::md5_hex $data[$_])
615 } 0.. $#$src;
616
617
618 my $dbmd5 = db_get cache => "$id/md5";
619 if ($dbmd5 eq $md5) {
620 db_put cache => "$id/meta", $meta;
621
622 return db_get cache => "$id/data";
623 }
624 }
625
626 my $t1 = Time::HiRes::time;
627 my $data = $process->(\@data);
628 my $t2 = Time::HiRes::time;
629
630 warn "cache: '$id' processed in ", $t2 - $t1, "s\n";
631
632 db_put cache => "$id/data", $data;
633 db_put cache => "$id/md5" , $md5;
634 db_put cache => "$id/meta", $meta;
635
636 return $data;
637 }
638
639 db_get cache => "$id/data"
640}
641
642=item cf::datalog type => key => value, ...
643
644Log a datalog packet of the given type with the given key-value pairs.
645
646=cut
647
648sub datalog($@) {
649 my ($type, %kv) = @_;
650 warn "DATALOG ", JSON::XS->new->ascii->encode ({ %kv, type => $type });
387} 651}
388 652
389=back 653=back
390 654
391=cut 655=cut
… …
398attach callbacks/event handlers (a collection of which is called an "attachment") 662attach callbacks/event handlers (a collection of which is called an "attachment")
399to it. All such attachable objects support the following methods. 663to it. All such attachable objects support the following methods.
400 664
401In the following description, CLASS can be any of C<global>, C<object> 665In the following description, CLASS can be any of C<global>, C<object>
402C<player>, C<client> or C<map> (i.e. the attachable objects in 666C<player>, C<client> or C<map> (i.e. the attachable objects in
403crossfire+). 667Crossfire TRT).
404 668
405=over 4 669=over 4
406 670
407=item $attachable->attach ($attachment, key => $value...) 671=item $attachable->attach ($attachment, key => $value...)
408 672
… …
571 $registry = $CB_TYPE[$object_type] ||= []; 835 $registry = $CB_TYPE[$object_type] ||= [];
572 836
573 } elsif ($type eq "subtype") { 837 } elsif ($type eq "subtype") {
574 defined $object_type or Carp::croak "subtype specified without type"; 838 defined $object_type or Carp::croak "subtype specified without type";
575 my $object_subtype = shift @arg; 839 my $object_subtype = shift @arg;
576 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_SUBTYPES] ||= []; 840 $registry = $CB_TYPE[$object_type + $object_subtype * NUM_TYPES] ||= [];
577 841
578 } elsif ($type eq "package") { 842 } elsif ($type eq "package") {
579 my $pkg = shift @arg; 843 my $pkg = shift @arg;
580 844
581 while (my ($name, $id) = each %cb_id) { 845 while (my ($name, $id) = each %cb_id) {
… …
610 _attach $registry, $klass, @attach; 874 _attach $registry, $klass, @attach;
611 } 875 }
612 876
613 $obj->{$name} = \%arg; 877 $obj->{$name} = \%arg;
614 } else { 878 } else {
615 warn "object uses attachment '$name' that is not available, postponing.\n"; 879 warn "object uses attachment '$name' which is not available, postponing.\n";
616 } 880 }
617 881
618 $obj->{_attachment}{$name} = undef; 882 $obj->{_attachment}{$name} = undef;
619} 883}
620 884
… …
622 if (ref $_[0]) { 886 if (ref $_[0]) {
623 _object_attach @_; 887 _object_attach @_;
624 } else { 888 } else {
625 _attach shift->_attach_registry, @_; 889 _attach shift->_attach_registry, @_;
626 } 890 }
891 _recalc_want;
627}; 892};
628 893
629# all those should be optimised 894# all those should be optimised
630sub cf::attachable::detach { 895sub cf::attachable::detach {
631 my ($obj, $name) = @_; 896 my ($obj, $name) = @_;
… …
634 delete $obj->{_attachment}{$name}; 899 delete $obj->{_attachment}{$name};
635 reattach ($obj); 900 reattach ($obj);
636 } else { 901 } else {
637 Carp::croak "cannot, currently, detach class attachments"; 902 Carp::croak "cannot, currently, detach class attachments";
638 } 903 }
904 _recalc_want;
639}; 905};
640 906
641sub cf::attachable::attached { 907sub cf::attachable::attached {
642 my ($obj, $name) = @_; 908 my ($obj, $name) = @_;
643 909
… …
658 "; 924 ";
659 die if $@; 925 die if $@;
660} 926}
661 927
662our $override; 928our $override;
663our @invoke_results = (); # referenced from .xs code. TODO: play tricks with reify and mortals? 929our @INVOKE_RESULTS = (); # referenced from .xs code. TODO: play tricks with reify and mortals?
664 930
665sub override { 931sub override {
666 $override = 1; 932 $override = 1;
667 @invoke_results = (); 933 @INVOKE_RESULTS = (@_);
668} 934}
669 935
670sub do_invoke { 936sub do_invoke {
671 my $event = shift; 937 my $event = shift;
672 my $callbacks = shift; 938 my $callbacks = shift;
673 939
674 @invoke_results = (); 940 @INVOKE_RESULTS = ();
675 941
676 local $override; 942 local $override;
677 943
678 for (@$callbacks) { 944 for (@$callbacks) {
679 eval { &{$_->[1]} }; 945 eval { &{$_->[1]} };
… …
696 962
697Generate an object-specific event with the given arguments. 963Generate an object-specific event with the given arguments.
698 964
699This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be 965This API is preliminary (most likely, the EVENT_CLASS_xxx prefix will be
700removed in future versions), and there is no public API to access override 966removed in future versions), and there is no public API to access override
701results (if you must, access C<@cf::invoke_results> directly). 967results (if you must, access C<@cf::INVOKE_RESULTS> directly).
702 968
703=back 969=back
704 970
705=cut 971=cut
706 972
707############################################################################# 973#############################################################################
708# object support 974# object support
975
976sub _object_equal($$);
977sub _object_equal($$) {
978 my ($a, $b) = @_;
979
980 return 0 unless (ref $a) eq (ref $b);
981
982 if ("HASH" eq ref $a) {
983 my @ka = keys %$a;
984 my @kb = keys %$b;
985
986 return 0 if @ka != @kb;
987
988 for (0 .. $#ka) {
989 return 0 unless $ka[$_] eq $kb[$_];
990 return 0 unless _object_equal $a->{$ka[$_]}, $b->{$kb[$_]};
991 }
992
993 } elsif ("ARRAY" eq ref $a) {
994
995 return 0 if @$a != @$b;
996
997 for (0 .. $#$a) {
998 return 0 unless _object_equal $a->[$_], $b->[$_];
999 }
1000
1001 } elsif ($a ne $b) {
1002 return 0;
1003 }
1004
1005 1
1006}
1007
1008our $SLOW_MERGES;#d#
1009sub _can_merge {
1010 my ($ob1, $ob2) = @_;
1011
1012 ++$SLOW_MERGES;#d#
1013
1014 # we do the slow way here
1015 return _object_equal $ob1, $ob2
1016}
709 1017
710sub reattach { 1018sub reattach {
711 # basically do the same as instantiate, without calling instantiate 1019 # basically do the same as instantiate, without calling instantiate
712 my ($obj) = @_; 1020 my ($obj) = @_;
713 1021
… …
760sub object_freezer_save { 1068sub object_freezer_save {
761 my ($filename, $rdata, $objs) = @_; 1069 my ($filename, $rdata, $objs) = @_;
762 1070
763 sync_job { 1071 sync_job {
764 if (length $$rdata) { 1072 if (length $$rdata) {
1073 utf8::decode (my $decname = $filename);
765 warn sprintf "saving %s (%d,%d)\n", 1074 warn sprintf "saving %s (%d,%d)\n",
766 $filename, length $$rdata, scalar @$objs; 1075 $decname, length $$rdata, scalar @$objs;
767 1076
768 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) { 1077 if (my $fh = aio_open "$filename~", O_WRONLY | O_CREAT, 0600) {
769 chmod SAVE_MODE, $fh; 1078 chmod SAVE_MODE, $fh;
770 aio_write $fh, 0, (length $$rdata), $$rdata, 0; 1079 aio_write $fh, 0, (length $$rdata), $$rdata, 0;
771 aio_fsync $fh if $cf::USE_FSYNC; 1080 aio_fsync $fh if $cf::USE_FSYNC;
772 close $fh; 1081 close $fh;
773 1082
774 if (@$objs) { 1083 if (@$objs) {
775 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) { 1084 if (my $fh = aio_open "$filename.pst~", O_WRONLY | O_CREAT, 0600) {
776 chmod SAVE_MODE, $fh; 1085 chmod SAVE_MODE, $fh;
777 my $data = Storable::nfreeze { version => 1, objs => $objs }; 1086 my $data = Coro::Storable::nfreeze { version => 1, objs => $objs };
778 aio_write $fh, 0, (length $data), $data, 0; 1087 aio_write $fh, 0, (length $data), $data, 0;
779 aio_fsync $fh if $cf::USE_FSYNC; 1088 aio_fsync $fh if $cf::USE_FSYNC;
780 close $fh; 1089 close $fh;
781 aio_rename "$filename.pst~", "$filename.pst"; 1090 aio_rename "$filename.pst~", "$filename.pst";
782 } 1091 }
… …
790 } 1099 }
791 } else { 1100 } else {
792 aio_unlink $filename; 1101 aio_unlink $filename;
793 aio_unlink "$filename.pst"; 1102 aio_unlink "$filename.pst";
794 } 1103 }
795 } 1104 };
796} 1105}
797 1106
798sub object_freezer_as_string { 1107sub object_freezer_as_string {
799 my ($rdata, $objs) = @_; 1108 my ($rdata, $objs) = @_;
800 1109
… …
812 or return; 1121 or return;
813 1122
814 unless (aio_stat "$filename.pst") { 1123 unless (aio_stat "$filename.pst") {
815 (aio_load "$filename.pst", $av) >= 0 1124 (aio_load "$filename.pst", $av) >= 0
816 or return; 1125 or return;
1126
817 $av = eval { (Storable::thaw $av)->{objs} }; 1127 my $st = eval { Coro::Storable::thaw $av };
1128 $av = $st->{objs};
818 } 1129 }
819 1130
1131 utf8::decode (my $decname = $filename);
820 warn sprintf "loading %s (%d)\n", 1132 warn sprintf "loading %s (%d,%d)\n",
821 $filename, length $data, scalar @{$av || []};#d# 1133 $decname, length $data, scalar @{$av || []};
1134
822 return ($data, $av); 1135 ($data, $av)
823} 1136}
1137
1138=head2 COMMAND CALLBACKS
1139
1140=over 4
1141
1142=cut
824 1143
825############################################################################# 1144#############################################################################
826# command handling &c 1145# command handling &c
827 1146
828=item cf::register_command $name => \&callback($ob,$args); 1147=item cf::register_command $name => \&callback($ob,$args);
… …
841 push @{ $COMMAND{$name} }, [$caller, $cb]; 1160 push @{ $COMMAND{$name} }, [$caller, $cb];
842} 1161}
843 1162
844=item cf::register_extcmd $name => \&callback($pl,$packet); 1163=item cf::register_extcmd $name => \&callback($pl,$packet);
845 1164
846Register a callbackf ro execution when the client sends an extcmd packet. 1165Register a callback for execution when the client sends an (synchronous)
1166extcmd packet. Ext commands will be processed in the order they are
1167received by the server, like other user commands. The first argument is
1168the logged-in player. Ext commands can only be processed after a player
1169has logged in successfully.
847 1170
848If the callback returns something, it is sent back as if reply was being 1171If the callback returns something, it is sent back as if reply was being
849called. 1172called.
850 1173
1174=item cf::register_exticmd $name => \&callback($ns,$packet);
1175
1176Register a callback for execution when the client sends an (asynchronous)
1177exticmd packet. Exti commands are processed by the server as soon as they
1178are received, i.e. out of order w.r.t. other commands. The first argument
1179is a client socket. Exti commands can be received anytime, even before
1180log-in.
1181
1182If the callback returns something, it is sent back as if reply was being
1183called.
1184
851=cut 1185=cut
852 1186
853sub register_extcmd { 1187sub register_extcmd {
854 my ($name, $cb) = @_; 1188 my ($name, $cb) = @_;
855 1189
856 $EXTCMD{$name} = $cb; 1190 $EXTCMD{$name} = $cb;
1191}
1192
1193sub register_exticmd {
1194 my ($name, $cb) = @_;
1195
1196 $EXTICMD{$name} = $cb;
857} 1197}
858 1198
859cf::player->attach ( 1199cf::player->attach (
860 on_command => sub { 1200 on_command => sub {
861 my ($pl, $name, $params) = @_; 1201 my ($pl, $name, $params) = @_;
… …
870 cf::override; 1210 cf::override;
871 }, 1211 },
872 on_extcmd => sub { 1212 on_extcmd => sub {
873 my ($pl, $buf) = @_; 1213 my ($pl, $buf) = @_;
874 1214
875 my $msg = eval { from_json $buf }; 1215 my $msg = eval { $pl->ns->{json_coder}->decode ($buf) };
876 1216
877 if (ref $msg) { 1217 if (ref $msg) {
1218 my ($type, $reply, @payload) =
1219 "ARRAY" eq ref $msg
1220 ? @$msg
1221 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
1222
1223 my @reply;
1224
878 if (my $cb = $EXTCMD{$msg->{msgtype}}) { 1225 if (my $cb = $EXTCMD{$type}) {
879 if (my %reply = $cb->($pl, $msg)) { 1226 @reply = $cb->($pl, @payload);
880 $pl->ext_reply ($msg->{msgid}, %reply);
881 }
882 } 1227 }
1228
1229 $pl->ext_reply ($reply, @reply)
1230 if $reply;
1231
883 } else { 1232 } else {
884 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n"; 1233 warn "player " . ($pl->ob->name) . " sent unparseable ext message: <$buf>\n";
885 } 1234 }
886 1235
887 cf::override; 1236 cf::override;
888 }, 1237 },
889); 1238);
890 1239
891sub load_extension {
892 my ($path) = @_;
893
894 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
895 my $base = $1;
896 my $pkg = $1;
897 $pkg =~ s/[^[:word:]]/_/g;
898 $pkg = "ext::$pkg";
899
900 warn "... loading '$path' into '$pkg'\n";
901
902 open my $fh, "<:utf8", $path
903 or die "$path: $!";
904
905 my $source =
906 "package $pkg; use strict; use utf8;\n"
907 . "#line 1 \"$path\"\n{\n"
908 . (do { local $/; <$fh> })
909 . "\n};\n1";
910
911 unless (eval $source) {
912 my $msg = $@ ? "$path: $@\n"
913 : "extension disabled.\n";
914 if ($source =~ /^#!.*perl.*#.*MANDATORY/m) { # ugly match
915 warn $@;
916 warn "mandatory extension failed to load, exiting.\n";
917 exit 1;
918 }
919 die $@;
920 }
921
922 push @EXTS, $pkg;
923}
924
925sub load_extensions { 1240sub load_extensions {
1241 cf::sync_job {
1242 my %todo;
1243
926 for my $ext (<$LIBDIR/*.ext>) { 1244 for my $path (<$LIBDIR/*.ext>) {
927 next unless -r $ext; 1245 next unless -r $path;
928 eval { 1246
929 load_extension $ext; 1247 $path =~ /([^\/\\]+)\.ext$/ or die "$path";
1248 my $base = $1;
1249 my $pkg = $1;
1250 $pkg =~ s/[^[:word:]]/_/g;
1251 $pkg = "ext::$pkg";
1252
1253 open my $fh, "<:utf8", $path
1254 or die "$path: $!";
1255
1256 my $source = do { local $/; <$fh> };
1257
1258 my %ext = (
1259 path => $path,
1260 base => $base,
1261 pkg => $pkg,
1262 );
1263
1264 $ext{meta} = { map { (split /=/, $_, 2)[0, 1] } split /\s+/, $1 }
1265 if $source =~ /\A#!.*?perl.*?#\s*(.*)$/m;
1266
1267 $ext{source} =
1268 "package $pkg; use strict; use utf8;\n"
1269 . "#line 1 \"$path\"\n{\n"
1270 . $source
1271 . "\n};\n1";
1272
1273 $todo{$base} = \%ext;
1274 }
1275
1276 my %done;
1277 while (%todo) {
1278 my $progress;
1279
1280 while (my ($k, $v) = each %todo) {
1281 for (split /,\s*/, $v->{meta}{depends}) {
1282 goto skip
1283 unless exists $done{$_};
1284 }
1285
1286 warn "... loading '$k' into '$v->{pkg}'\n";
1287
1288 unless (eval $v->{source}) {
1289 my $msg = $@ ? "$v->{path}: $@\n"
1290 : "$v->{base}: extension inactive.\n";
1291
1292 if (exists $v->{meta}{mandatory}) {
1293 warn $msg;
1294 warn "mandatory extension failed to load, exiting.\n";
1295 exit 1;
1296 }
1297
1298 warn $msg;
1299 }
1300
1301 $done{$k} = delete $todo{$k};
1302 push @EXTS, $v->{pkg};
1303 $progress = 1;
930 1 1304 }
931 } or warn "$ext not loaded: $@"; 1305
1306 skip:
1307 die "cannot load " . (join ", ", keys %todo) . ": unable to resolve dependencies\n"
1308 unless $progress;
1309 }
932 } 1310 };
933} 1311}
934 1312
935############################################################################# 1313#############################################################################
936 1314
1315=back
1316
937=head2 CORE EXTENSIONS 1317=head2 CORE EXTENSIONS
938 1318
939Functions and methods that extend core crossfire objects. 1319Functions and methods that extend core crossfire objects.
940 1320
941=cut 1321=cut
… …
946 1326
947=head3 cf::player 1327=head3 cf::player
948 1328
949=over 4 1329=over 4
950 1330
1331=item cf::player::num_playing
1332
1333Returns the official number of playing players, as per the Crossfire metaserver rules.
1334
1335=cut
1336
1337sub num_playing {
1338 scalar grep
1339 $_->ob->map
1340 && !$_->hidden
1341 && !$_->ob->flag (cf::FLAG_WIZ),
1342 cf::player::list
1343}
1344
951=item cf::player::find $login 1345=item cf::player::find $login
952 1346
953Returns the given player object, loading it if necessary (might block). 1347Returns the given player object, loading it if necessary (might block).
954 1348
955=cut 1349=cut
956 1350
957sub playerdir($) { 1351sub playerdir($) {
958 cf::localdir 1352 "$PLAYERDIR/"
959 . "/"
960 . cf::playerdir
961 . "/"
962 . (ref $_[0] ? $_[0]->ob->name : $_[0]) 1353 . (ref $_[0] ? $_[0]->ob->name : $_[0])
963} 1354}
964 1355
965sub path($) { 1356sub path($) {
966 my $login = ref $_[0] ? $_[0]->ob->name : $_[0]; 1357 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
967 1358
968 (playerdir $login) . "/$login.pl" 1359 (playerdir $login) . "/playerdata"
969} 1360}
970 1361
971sub find_active($) { 1362sub find_active($) {
972 $cf::PLAYER{$_[0]} 1363 $cf::PLAYER{$_[0]}
973 and $cf::PLAYER{$_[0]}->active 1364 and $cf::PLAYER{$_[0]}->active
… …
986 my $login = $_[0]; 1377 my $login = $_[0];
987 1378
988 my $guard = cf::lock_acquire "user_find:$login"; 1379 my $guard = cf::lock_acquire "user_find:$login";
989 1380
990 $cf::PLAYER{$_[0]} || do { 1381 $cf::PLAYER{$_[0]} || do {
991 my $pl = load_pl path $login 1382 # rename old playerfiles to new ones
1383 #TODO: remove when no longer required
1384 aio_link +(playerdir $login) . "/$login.pl.pst", (playerdir $login) . "/playerdata.pst";
1385 aio_link +(playerdir $login) . "/$login.pl" , (playerdir $login) . "/playerdata";
1386 aio_unlink +(playerdir $login) . "/$login.pl.pst";
1387 aio_unlink +(playerdir $login) . "/$login.pl";
1388
1389 my $f = new_from_file cf::object::thawer path $login
992 or return; 1390 or return;
1391
1392 my $pl = cf::player::load_pl $f
1393 or return;
1394 local $cf::PLAYER_LOADING{$login} = $pl;
1395 $f->resolve_delayed_derefs;
993 $cf::PLAYER{$login} = $pl 1396 $cf::PLAYER{$login} = $pl
994 } 1397 }
995 } 1398 }
996} 1399}
997 1400
… …
1007 1410
1008 aio_mkdir playerdir $pl, 0770; 1411 aio_mkdir playerdir $pl, 0770;
1009 $pl->{last_save} = $cf::RUNTIME; 1412 $pl->{last_save} = $cf::RUNTIME;
1010 1413
1011 $pl->save_pl ($path); 1414 $pl->save_pl ($path);
1012 Coro::cede; 1415 cf::cede_to_tick;
1013} 1416}
1014 1417
1015sub new($) { 1418sub new($) {
1016 my ($login) = @_; 1419 my ($login) = @_;
1017 1420
… …
1021 $self->{deny_save} = 1; 1424 $self->{deny_save} = 1;
1022 1425
1023 $cf::PLAYER{$login} = $self; 1426 $cf::PLAYER{$login} = $self;
1024 1427
1025 $self 1428 $self
1429}
1430
1431=item $player->send_msg ($channel, $msg, $color, [extra...])
1432
1433=cut
1434
1435sub send_msg {
1436 my $ns = shift->ns
1437 or return;
1438 $ns->send_msg (@_);
1026} 1439}
1027 1440
1028=item $pl->quit_character 1441=item $pl->quit_character
1029 1442
1030Nukes the player without looking back. If logged in, the connection will 1443Nukes the player without looking back. If logged in, the connection will
… …
1079while and may block, so not sync_job-capable, ever. 1492while and may block, so not sync_job-capable, ever.
1080 1493
1081=cut 1494=cut
1082 1495
1083sub list_logins { 1496sub list_logins {
1084 my $dirs = aio_readdir cf::localdir . "/" . cf::playerdir 1497 my $dirs = aio_readdir $PLAYERDIR
1085 or return []; 1498 or return [];
1086 1499
1087 my @logins; 1500 my @logins;
1088 1501
1089 for my $login (@$dirs) { 1502 for my $login (@$dirs) {
1503 my $path = path $login;
1504
1505 # a .pst is a dead give-away for a valid player
1506 unless (-e "$path.pst") {
1090 my $fh = aio_open path $login, Fcntl::O_RDONLY, 0 or next; 1507 my $fh = aio_open $path, Fcntl::O_RDONLY, 0 or next;
1091 aio_read $fh, 0, 512, my $buf, 0 or next; 1508 aio_read $fh, 0, 512, my $buf, 0 or next;
1092 $buf !~ /^password -------------$/m or next; # official not-valid tag 1509 $buf !~ /^password -------------$/m or next; # official not-valid tag
1510 }
1093 1511
1094 utf8::decode $login; 1512 utf8::decode $login;
1095 push @logins, $login; 1513 push @logins, $login;
1096 } 1514 }
1097 1515
… …
1124 } 1542 }
1125 1543
1126 \@paths 1544 \@paths
1127} 1545}
1128 1546
1547=item $protocol_xml = $player->expand_cfpod ($crossfire_pod)
1548
1549Expand crossfire pod fragments into protocol xml.
1550
1551=cut
1552
1553 use re 'eval';
1554
1555my $group;
1556my $interior; $interior = qr{
1557 (?:
1558 \ (.*?)\ (?{ $group = $^N })
1559 | < (??{$interior}) >
1560 )
1561}x;
1562
1563sub expand_cfpod {
1564 my ($self, $pod) = @_;
1565
1566 my $xml;
1567
1568 while () {
1569 if ($pod =~ /\G( (?: [^BCGHITU]+ | .(?=[^<]) )+ )/xgcs) {
1570 $group = $1;
1571
1572 $group =~ s/&/&amp;/g;
1573 $group =~ s/</&lt;/g;
1574
1575 $xml .= $group;
1576 } elsif ($pod =~ m%\G
1577 ([BCGHITU])
1578 <
1579 (?:
1580 ([^<>]*) (?{ $group = $^N })
1581 | < $interior >
1582 )
1583 >
1584 %gcsx
1585 ) {
1586 my ($code, $data) = ($1, $group);
1587
1588 if ($code eq "B") {
1589 $xml .= "<b>" . expand_cfpod ($self, $data) . "</b>";
1590 } elsif ($code eq "I") {
1591 $xml .= "<i>" . expand_cfpod ($self, $data) . "</i>";
1592 } elsif ($code eq "U") {
1593 $xml .= "<u>" . expand_cfpod ($self, $data) . "</u>";
1594 } elsif ($code eq "C") {
1595 $xml .= "<tt>" . expand_cfpod ($self, $data) . "</tt>";
1596 } elsif ($code eq "T") {
1597 $xml .= "<big><b>" . expand_cfpod ($self, $data) . "</b></big>";
1598 } elsif ($code eq "G") {
1599 my ($male, $female) = split /\|/, $data;
1600 $data = $self->gender ? $female : $male;
1601 $xml .= expand_cfpod ($self, $data);
1602 } elsif ($code eq "H") {
1603 $xml .= ("<fg name=\"lightblue\">[" . expand_cfpod ($self, $data) . " (Use hintmode to suppress hints)]</fg>",
1604 "<fg name=\"lightblue\">[Hint suppressed, see hintmode]</fg>",
1605 "")
1606 [$self->{hintmode}];
1607 } else {
1608 $xml .= "error processing '$code($data)' directive";
1609 }
1610 } else {
1611 if ($pod =~ /\G(.+)/) {
1612 warn "parse error while expanding $pod (at $1)";
1613 }
1614 last;
1615 }
1616 }
1617
1618 for ($xml) {
1619 # create single paragraphs (very hackish)
1620 s/(?<=\S)\n(?=\w)/ /g;
1621
1622 # compress some whitespace
1623 s/\s+\n/\n/g; # ws line-ends
1624 s/\n\n+/\n/g; # double lines
1625 s/^\n+//; # beginning lines
1626 s/\n+$//; # ending lines
1627 }
1628
1629 $xml
1630}
1631
1632sub hintmode {
1633 $_[0]{hintmode} = $_[1] if @_ > 1;
1634 $_[0]{hintmode}
1635}
1636
1129=item $player->ext_reply ($msgid, $msgtype, %msg) 1637=item $player->ext_reply ($msgid, @msg)
1130 1638
1131Sends an ext reply to the player. 1639Sends an ext reply to the player.
1132 1640
1133=cut 1641=cut
1134 1642
1135sub ext_reply($$$%) { 1643sub ext_reply($$@) {
1136 my ($self, $id, %msg) = @_; 1644 my ($self, $id, @msg) = @_;
1137 1645
1138 $msg{msgid} = $id; 1646 $self->ns->ext_reply ($id, @msg)
1139
1140 $self->send ("ext " . cf::to_json \%msg);
1141} 1647}
1142 1648
1143package cf; 1649=item $player->ext_msg ($type, @msg)
1650
1651Sends an ext event to the client.
1652
1653=cut
1654
1655sub ext_msg($$@) {
1656 my ($self, $type, @msg) = @_;
1657
1658 $self->ns->ext_msg ($type, @msg);
1659}
1660
1661=head3 cf::region
1662
1663=over 4
1664
1665=cut
1666
1667package cf::region;
1668
1669=item cf::region::find_by_path $path
1670
1671Tries to decuce the likely region for a map knowing only its path.
1672
1673=cut
1674
1675sub find_by_path($) {
1676 my ($path) = @_;
1677
1678 my ($match, $specificity);
1679
1680 for my $region (list) {
1681 if ($region->{match} && $path =~ $region->{match}) {
1682 ($match, $specificity) = ($region, $region->specificity)
1683 if $region->specificity > $specificity;
1684 }
1685 }
1686
1687 $match
1688}
1144 1689
1145=back 1690=back
1146
1147 1691
1148=head3 cf::map 1692=head3 cf::map
1149 1693
1150=over 4 1694=over 4
1151 1695
… …
1206 my ($self, $merge) = @_; 1750 my ($self, $merge) = @_;
1207 1751
1208 # we have to keep some variables in memory intact 1752 # we have to keep some variables in memory intact
1209 local $self->{path}; 1753 local $self->{path};
1210 local $self->{load_path}; 1754 local $self->{load_path};
1211 local $self->{deny_save};
1212 local $self->{deny_reset};
1213 1755
1214 $self->SUPER::thawer_merge ($merge); 1756 $self->SUPER::thawer_merge ($merge);
1215} 1757}
1216 1758
1217sub normalise { 1759sub normalise {
… …
1264 $self->init; # pass $1 etc. 1806 $self->init; # pass $1 etc.
1265 return $self; 1807 return $self;
1266 } 1808 }
1267 } 1809 }
1268 1810
1269 Carp::carp "unable to resolve path '$path' (base '$base')."; 1811 Carp::cluck "unable to resolve path '$path' (base '$base').";
1270 () 1812 ()
1271} 1813}
1272 1814
1273sub init { 1815sub init {
1274 my ($self) = @_; 1816 my ($self) = @_;
… …
1289 1831
1290# the original (read-only) location 1832# the original (read-only) location
1291sub load_path { 1833sub load_path {
1292 my ($self) = @_; 1834 my ($self) = @_;
1293 1835
1294 sprintf "%s/%s/%s.map", cf::datadir, cf::mapdir, $self->{path} 1836 "$MAPDIR/$self->{path}.map"
1295} 1837}
1296 1838
1297# the temporary/swap location 1839# the temporary/swap location
1298sub save_path { 1840sub save_path {
1299 my ($self) = @_; 1841 my ($self) = @_;
1300 1842
1301 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1843 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1302 sprintf "%s/%s/%s.map", cf::localdir, cf::tmpdir, $path 1844 "$TMPDIR/$path.map"
1303} 1845}
1304 1846
1305# the unique path, undef == no special unique path 1847# the unique path, undef == no special unique path
1306sub uniq_path { 1848sub uniq_path {
1307 my ($self) = @_; 1849 my ($self) = @_;
1308 1850
1309 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g; 1851 (my $path = $_[0]{path}) =~ s/\//$PATH_SEP/g;
1310 sprintf "%s/%s/%s", cf::localdir, cf::uniquedir, $path 1852 "$UNIQUEDIR/$path"
1311} 1853}
1312 1854
1313# and all this just because we cannot iterate over 1855# and all this just because we cannot iterate over
1314# all maps in C++... 1856# all maps in C++...
1315sub change_all_map_light { 1857sub change_all_map_light {
… …
1317 1859
1318 $_->change_map_light ($change) 1860 $_->change_map_light ($change)
1319 for grep $_->outdoor, values %cf::MAP; 1861 for grep $_->outdoor, values %cf::MAP;
1320} 1862}
1321 1863
1864sub decay_objects {
1865 my ($self) = @_;
1866
1867 return if $self->{deny_reset};
1868
1869 $self->do_decay_objects;
1870}
1871
1322sub unlink_save { 1872sub unlink_save {
1323 my ($self) = @_; 1873 my ($self) = @_;
1324 1874
1325 utf8::encode (my $save = $self->save_path); 1875 utf8::encode (my $save = $self->save_path);
1326 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save; 1876 IO::AIO::aioreq_pri 4; Coro::AIO::aio_unlink $save;
… …
1329 1879
1330sub load_header_from($) { 1880sub load_header_from($) {
1331 my ($self, $path) = @_; 1881 my ($self, $path) = @_;
1332 1882
1333 utf8::encode $path; 1883 utf8::encode $path;
1334 #aio_open $path, O_RDONLY, 0 1884 my $f = new_from_file cf::object::thawer $path
1335 # or return;
1336
1337 $self->_load_header ($path)
1338 or return; 1885 or return;
1886
1887 $self->_load_header ($f)
1888 or return;
1889
1890 local $MAP_LOADING{$self->{path}} = $self;
1891 $f->resolve_delayed_derefs;
1339 1892
1340 $self->{load_path} = $path; 1893 $self->{load_path} = $path;
1341 1894
1342 1 1895 1
1343} 1896}
… …
1382 $self->load_header_orig 1935 $self->load_header_orig
1383 or return; 1936 or return;
1384 $self->prepare_orig; 1937 $self->prepare_orig;
1385 } 1938 }
1386 1939
1940 $self->{deny_reset} = 1
1941 if $self->no_reset;
1942
1943 $self->default_region (cf::region::find_by_path $self->{path})
1944 unless $self->default_region;
1945
1387 1 1946 1
1388} 1947}
1389 1948
1390sub find; 1949sub find;
1391sub find { 1950sub find {
1392 my ($path, $origin) = @_; 1951 my ($path, $origin) = @_;
1393 1952
1394 $path = normalise $path, $origin && $origin->path; 1953 $path = normalise $path, $origin && $origin->path;
1395 1954
1955 cf::lock_wait "map_data:$path";#d#remove
1396 cf::lock_wait "map_find:$path"; 1956 cf::lock_wait "map_find:$path";
1397 1957
1398 $cf::MAP{$path} || do { 1958 $cf::MAP{$path} || do {
1399 my $guard = cf::lock_acquire "map_find:$path"; 1959 my $guard1 = cf::lock_acquire "map_find:$path";
1960 my $guard2 = cf::lock_acquire "map_data:$path"; # just for the fun of it
1961
1400 my $map = new_from_path cf::map $path 1962 my $map = new_from_path cf::map $path
1401 or return; 1963 or return;
1402 1964
1403 $map->{last_save} = $cf::RUNTIME; 1965 $map->{last_save} = $cf::RUNTIME;
1404 1966
1405 $map->load_header 1967 $map->load_header
1406 or return; 1968 or return;
1407 1969
1408 if ($map->should_reset && 0) {#d#TODO# disabled, crashy (locking issue?) 1970 if ($map->should_reset) {#d#TODO# disabled, crashy (locking issue?)
1409 # doing this can freeze the server in a sync job, obviously 1971 # doing this can freeze the server in a sync job, obviously
1410 #$cf::WAIT_FOR_TICK->wait; 1972 #$cf::WAIT_FOR_TICK->wait;
1973 undef $guard1;
1974 undef $guard2;
1411 $map->reset; 1975 $map->reset;
1412 undef $guard;
1413 return find $path; 1976 return find $path;
1414 } 1977 }
1415 1978
1416 $cf::MAP{$path} = $map 1979 $cf::MAP{$path} = $map
1417 } 1980 }
… …
1424 my ($self) = @_; 1987 my ($self) = @_;
1425 1988
1426 local $self->{deny_reset} = 1; # loading can take a long time 1989 local $self->{deny_reset} = 1; # loading can take a long time
1427 1990
1428 my $path = $self->{path}; 1991 my $path = $self->{path};
1992
1993 {
1429 my $guard = cf::lock_acquire "map_load:$path"; 1994 my $guard = cf::lock_acquire "map_data:$path";
1430 1995
1996 return unless $self->valid;
1431 return if $self->in_memory != cf::MAP_SWAPPED; 1997 return unless $self->in_memory == cf::MAP_SWAPPED;
1432 1998
1433 $self->in_memory (cf::MAP_LOADING); 1999 $self->in_memory (cf::MAP_LOADING);
1434 2000
1435 $self->alloc; 2001 $self->alloc;
1436 2002
1437 $self->pre_load; 2003 $self->pre_load;
2004 cf::cede_to_tick;
1438 2005
1439 $self->_load_objects ($self->{load_path}, 1) 2006 my $f = new_from_file cf::object::thawer $self->{load_path};
2007 $f->skip_block;
2008 $self->_load_objects ($f)
1440 or return; 2009 or return;
1441 2010
1442 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1) 2011 $self->set_object_flag (cf::FLAG_OBJ_ORIGINAL, 1)
1443 if delete $self->{load_original}; 2012 if delete $self->{load_original};
1444 2013
1445 if (my $uniq = $self->uniq_path) { 2014 if (my $uniq = $self->uniq_path) {
1446 utf8::encode $uniq; 2015 utf8::encode $uniq;
1447 if (aio_open $uniq, O_RDONLY, 0) { 2016 unless (aio_stat $uniq) {
2017 if (my $f = new_from_file cf::object::thawer $uniq) {
1448 $self->clear_unique_items; 2018 $self->clear_unique_items;
1449 $self->_load_objects ($uniq, 0); 2019 $self->_load_objects ($f);
2020 $f->resolve_delayed_derefs;
2021 }
1450 } 2022 }
1451 } 2023 }
1452 2024
1453 Coro::cede; 2025 $f->resolve_delayed_derefs;
1454 2026
2027 cf::cede_to_tick;
1455 # now do the right thing for maps 2028 # now do the right thing for maps
1456 $self->link_multipart_objects; 2029 $self->link_multipart_objects;
1457
1458 unless ($self->{deny_activate}) {
1459 $self->decay_objects;
1460 $self->fix_auto_apply;
1461 $self->update_buttons;
1462 Coro::cede;
1463 $self->set_darkness_map;
1464 $self->difficulty ($self->estimate_difficulty) 2030 $self->difficulty ($self->estimate_difficulty)
1465 unless $self->difficulty; 2031 unless $self->difficulty;
1466 Coro::cede; 2032 cf::cede_to_tick;
2033
2034 unless ($self->{deny_activate}) {
2035 $self->decay_objects;
2036 $self->fix_auto_apply;
2037 $self->update_buttons;
2038 cf::cede_to_tick;
2039 $self->set_darkness_map;
2040 cf::cede_to_tick;
1467 $self->activate; 2041 $self->activate;
2042 }
2043
2044 $self->{last_save} = $cf::RUNTIME;
2045 $self->last_access ($cf::RUNTIME);
2046
2047 $self->in_memory (cf::MAP_IN_MEMORY);
1468 } 2048 }
1469 2049
1470 $self->post_load; 2050 $self->post_load;
1471
1472 $self->in_memory (cf::MAP_IN_MEMORY);
1473} 2051}
1474 2052
1475sub customise_for { 2053sub customise_for {
1476 my ($self, $ob) = @_; 2054 my ($self, $ob) = @_;
1477 2055
1478 return find "~" . $ob->name . "/" . $self->{path} 2056 return find "~" . $ob->name . "/" . $self->{path}
1479 if $self->per_player; 2057 if $self->per_player;
1480 2058
2059# return find "?party/" . $ob->name . "/" . $self->{path}
2060# if $self->per_party;
2061
1481 $self 2062 $self
1482} 2063}
1483 2064
1484# find and load all maps in the 3x3 area around a map 2065# find and load all maps in the 3x3 area around a map
1485sub load_diag { 2066sub load_neighbours {
1486 my ($map) = @_; 2067 my ($map) = @_;
1487 2068
1488 my @diag; # diagonal neighbours 2069 my @neigh; # diagonal neighbours
1489 2070
1490 for (0 .. 3) { 2071 for (0 .. 3) {
1491 my $neigh = $map->tile_path ($_) 2072 my $neigh = $map->tile_path ($_)
1492 or next; 2073 or next;
1493 $neigh = find $neigh, $map 2074 $neigh = find $neigh, $map
1494 or next; 2075 or next;
1495 $neigh->load; 2076 $neigh->load;
1496 2077
2078 push @neigh,
1497 push @diag, [$neigh->tile_path (($_ + 3) % 4), $neigh], 2079 [$neigh->tile_path (($_ + 3) % 4), $neigh],
1498 [$neigh->tile_path (($_ + 1) % 4), $neigh]; 2080 [$neigh->tile_path (($_ + 1) % 4), $neigh];
1499 } 2081 }
1500 2082
1501 for (@diag) { 2083 for (grep defined $_->[0], @neigh) {
2084 my ($path, $origin) = @$_;
1502 my $neigh = find @$_ 2085 my $neigh = find $path, $origin
1503 or next; 2086 or next;
1504 $neigh->load; 2087 $neigh->load;
1505 } 2088 }
1506} 2089}
1507 2090
… …
1512} 2095}
1513 2096
1514sub do_load_sync { 2097sub do_load_sync {
1515 my ($map) = @_; 2098 my ($map) = @_;
1516 2099
2100 cf::LOG cf::llevDebug | cf::logBacktrace, "do_load_sync"
2101 if $Coro::current == $Coro::main;
2102
1517 cf::sync_job { $map->load }; 2103 cf::sync_job { $map->load };
1518} 2104}
1519 2105
1520our %MAP_PREFETCH; 2106our %MAP_PREFETCH;
1521our $MAP_PREFETCHER = undef; 2107our $MAP_PREFETCHER = undef;
1522 2108
1523sub find_async { 2109sub find_async {
1524 my ($path, $origin) = @_; 2110 my ($path, $origin, $load) = @_;
1525 2111
1526 $path = normalise $path, $origin && $origin->{path}; 2112 $path = normalise $path, $origin && $origin->{path};
1527 2113
1528 if (my $map = $cf::MAP{$path}) { 2114 if (my $map = $cf::MAP{$path}) {
1529 return $map if $map->in_memory == cf::MAP_IN_MEMORY; 2115 return $map if !$load || $map->in_memory == cf::MAP_IN_MEMORY;
1530 } 2116 }
1531 2117
1532 undef $MAP_PREFETCH{$path}; 2118 $MAP_PREFETCH{$path} |= $load;
2119
1533 $MAP_PREFETCHER ||= cf::async { 2120 $MAP_PREFETCHER ||= cf::async {
2121 $Coro::current->{desc} = "map prefetcher";
2122
1534 while (%MAP_PREFETCH) { 2123 while (%MAP_PREFETCH) {
1535 for my $path (keys %MAP_PREFETCH) { 2124 while (my ($k, $v) = each %MAP_PREFETCH) {
1536 my $map = find $path 2125 if (my $map = find $k) {
1537 or next;
1538 $map->load; 2126 $map->load if $v;
2127 }
1539 2128
1540 delete $MAP_PREFETCH{$path}; 2129 delete $MAP_PREFETCH{$k};
1541 } 2130 }
1542 } 2131 }
1543 undef $MAP_PREFETCHER; 2132 undef $MAP_PREFETCHER;
1544 }; 2133 };
1545 $MAP_PREFETCHER->prio (6); 2134 $MAP_PREFETCHER->prio (6);
… …
1548} 2137}
1549 2138
1550sub save { 2139sub save {
1551 my ($self) = @_; 2140 my ($self) = @_;
1552 2141
1553 my $lock = cf::lock_acquire "map_data:" . $self->path; 2142 my $lock = cf::lock_acquire "map_data:$self->{path}";
1554 2143
1555 $self->{last_save} = $cf::RUNTIME; 2144 $self->{last_save} = $cf::RUNTIME;
1556 2145
1557 return unless $self->dirty; 2146 return unless $self->dirty;
1558 2147
… …
1564 return if $self->{deny_save}; 2153 return if $self->{deny_save};
1565 2154
1566 local $self->{last_access} = $self->last_access;#d# 2155 local $self->{last_access} = $self->last_access;#d#
1567 2156
1568 cf::async { 2157 cf::async {
2158 $Coro::current->{desc} = "map player save";
1569 $_->contr->save for $self->players; 2159 $_->contr->save for $self->players;
1570 }; 2160 };
1571 2161
1572 if ($uniq) { 2162 if ($uniq) {
1573 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 2163 $self->_save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
… …
1581 my ($self) = @_; 2171 my ($self) = @_;
1582 2172
1583 # save first because save cedes 2173 # save first because save cedes
1584 $self->save; 2174 $self->save;
1585 2175
1586 my $lock = cf::lock_acquire "map_data:" . $self->path; 2176 my $lock = cf::lock_acquire "map_data:$self->{path}";
1587 2177
1588 return if $self->players; 2178 return if $self->players;
1589 return if $self->in_memory != cf::MAP_IN_MEMORY; 2179 return if $self->in_memory != cf::MAP_IN_MEMORY;
1590 return if $self->{deny_save}; 2180 return if $self->{deny_save};
1591 2181
2182 $self->in_memory (cf::MAP_SWAPPED);
2183
2184 $self->deactivate;
2185 $_->clear_links_to ($self) for values %cf::MAP;
1592 $self->clear; 2186 $self->clear;
1593 $self->in_memory (cf::MAP_SWAPPED);
1594} 2187}
1595 2188
1596sub reset_at { 2189sub reset_at {
1597 my ($self) = @_; 2190 my ($self) = @_;
1598 2191
1599 # TODO: safety, remove and allow resettable per-player maps 2192 # TODO: safety, remove and allow resettable per-player maps
1600 return 1e99 if $self->isa ("ext::map_per_player");#d#
1601 return 1e99 if $self->{deny_reset}; 2193 return 1e99 if $self->{deny_reset};
1602 2194
1603 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access; 2195 my $time = $self->fixed_resettime ? $self->{instantiate_time} : $self->last_access;
1604 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET; 2196 my $to = List::Util::min $MAX_RESET, $self->reset_timeout || $DEFAULT_RESET;
1605 2197
… …
1616 my ($self) = @_; 2208 my ($self) = @_;
1617 2209
1618 my $lock = cf::lock_acquire "map_data:$self->{path}"; 2210 my $lock = cf::lock_acquire "map_data:$self->{path}";
1619 2211
1620 return if $self->players; 2212 return if $self->players;
1621 return if $self->isa ("ext::map_per_player");#d#
1622 2213
1623 warn "resetting map ", $self->path;#d# 2214 warn "resetting map ", $self->path;
1624 2215
1625 $self->in_memory (cf::MAP_SWAPPED); 2216 $self->in_memory (cf::MAP_SWAPPED);
1626 2217
1627 # need to save uniques path 2218 # need to save uniques path
1628 unless ($self->{deny_save}) { 2219 unless ($self->{deny_save}) {
… …
1632 if $uniq; 2223 if $uniq;
1633 } 2224 }
1634 2225
1635 delete $cf::MAP{$self->path}; 2226 delete $cf::MAP{$self->path};
1636 2227
2228 $self->deactivate;
2229 $_->clear_links_to ($self) for values %cf::MAP;
1637 $self->clear; 2230 $self->clear;
1638
1639 $_->clear_links_to ($self) for values %cf::MAP;
1640 2231
1641 $self->unlink_save; 2232 $self->unlink_save;
1642 $self->destroy; 2233 $self->destroy;
1643} 2234}
1644 2235
1645my $nuke_counter = "aaaa"; 2236my $nuke_counter = "aaaa";
1646 2237
1647sub nuke { 2238sub nuke {
1648 my ($self) = @_; 2239 my ($self) = @_;
1649 2240
2241 {
2242 my $lock = cf::lock_acquire "map_data:$self->{path}";
2243
1650 delete $cf::MAP{$self->path}; 2244 delete $cf::MAP{$self->path};
1651 2245
1652 $self->unlink_save; 2246 $self->unlink_save;
1653 2247
1654 bless $self, "cf::map"; 2248 bless $self, "cf::map";
1655 delete $self->{deny_reset}; 2249 delete $self->{deny_reset};
1656 $self->{deny_save} = 1; 2250 $self->{deny_save} = 1;
1657 $self->reset_timeout (1); 2251 $self->reset_timeout (1);
1658 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++)); 2252 $self->path ($self->{path} = "{nuke}/" . ($nuke_counter++));
1659 2253
1660 $cf::MAP{$self->path} = $self; 2254 $cf::MAP{$self->path} = $self;
2255 }
1661 2256
1662 $self->reset; # polite request, might not happen 2257 $self->reset; # polite request, might not happen
2258}
2259
2260=item $maps = cf::map::tmp_maps
2261
2262Returns an arrayref with all map paths of currently instantiated and saved
2263maps. May block.
2264
2265=cut
2266
2267sub tmp_maps() {
2268 [
2269 map {
2270 utf8::decode $_;
2271 /\.map$/
2272 ? normalise $_
2273 : ()
2274 } @{ aio_readdir $TMPDIR or [] }
2275 ]
2276}
2277
2278=item $maps = cf::map::random_maps
2279
2280Returns an arrayref with all map paths of currently instantiated and saved
2281random maps. May block.
2282
2283=cut
2284
2285sub random_maps() {
2286 [
2287 map {
2288 utf8::decode $_;
2289 /\.map$/
2290 ? normalise "?random/$_"
2291 : ()
2292 } @{ aio_readdir $RANDOMDIR or [] }
2293 ]
1663} 2294}
1664 2295
1665=item cf::map::unique_maps 2296=item cf::map::unique_maps
1666 2297
1667Returns an arrayref of paths of all shared maps that have 2298Returns an arrayref of paths of all shared maps that have
1668instantiated unique items. May block. 2299instantiated unique items. May block.
1669 2300
1670=cut 2301=cut
1671 2302
1672sub unique_maps() { 2303sub unique_maps() {
1673 my $files = aio_readdir cf::localdir . "/" . cf::uniquedir 2304 [
1674 or return; 2305 map {
1675
1676 my @paths;
1677
1678 for (@$files) {
1679 utf8::decode $_; 2306 utf8::decode $_;
1680 next if /\.pst$/; 2307 /\.map$/
1681 next unless /^$PATH_SEP/o; 2308 ? normalise $_
1682 2309 : ()
1683 push @paths, cf::map::normalise $_; 2310 } @{ aio_readdir $UNIQUEDIR or [] }
1684 } 2311 ]
1685
1686 \@paths
1687} 2312}
1688 2313
1689package cf; 2314package cf;
1690 2315
1691=back 2316=back
… …
1709 map { $_, inv_recursive_ $_->inv } @_ 2334 map { $_, inv_recursive_ $_->inv } @_
1710} 2335}
1711 2336
1712sub inv_recursive { 2337sub inv_recursive {
1713 inv_recursive_ inv $_[0] 2338 inv_recursive_ inv $_[0]
2339}
2340
2341=item $ref = $ob->ref
2342
2343creates and returns a persistent reference to an objetc that can be stored as a string.
2344
2345=item $ob = cf::object::deref ($refstring)
2346
2347returns the objetc referenced by refstring. may return undef when it cnanot find the object,
2348even if the object actually exists. May block.
2349
2350=cut
2351
2352sub deref {
2353 my ($ref) = @_;
2354
2355 if ($ref =~ m{^player\/(<1\.[0-9a-f]+>)/(.*)$}) {
2356 my ($uuid, $name) = ($1, $2);
2357 my $pl = $cf::PLAYER_LOADING{$name} || cf::player::find $name
2358 or return;
2359 $pl->ob->uuid eq $uuid
2360 or return;
2361
2362 $pl->ob
2363 } else {
2364 warn "$ref: cannot resolve object reference\n";
2365 undef
2366 }
1714} 2367}
1715 2368
1716package cf; 2369package cf;
1717 2370
1718=back 2371=back
… …
1737 2390
1738 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4; 2391 $flags = cf::NDI_BROWN | cf::NDI_UNIQUE unless @_ >= 4;
1739 2392
1740 if ($self->{record_replies}) { 2393 if ($self->{record_replies}) {
1741 push @{ $self->{record_replies} }, [$npc, $msg, $flags]; 2394 push @{ $self->{record_replies} }, [$npc, $msg, $flags];
2395
1742 } else { 2396 } else {
2397 my $pl = $self->contr;
2398
2399 if ($pl->{npc_dialog} && $pl->{npc_dialog}->{id}) {
2400 my $dialog = $pl->{npc_dialog};
2401 $dialog->{pl}->ext_msg ($dialog->{id}, update => msg => $dialog->{pl}->expand_cfpod ($msg));
2402
2403 } else {
1743 $msg = $npc->name . " says: $msg" if $npc; 2404 $msg = $npc->name . " says: $msg" if $npc;
1744 $self->message ($msg, $flags); 2405 $self->message ($msg, $flags);
2406 }
1745 } 2407 }
2408}
2409
2410=item $object->send_msg ($channel, $msg, $color, [extra...])
2411
2412=cut
2413
2414sub cf::object::send_msg {
2415 my $pl = shift->contr
2416 or return;
2417 $pl->send_msg (@_);
1746} 2418}
1747 2419
1748=item $player_object->may ("access") 2420=item $player_object->may ("access")
1749 2421
1750Returns wether the given player is authorized to access resource "access" 2422Returns wether the given player is authorized to access resource "access"
… …
1797 $self->deactivate_recursive; 2469 $self->deactivate_recursive;
1798 2470
1799 return if UNIVERSAL::isa $self->map, "ext::map_link"; 2471 return if UNIVERSAL::isa $self->map, "ext::map_link";
1800 2472
1801 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y] 2473 $self->{_link_pos} ||= [$self->map->{path}, $self->x, $self->y]
1802 if $self->map; 2474 if $self->map && $self->map->{path} ne "{link}";
1803 2475
1804 $self->enter_map ($LINK_MAP || link_map, 10, 10); 2476 $self->enter_map ($LINK_MAP || link_map, 10, 10);
1805} 2477}
1806 2478
1807sub cf::object::player::leave_link { 2479sub cf::object::player::leave_link {
1808 my ($self, $map, $x, $y) = @_; 2480 my ($self, $map, $x, $y) = @_;
2481
2482 return unless $self->contr->active;
1809 2483
1810 my $link_pos = delete $self->{_link_pos}; 2484 my $link_pos = delete $self->{_link_pos};
1811 2485
1812 unless ($map) { 2486 unless ($map) {
1813 # restore original map position 2487 # restore original map position
… …
1827 # use -1 or undef as default coordinates, not 0, 0 2501 # use -1 or undef as default coordinates, not 0, 0
1828 ($x, $y) = ($map->enter_x, $map->enter_y) 2502 ($x, $y) = ($map->enter_x, $map->enter_y)
1829 if $x <=0 && $y <= 0; 2503 if $x <=0 && $y <= 0;
1830 2504
1831 $map->load; 2505 $map->load;
1832 $map->load_diag; 2506 $map->load_neighbours;
1833 2507
1834 return unless $self->contr->active; 2508 return unless $self->contr->active;
1835 $self->activate_recursive; 2509 $self->activate_recursive;
1836 2510
1837 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext 2511 local $self->{_prev_pos} = $link_pos; # ugly hack for rent.ext
1838 $self->enter_map ($map, $x, $y); 2512 $self->enter_map ($map, $x, $y);
1839} 2513}
1840 2514
1841cf::player->attach ( 2515=item $player_object->goto ($path, $x, $y[, $check->($map)[, $done->()]])
1842 on_logout => sub {
1843 my ($pl) = @_;
1844 2516
1845 # abort map switching before logout 2517Moves the player to the given map-path and coordinates by first freezing
1846 if ($pl->ob->{_link_pos}) { 2518her, loading and preparing them map, calling the provided $check callback
1847 cf::sync_job { 2519that has to return the map if sucecssful, and then unfreezes the player on
1848 $pl->ob->leave_link 2520the new (success) or old (failed) map position. In either case, $done will
1849 }; 2521be called at the end of this process.
1850 }
1851 },
1852 on_login => sub {
1853 my ($pl) = @_;
1854 2522
1855 # try to abort aborted map switching on player login :)
1856 # should happen only on crashes
1857 if ($pl->ob->{_link_pos}) {
1858 $pl->ob->enter_link;
1859 (async {
1860 $pl->ob->reply (undef,
1861 "There was an internal problem at your last logout, "
1862 . "the server will try to bring you to your intended destination in a second.",
1863 cf::NDI_RED);
1864 # we need this sleep as the login has a concurrent enter_exit running
1865 # and this sleep increases chances of the player not ending up in scorn
1866 Coro::Timer::sleep 1;
1867 $pl->ob->leave_link;
1868 })->prio (2);
1869 }
1870 },
1871);
1872
1873=item $player_object->goto ($path, $x, $y)
1874
1875=cut 2523=cut
2524
2525our $GOTOGEN;
1876 2526
1877sub cf::object::player::goto { 2527sub cf::object::player::goto {
1878 my ($self, $path, $x, $y) = @_; 2528 my ($self, $path, $x, $y, $check, $done) = @_;
2529
2530 # do generation counting so two concurrent goto's will be executed in-order
2531 my $gen = $self->{_goto_generation} = ++$GOTOGEN;
1879 2532
1880 $self->enter_link; 2533 $self->enter_link;
1881 2534
1882 (async { 2535 (async {
2536 $Coro::current->{desc} = "player::goto $path $x $y";
2537
2538 # *tag paths override both path and x|y
2539 if ($path =~ /^\*(.*)$/) {
2540 if (my @obs = grep $_->map, ext::map_tags::find $1) {
2541 my $ob = $obs[rand @obs];
2542
2543 # see if we actually can go there
2544 if (@obs = grep !$self->blocked ($_->map, $_->x, $_->y), $ob, $ob->tail) {
2545 $ob = $obs[rand @obs];
2546 } else {
2547 $self->message ("Wow, it's pretty crowded in there.", cf::NDI_UNIQUE | cf::NDI_RED);
2548 }
2549 # else put us there anyways for now #d#
2550
2551 ($path, $x, $y) = ($ob->map, $ob->x, $ob->y);
2552 } else {
2553 ($path, $x, $y) = (undef, undef, undef);
2554 }
2555 }
2556
1883 my $map = eval { 2557 my $map = eval {
1884 my $map = cf::map::find $path; 2558 my $map = defined $path ? cf::map::find $path : undef;
2559
2560 if ($map) {
1885 $map = $map->customise_for ($self) if $map; 2561 $map = $map->customise_for ($self);
2562 $map = $check->($map) if $check && $map;
2563 } else {
2564 $self->message ("The exit to '$path' is closed.", cf::NDI_UNIQUE | cf::NDI_RED);
2565 }
2566
1886 $map 2567 $map
2568 };
2569
2570 if ($@) {
2571 $self->message ("Something went wrong within the server, please report this incident!", cf::NDI_UNIQUE | cf::NDI_RED);
2572 LOG llevError | logBacktrace, Carp::longmess $@;
1887 } or 2573 }
1888 $self->message ("The exit to '$path' is closed", cf::NDI_UNIQUE | cf::NDI_RED);
1889 2574
2575 if ($gen == $self->{_goto_generation}) {
2576 delete $self->{_goto_generation};
1890 $self->leave_link ($map, $x, $y); 2577 $self->leave_link ($map, $x, $y);
2578 }
2579
2580 $done->() if $done;
1891 })->prio (1); 2581 })->prio (1);
1892} 2582}
1893 2583
1894=item $player_object->enter_exit ($exit_object) 2584=item $player_object->enter_exit ($exit_object)
1895 2585
… …
1934 2624
1935 $rmp->{random_seed} ||= $exit->random_seed; 2625 $rmp->{random_seed} ||= $exit->random_seed;
1936 2626
1937 my $data = cf::to_json $rmp; 2627 my $data = cf::to_json $rmp;
1938 my $md5 = Digest::MD5::md5_hex $data; 2628 my $md5 = Digest::MD5::md5_hex $data;
1939 my $meta = "$cf::RANDOM_MAPS/$md5.meta"; 2629 my $meta = "$RANDOMDIR/$md5.meta";
1940 2630
1941 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) { 2631 if (my $fh = aio_open "$meta~", O_WRONLY | O_CREAT, 0666) {
1942 aio_write $fh, 0, (length $data), $data, 0; 2632 aio_write $fh, 0, (length $data), $data, 0;
1943 undef $fh; 2633 undef $fh;
1944 aio_rename "$meta~", $meta; 2634 aio_rename "$meta~", $meta;
… …
1953 2643
1954 return unless $self->type == cf::PLAYER; 2644 return unless $self->type == cf::PLAYER;
1955 2645
1956 if ($exit->slaying eq "/!") { 2646 if ($exit->slaying eq "/!") {
1957 #TODO: this should de-fi-ni-te-ly not be a sync-job 2647 #TODO: this should de-fi-ni-te-ly not be a sync-job
2648 # the problem is that $exit might not survive long enough
2649 # so it needs to be done right now, right here
1958 cf::sync_job { prepare_random_map $exit }; 2650 cf::sync_job { prepare_random_map $exit };
1959 } 2651 }
1960 2652
1961 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path; 2653 my $slaying = cf::map::normalise $exit->slaying, $exit->map && $exit->map->path;
1962 my $hp = $exit->stats->hp; 2654 my $hp = $exit->stats->hp;
1963 my $sp = $exit->stats->sp; 2655 my $sp = $exit->stats->sp;
1964 2656
1965 $self->enter_link; 2657 $self->enter_link;
1966 2658
2659 # if exit is damned, update players death & WoR home-position
2660 $self->contr->savebed ($slaying, $hp, $sp)
2661 if $exit->flag (FLAG_DAMNED);
2662
1967 (async { 2663 (async {
2664 $Coro::current->{desc} = "enter_exit $slaying $hp $sp";
2665
1968 $self->deactivate_recursive; # just to be sure 2666 $self->deactivate_recursive; # just to be sure
1969 unless (eval { 2667 unless (eval {
1970 $self->goto ($slaying, $hp, $sp); 2668 $self->goto ($slaying, $hp, $sp);
1971 2669
1972 1; 2670 1;
1973 }) { 2671 }) {
1974 $self->message ("Something went wrong deep within the crossfire server. " 2672 $self->message ("Something went wrong deep within the crossfire server. "
1975 . "I'll try to bring you back to the map you were before. " 2673 . "I'll try to bring you back to the map you were before. "
1976 . "Please report this to the dungeon master!", 2674 . "Please report this to the dungeon master!",
1977 cf::NDI_UNIQUE | cf::NDI_RED); 2675 cf::NDI_UNIQUE | cf::NDI_RED);
1978 2676
1979 warn "ERROR in enter_exit: $@"; 2677 warn "ERROR in enter_exit: $@";
1980 $self->leave_link; 2678 $self->leave_link;
1981 } 2679 }
1982 })->prio (1); 2680 })->prio (1);
… …
1998 2696
1999 utf8::encode $text; 2697 utf8::encode $text;
2000 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text); 2698 $self->send_packet (sprintf "drawinfo %d %s", $flags || cf::NDI_BLACK, $text);
2001} 2699}
2002 2700
2701=item $client->send_msg ($channel, $msg, $color, [extra...])
2702
2703Send a drawinfo or msg packet to the client, formatting the msg for the
2704client if neccessary. C<$type> should be a string identifying the type of
2705the message, with C<log> being the default. If C<$color> is negative, suppress
2706the message unless the client supports the msg packet.
2707
2708=cut
2709
2710# non-persistent channels (usually the info channel)
2711our %CHANNEL = (
2712 "c/identify" => {
2713 id => "infobox",
2714 title => "Identify",
2715 reply => undef,
2716 tooltip => "Items recently identified",
2717 },
2718 "c/examine" => {
2719 id => "infobox",
2720 title => "Examine",
2721 reply => undef,
2722 tooltip => "Signs and other items you examined",
2723 },
2724 "c/book" => {
2725 id => "infobox",
2726 title => "Book",
2727 reply => undef,
2728 tooltip => "The contents of a note or book",
2729 },
2730 "c/lookat" => {
2731 id => "infobox",
2732 title => "Look",
2733 reply => undef,
2734 tooltip => "What you saw there",
2735 },
2736 "c/who" => {
2737 id => "infobox",
2738 title => "Players",
2739 reply => undef,
2740 tooltip => "Shows players who are currently online",
2741 },
2742 "c/body" => {
2743 id => "infobox",
2744 title => "Body Parts",
2745 reply => undef,
2746 tooltip => "Shows which body parts you posess and are available",
2747 },
2748 "c/uptime" => {
2749 id => "infobox",
2750 title => "Uptime",
2751 reply => undef,
2752 tooltip => "How long the server has been running since last restart",
2753 },
2754 "c/mapinfo" => {
2755 id => "infobox",
2756 title => "Map Info",
2757 reply => undef,
2758 tooltip => "Information related to the maps",
2759 },
2760);
2761
2762sub cf::client::send_msg {
2763 my ($self, $channel, $msg, $color, @extra) = @_;
2764
2765 $msg = $self->pl->expand_cfpod ($msg);
2766
2767 $color &= cf::NDI_CLIENT_MASK; # just in case...
2768
2769 # check predefined channels, for the benefit of C
2770 if ($CHANNEL{$channel}) {
2771 $channel = $CHANNEL{$channel};
2772
2773 $self->ext_msg (channel_info => $channel)
2774 if $self->can_msg;
2775
2776 $channel = $channel->{id};
2777
2778 } elsif (ref $channel) {
2779 # send meta info to client, if not yet sent
2780 unless (exists $self->{channel}{$channel->{id}}) {
2781 $self->{channel}{$channel->{id}} = $channel;
2782 $self->ext_msg (channel_info => $channel)
2783 if $self->can_msg;
2784 }
2785
2786 $channel = $channel->{id};
2787 }
2788
2789 return unless @extra || length $msg;
2790
2791 if ($self->can_msg) {
2792 # default colour, mask it out
2793 $color &= ~(cf::NDI_COLOR_MASK | cf::NDI_DEF)
2794 if $color & cf::NDI_DEF;
2795
2796 $self->send_packet ("msg " . $self->{json_coder}->encode (
2797 [$color & cf::NDI_CLIENT_MASK, $channel, $msg, @extra]));
2798 } else {
2799 if ($color >= 0) {
2800 # replace some tags by gcfclient-compatible ones
2801 for ($msg) {
2802 1 while
2803 s/<b>([^<]*)<\/b>/[b]${1}[\/b]/
2804 || s/<i>([^<]*)<\/i>/[i]${1}[\/i]/
2805 || s/<u>([^<]*)<\/u>/[ul]${1}[\/ul]/
2806 || s/<tt>([^<]*)<\/tt>/[fixed]${1}[\/fixed]/
2807 || s/<fg name=\"([^"]+)\">([^<]*)<\/fg>/[color=$1]${2}[\/color]/;
2808 }
2809
2810 $color &= cf::NDI_COLOR_MASK;
2811
2812 utf8::encode $msg;
2813
2814 if (0 && $msg =~ /\[/) {
2815 # COMMAND/INFO
2816 $self->send_packet ("drawextinfo $color 10 8 $msg")
2817 } else {
2818 $msg =~ s/\[\/?(?:b|i|u|fixed|color)[^\]]*\]//g;
2819 $self->send_packet ("drawinfo $color $msg")
2820 }
2821 }
2822 }
2823}
2824
2825=item $client->ext_msg ($type, @msg)
2826
2827Sends an ext event to the client.
2828
2829=cut
2830
2831sub cf::client::ext_msg($$@) {
2832 my ($self, $type, @msg) = @_;
2833
2834 if ($self->extcmd == 2) {
2835 $self->send_packet ("ext " . $self->{json_coder}->encode ([$type, @msg]));
2836 } elsif ($self->extcmd == 1) { # TODO: remove
2837 push @msg, msgtype => "event_$type";
2838 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2839 }
2840}
2841
2842=item $client->ext_reply ($msgid, @msg)
2843
2844Sends an ext reply to the client.
2845
2846=cut
2847
2848sub cf::client::ext_reply($$@) {
2849 my ($self, $id, @msg) = @_;
2850
2851 if ($self->extcmd == 2) {
2852 $self->send_packet ("ext " . $self->{json_coder}->encode (["reply-$id", @msg]));
2853 } elsif ($self->extcmd == 1) {
2854 #TODO: version 1, remove
2855 unshift @msg, msgtype => "reply", msgid => $id;
2856 $self->send_packet ("ext " . $self->{json_coder}->encode ({@msg}));
2857 }
2858}
2003 2859
2004=item $success = $client->query ($flags, "text", \&cb) 2860=item $success = $client->query ($flags, "text", \&cb)
2005 2861
2006Queues a query to the client, calling the given callback with 2862Queues a query to the client, calling the given callback with
2007the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>, 2863the reply text on a reply. flags can be C<cf::CS_QUERY_YESNO>,
2008C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>. 2864C<cf::CS_QUERY_SINGLECHAR> or C<cf::CS_QUERY_HIDEINPUT> or C<0>.
2009 2865
2010Queries can fail, so check the return code. Or don't, as queries will become 2866Queries can fail, so check the return code. Or don't, as queries will
2011reliable at some point in the future. 2867become reliable at some point in the future.
2012 2868
2013=cut 2869=cut
2014 2870
2015sub cf::client::query { 2871sub cf::client::query {
2016 my ($self, $flags, $text, $cb) = @_; 2872 my ($self, $flags, $text, $cb) = @_;
… …
2024 utf8::encode $text; 2880 utf8::encode $text;
2025 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb]; 2881 push @{ $self->{query_queue} }, [(sprintf "query %d %s", $flags, $text), $cb];
2026 2882
2027 $self->send_packet ($self->{query_queue}[0][0]) 2883 $self->send_packet ($self->{query_queue}[0][0])
2028 if @{ $self->{query_queue} } == 1; 2884 if @{ $self->{query_queue} } == 1;
2885
2886 1
2029} 2887}
2030 2888
2031cf::client->attach ( 2889cf::client->attach (
2890 on_connect => sub {
2891 my ($ns) = @_;
2892
2893 $ns->{json_coder} = JSON::XS->new->utf8->max_size (1e6)->convert_blessed;
2894 },
2032 on_reply => sub { 2895 on_reply => sub {
2033 my ($ns, $msg) = @_; 2896 my ($ns, $msg) = @_;
2034 2897
2035 # this weird shuffling is so that direct followup queries 2898 # this weird shuffling is so that direct followup queries
2036 # get handled first 2899 # get handled first
… …
2048 } else { 2911 } else {
2049 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM; 2912 $ns->state (ST_PLAYING) if $ns->state == ST_CUSTOM;
2050 } 2913 }
2051 } 2914 }
2052 }, 2915 },
2916 on_exticmd => sub {
2917 my ($ns, $buf) = @_;
2918
2919 my $msg = eval { $ns->{json_coder}->decode ($buf) };
2920
2921 if (ref $msg) {
2922 my ($type, $reply, @payload) =
2923 "ARRAY" eq ref $msg
2924 ? @$msg
2925 : ($msg->{msgtype}, $msg->{msgid}, %$msg); # TODO: version 1, remove
2926
2927 my @reply;
2928
2929 if (my $cb = $EXTICMD{$type}) {
2930 @reply = $cb->($ns, @payload);
2931 }
2932
2933 $ns->ext_reply ($reply, @reply)
2934 if $reply;
2935
2936 } else {
2937 warn "client " . ($ns->pl ? $ns->pl->ob->name : $ns->host) . " sent unparseable exti message: <$buf>\n";
2938 }
2939
2940 cf::override;
2941 },
2053); 2942);
2054 2943
2055=item $client->async (\&cb) 2944=item $client->async (\&cb)
2056 2945
2057Create a new coroutine, running the specified callback. The coroutine will 2946Create a new coroutine, running the specified callback. The coroutine will
… …
2098our $safe = new Safe "safe"; 2987our $safe = new Safe "safe";
2099our $safe_hole = new Safe::Hole; 2988our $safe_hole = new Safe::Hole;
2100 2989
2101$SIG{FPE} = 'IGNORE'; 2990$SIG{FPE} = 'IGNORE';
2102 2991
2103$safe->permit_only (Opcode::opset qw(:base_core :base_mem :base_orig :base_math sort time)); 2992$safe->permit_only (Opcode::opset qw(
2993 :base_core :base_mem :base_orig :base_math
2994 grepstart grepwhile mapstart mapwhile
2995 sort time
2996));
2104 2997
2105# here we export the classes and methods available to script code 2998# here we export the classes and methods available to script code
2106 2999
2107=pod 3000=pod
2108 3001
2109The following fucntions and emthods are available within a safe environment: 3002The following functions and methods are available within a safe environment:
2110 3003
2111 cf::object contr pay_amount pay_player map 3004 cf::object
3005 contr pay_amount pay_player map x y force_find force_add destroy
3006 insert remove name archname title slaying race decrease_ob_nr
3007
2112 cf::object::player player 3008 cf::object::player
2113 cf::player peaceful 3009 player
2114 cf::map trigger 3010
3011 cf::player
3012 peaceful
3013
3014 cf::map
3015 trigger
2115 3016
2116=cut 3017=cut
2117 3018
2118for ( 3019for (
2119 ["cf::object" => qw(contr pay_amount pay_player map)], 3020 ["cf::object" => qw(contr pay_amount pay_player map force_find force_add x y
3021 insert remove inv name archname title slaying race
3022 decrease_ob_nr destroy)],
2120 ["cf::object::player" => qw(player)], 3023 ["cf::object::player" => qw(player)],
2121 ["cf::player" => qw(peaceful)], 3024 ["cf::player" => qw(peaceful)],
2122 ["cf::map" => qw(trigger)], 3025 ["cf::map" => qw(trigger)],
2123) { 3026) {
2124 no strict 'refs'; 3027 no strict 'refs';
… …
2195=back 3098=back
2196 3099
2197=cut 3100=cut
2198 3101
2199############################################################################# 3102#############################################################################
2200
2201=head2 EXTENSION DATABASE SUPPORT
2202
2203Crossfire maintains a very simple database for extension use. It can
2204currently store anything that can be serialised using Storable, which
2205excludes objects.
2206
2207The parameter C<$family> should best start with the name of the extension
2208using it, it should be unique.
2209
2210=over 4
2211
2212=item $value = cf::db_get $family => $key
2213
2214Returns a single value from the database.
2215
2216=item cf::db_put $family => $key => $value
2217
2218Stores the given C<$value> in the family.
2219
2220=cut
2221
2222our $DB;
2223
2224sub db_init {
2225 unless ($DB) {
2226 $DB = BDB::db_create $DB_ENV;
2227
2228 cf::sync_job {
2229 eval {
2230 $DB->set_flags (BDB::CHKSUM);
2231
2232 BDB::db_open $DB, undef, "db", undef, BDB::BTREE,
2233 BDB::CREATE | BDB::AUTO_COMMIT, 0666;
2234 cf::cleanup "db_open(db): $!" if $!;
2235 };
2236 cf::cleanup "db_open(db): $@" if $@;
2237 };
2238
2239 my $path = cf::localdir . "/database.pst";
2240 if (stat $path) {
2241 cf::sync_job {
2242 my $pst = Storable::retrieve $path;
2243
2244 cf::db_put (board => data => $pst->{board});
2245 cf::db_put (guildrules => data => $pst->{guildrules});
2246 cf::db_put (rent => balance => $pst->{rent}{balance});
2247 BDB::db_env_txn_checkpoint $DB_ENV;
2248
2249 unlink $path;
2250 };
2251 }
2252 }
2253}
2254
2255sub db_get($$) {
2256 my $key = "$_[0]/$_[1]";
2257
2258 cf::sync_job {
2259 BDB::db_get $DB, undef, $key, my $data;
2260
2261 $! ? ()
2262 : Compress::LZF::sthaw $data
2263 }
2264}
2265
2266sub db_put($$$) {
2267 BDB::dbreq_pri 4;
2268 BDB::db_put $DB, undef, "$_[0]/$_[1]", Compress::LZF::sfreeze_cr $_[2], 0, sub { };
2269}
2270
2271#############################################################################
2272# the server's init and main functions 3103# the server's init and main functions
2273 3104
2274sub load_faces { 3105sub load_facedata($) {
2275 my $path = sprintf "%s/faces", cf::datadir; 3106 my ($path) = @_;
2276 3107
3108 # HACK to clear player env face cache, we need some signal framework
3109 # for this (global event?)
3110 %ext::player_env::MUSIC_FACE_CACHE = ();
3111
3112 my $enc = JSON::XS->new->utf8->canonical->relaxed;
3113
2277 warn "loading faces from $path\n"; 3114 warn "loading facedata from $path\n";
2278 3115
2279 my $faces; 3116 my $facedata;
2280 0 < aio_load $path, $faces 3117 0 < aio_load $path, $facedata
2281 or die "$path: $!"; 3118 or die "$path: $!";
2282 3119
2283 Coro::cede;
2284 $faces = Storable::thaw $faces; 3120 $facedata = Coro::Storable::thaw $facedata;
2285 Coro::cede;
2286 3121
2287 my $meta = delete $faces->{""};
2288 $meta->{version} == 1 3122 $facedata->{version} == 2
2289 or cf::cleanup "$path: version mismatch, cannot proceed."; 3123 or cf::cleanup "$path: version mismatch, cannot proceed.";
2290 3124
3125 # patch in the exptable
3126 $facedata->{resource}{"res/exp_table"} = {
3127 type => FT_RSRC,
3128 data => $enc->encode ([map cf::level_to_min_exp $_, 1 .. cf::settings->max_level]),
3129 };
3130 cf::cede_to_tick;
3131
3132 {
3133 my $faces = $facedata->{faceinfo};
3134
2291 while (my ($face, $info) = each %$faces) { 3135 while (my ($face, $info) = each %$faces) {
2292 my $idx = (cf::face::find $face) || cf::face::alloc $face; 3136 my $idx = (cf::face::find $face) || cf::face::alloc $face;
2293 cf::face::set $idx, $info->{visibility}, $info->{magicmap}; 3137 cf::face::set_visibility $idx, $info->{visibility};
3138 cf::face::set_magicmap $idx, $info->{magicmap};
2294 cf::face::set_data $idx, 0, $info->{data32}, $info->{chksum32}; 3139 cf::face::set_data $idx, 0, $info->{data32}, Digest::MD5::md5 $info->{data32};
2295 Coro::cede; 3140 cf::face::set_data $idx, 1, $info->{data64}, Digest::MD5::md5 $info->{data64};
2296 }
2297 3141
3142 cf::cede_to_tick;
3143 }
3144
2298 while (my ($face, $info) = each %$faces) { 3145 while (my ($face, $info) = each %$faces) {
2299 next unless $info->{smooth}; 3146 next unless $info->{smooth};
2300 my $idx = cf::face::find $face 3147 my $idx = cf::face::find $face
2301 or next; 3148 or next;
2302 if (my $smooth = cf::face::find $info->{smooth}) { 3149 if (my $smooth = cf::face::find $info->{smooth}) {
2303 cf::face::set_smooth $idx, $smooth; 3150 cf::face::set_smooth $idx, $smooth;
3151 cf::face::set_smoothlevel $idx, $info->{smoothlevel};
2304 } else { 3152 } else {
2305 warn "smooth face '$info->{smooth}' not found for face '$face'"; 3153 warn "smooth face '$info->{smooth}' not found for face '$face'";
2306 } 3154 }
2307 Coro::cede; 3155
3156 cf::cede_to_tick;
3157 }
3158 }
3159
3160 {
3161 my $anims = $facedata->{animinfo};
3162
3163 while (my ($anim, $info) = each %$anims) {
3164 cf::anim::set $anim, $info->{frames}, $info->{facings};
3165 cf::cede_to_tick;
3166 }
3167
3168 cf::anim::invalidate_all; # d'oh
3169 }
3170
3171 {
3172 # TODO: for gcfclient pleasure, we should give resources
3173 # that gcfclient doesn't grok a >10000 face index.
3174 my $res = $facedata->{resource};
3175
3176 my $soundconf = delete $res->{"res/sound.conf"};
3177
3178 while (my ($name, $info) = each %$res) {
3179 my $idx = (cf::face::find $name) || cf::face::alloc $name;
3180 my $data;
3181
3182 if ($info->{type} & 1) {
3183 # prepend meta info
3184
3185 my $meta = $enc->encode ({
3186 name => $name,
3187 %{ $info->{meta} || {} },
3188 });
3189
3190 $data = pack "(w/a*)*", $meta, $info->{data};
3191 } else {
3192 $data = $info->{data};
3193 }
3194
3195 cf::face::set_data $idx, 0, $data, Digest::MD5::md5 $data;
3196 cf::face::set_type $idx, $info->{type};
3197
3198 cf::cede_to_tick;
3199 }
3200
3201 if ($soundconf) {
3202 $soundconf = $enc->decode (delete $soundconf->{data});
3203
3204 for (0 .. SOUND_CAST_SPELL_0 - 1) {
3205 my $sound = $soundconf->{compat}[$_]
3206 or next;
3207
3208 my $face = cf::face::find "sound/$sound->[1]";
3209 cf::sound::set $sound->[0] => $face;
3210 cf::sound::old_sound_index $_, $face; # gcfclient-compat
3211 }
3212
3213 while (my ($k, $v) = each %{$soundconf->{event}}) {
3214 my $face = cf::face::find "sound/$v";
3215 cf::sound::set $k => $face;
3216 }
3217 }
2308 } 3218 }
2309 3219
2310 1 3220 1
2311} 3221}
2312 3222
3223register_exticmd fx_want => sub {
3224 my ($ns, $want) = @_;
3225
3226 while (my ($k, $v) = each %$want) {
3227 $ns->fx_want ($k, $v);
3228 }
3229};
3230
3231sub reload_regions {
3232 # HACK to clear player env face cache, we need some signal framework
3233 # for this (global event?)
3234 %ext::player_env::MUSIC_FACE_CACHE = ();
3235
3236 load_resource_file "$MAPDIR/regions"
3237 or die "unable to load regions file\n";
3238
3239 for (cf::region::list) {
3240 $_->{match} = qr/$_->{match}/
3241 if exists $_->{match};
3242 }
3243}
3244
3245sub reload_facedata {
3246 load_facedata "$DATADIR/facedata"
3247 or die "unable to load facedata\n";
3248}
3249
3250sub reload_archetypes {
3251 load_resource_file "$DATADIR/archetypes"
3252 or die "unable to load archetypes\n";
3253 #d# NEED to laod twice to resolve forward references
3254 # this really needs to be done in an extra post-pass
3255 # (which needs to be synchronous, so solve it differently)
3256 load_resource_file "$DATADIR/archetypes"
3257 or die "unable to load archetypes\n";
3258}
3259
3260sub reload_treasures {
3261 load_resource_file "$DATADIR/treasures"
3262 or die "unable to load treasurelists\n";
3263}
3264
2313sub reload_resources { 3265sub reload_resources {
2314 load_resource_file sprintf "%s/%s/regions", cf::datadir, cf::mapdir 3266 warn "reloading resource files...\n";
2315 or die "unable to load regions file\n";#d# 3267
3268 reload_regions;
2316 load_faces 3269 reload_facedata;
2317 or die "unable to load faces\n";#d# 3270 #reload_archetypes;#d#
3271 reload_archetypes;
3272 reload_treasures;
3273
3274 warn "finished reloading resource files\n";
2318} 3275}
2319 3276
2320sub init { 3277sub init {
2321 reload_resources; 3278 reload_resources;
2322} 3279}
2323 3280
2324sub cfg_load { 3281sub reload_config {
2325 open my $fh, "<:utf8", cf::confdir . "/config" 3282 open my $fh, "<:utf8", "$CONFDIR/config"
2326 or return; 3283 or return;
2327 3284
2328 local $/; 3285 local $/;
2329 *CFG = YAML::Syck::Load <$fh>; 3286 *CFG = YAML::Syck::Load <$fh>;
2330 3287
… …
2345sub main { 3302sub main {
2346 # we must not ever block the main coroutine 3303 # we must not ever block the main coroutine
2347 local $Coro::idle = sub { 3304 local $Coro::idle = sub {
2348 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 3305 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
2349 (async { 3306 (async {
3307 $Coro::current->{desc} = "IDLE BUG HANDLER";
2350 Event::one_event; 3308 Event::one_event;
2351 })->prio (Coro::PRIO_MAX); 3309 })->prio (Coro::PRIO_MAX);
2352 }; 3310 };
2353 3311
2354 cfg_load; 3312 reload_config;
2355 db_init; 3313 db_init;
2356 load_extensions; 3314 load_extensions;
2357 3315
2358 $TICK_WATCHER->start; 3316 $TICK_WATCHER->start;
2359 Event::loop; 3317 Event::loop;
… …
2375 }, 3333 },
2376 ); 3334 );
2377 } 3335 }
2378} 3336}
2379 3337
3338sub write_runtime {
3339 my $runtime = "$LOCALDIR/runtime";
3340
3341 # first touch the runtime file to show we are still running:
3342 # the fsync below can take a very very long time.
3343
3344 IO::AIO::aio_utime $runtime, undef, undef;
3345
3346 my $guard = cf::lock_acquire "write_runtime";
3347
3348 my $fh = aio_open "$runtime~", O_WRONLY | O_CREAT, 0644
3349 or return;
3350
3351 my $value = $cf::RUNTIME + 90 + 10;
3352 # 10 is the runtime save interval, for a monotonic clock
3353 # 60 allows for the watchdog to kill the server.
3354
3355 (aio_write $fh, 0, (length $value), $value, 0) <= 0
3356 and return;
3357
3358 # always fsync - this file is important
3359 aio_fsync $fh
3360 and return;
3361
3362 # touch it again to show we are up-to-date
3363 aio_utime $fh, undef, undef;
3364
3365 close $fh
3366 or return;
3367
3368 aio_rename "$runtime~", $runtime
3369 and return;
3370
3371 warn "runtime file written.\n";
3372
3373 1
3374}
3375
2380sub emergency_save() { 3376sub emergency_save() {
2381 my $freeze_guard = cf::freeze_mainloop; 3377 my $freeze_guard = cf::freeze_mainloop;
2382 3378
2383 warn "enter emergency perl save\n"; 3379 warn "enter emergency perl save\n";
2384 3380
… …
2388 # and maps saved/destroyed asynchronously. 3384 # and maps saved/destroyed asynchronously.
2389 warn "begin emergency player save\n"; 3385 warn "begin emergency player save\n";
2390 for my $login (keys %cf::PLAYER) { 3386 for my $login (keys %cf::PLAYER) {
2391 my $pl = $cf::PLAYER{$login} or next; 3387 my $pl = $cf::PLAYER{$login} or next;
2392 $pl->valid or next; 3388 $pl->valid or next;
3389 delete $pl->{unclean_save}; # not strictly necessary, but cannot hurt
2393 $pl->save; 3390 $pl->save;
2394 } 3391 }
2395 warn "end emergency player save\n"; 3392 warn "end emergency player save\n";
2396 3393
2397 warn "begin emergency map save\n"; 3394 warn "begin emergency map save\n";
… …
2415 3412
2416 warn Carp::longmess "post_cleanup backtrace" 3413 warn Carp::longmess "post_cleanup backtrace"
2417 if $make_core; 3414 if $make_core;
2418} 3415}
2419 3416
2420sub reload() { 3417sub do_reload_perl() {
2421 # can/must only be called in main 3418 # can/must only be called in main
2422 if ($Coro::current != $Coro::main) { 3419 if ($Coro::current != $Coro::main) {
2423 warn "can only reload from main coroutine"; 3420 warn "can only reload from main coroutine";
2424 return; 3421 return;
2425 } 3422 }
… …
2445 3442
2446 warn "flushing outstanding aio requests"; 3443 warn "flushing outstanding aio requests";
2447 for (;;) { 3444 for (;;) {
2448 BDB::flush; 3445 BDB::flush;
2449 IO::AIO::flush; 3446 IO::AIO::flush;
2450 Coro::cede; 3447 Coro::cede_notself;
2451 last unless IO::AIO::nreqs || BDB::nreqs; 3448 last unless IO::AIO::nreqs || BDB::nreqs;
2452 warn "iterate..."; 3449 warn "iterate...";
2453 } 3450 }
2454 3451
2455 ++$RELOAD; 3452 ++$RELOAD;
… …
2459 %EXT_CORO = (); 3456 %EXT_CORO = ();
2460 3457
2461 warn "removing commands"; 3458 warn "removing commands";
2462 %COMMAND = (); 3459 %COMMAND = ();
2463 3460
2464 warn "removing ext commands"; 3461 warn "removing ext/exti commands";
2465 %EXTCMD = (); 3462 %EXTCMD = ();
3463 %EXTICMD = ();
2466 3464
2467 warn "unloading/nuking all extensions"; 3465 warn "unloading/nuking all extensions";
2468 for my $pkg (@EXTS) { 3466 for my $pkg (@EXTS) {
2469 warn "... unloading $pkg"; 3467 warn "... unloading $pkg";
2470 3468
… …
2500 Symbol::delete_package "safe::$_" 3498 Symbol::delete_package "safe::$_"
2501 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region); 3499 for qw(cf::attachable cf::object cf::object::player cf::client cf::player cf::map cf::party cf::region);
2502 3500
2503 warn "unloading cf.pm \"a bit\""; 3501 warn "unloading cf.pm \"a bit\"";
2504 delete $INC{"cf.pm"}; 3502 delete $INC{"cf.pm"};
3503 delete $INC{"cf/pod.pm"};
2505 3504
2506 # don't, removes xs symbols, too, 3505 # don't, removes xs symbols, too,
2507 # and global variables created in xs 3506 # and global variables created in xs
2508 #Symbol::delete_package __PACKAGE__; 3507 #Symbol::delete_package __PACKAGE__;
2509 3508
… …
2512 warn "reloading cf.pm"; 3511 warn "reloading cf.pm";
2513 require cf; 3512 require cf;
2514 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt 3513 cf::_connect_to_perl; # nominally unnecessary, but cannot hurt
2515 3514
2516 warn "loading config and database again"; 3515 warn "loading config and database again";
2517 cf::cfg_load; 3516 cf::reload_config;
2518 3517
2519 warn "loading extensions"; 3518 warn "loading extensions";
2520 cf::load_extensions; 3519 cf::load_extensions;
2521 3520
2522 warn "reattaching attachments to objects/players"; 3521 warn "reattaching attachments to objects/players";
… …
2524 warn "reattaching attachments to maps"; 3523 warn "reattaching attachments to maps";
2525 reattach $_ for values %MAP; 3524 reattach $_ for values %MAP;
2526 warn "reattaching attachments to players"; 3525 warn "reattaching attachments to players";
2527 reattach $_ for values %PLAYER; 3526 reattach $_ for values %PLAYER;
2528 3527
2529 warn "loading reloadable resources";
2530 reload_resources;
2531
2532 warn "leaving sync_job"; 3528 warn "leaving sync_job";
2533 3529
2534 1 3530 1
2535 } or do { 3531 } or do {
2536 warn $@; 3532 warn $@;
… …
2541 warn "reloaded"; 3537 warn "reloaded";
2542}; 3538};
2543 3539
2544our $RELOAD_WATCHER; # used only during reload 3540our $RELOAD_WATCHER; # used only during reload
2545 3541
3542sub reload_perl() {
3543 # doing reload synchronously and two reloads happen back-to-back,
3544 # coro crashes during coro_state_free->destroy here.
3545
3546 $RELOAD_WATCHER ||= Event->timer (
3547 reentrant => 0,
3548 after => 0,
3549 data => WF_AUTOCANCEL,
3550 cb => sub {
3551 do_reload_perl;
3552 undef $RELOAD_WATCHER;
3553 },
3554 );
3555}
3556
2546register_command "reload" => sub { 3557register_command "reload" => sub {
2547 my ($who, $arg) = @_; 3558 my ($who, $arg) = @_;
2548 3559
2549 if ($who->flag (FLAG_WIZ)) { 3560 if ($who->flag (FLAG_WIZ)) {
2550 $who->message ("reloading server."); 3561 $who->message ("reloading server.");
2551 3562 async {
2552 # doing reload synchronously and two reloads happen back-to-back, 3563 $Coro::current->{desc} = "perl_reload";
2553 # coro crashes during coro_state_free->destroy here.
2554
2555 $RELOAD_WATCHER ||= Event->timer (
2556 reentrant => 0,
2557 after => 0,
2558 data => WF_AUTOCANCEL,
2559 cb => sub {
2560 reload; 3564 reload_perl;
2561 undef $RELOAD_WATCHER;
2562 },
2563 ); 3565 };
2564 } 3566 }
2565}; 3567};
2566 3568
2567unshift @INC, $LIBDIR; 3569unshift @INC, $LIBDIR;
2568 3570
2569my $bug_warning = 0; 3571my $bug_warning = 0;
3572
3573our @WAIT_FOR_TICK;
3574our @WAIT_FOR_TICK_BEGIN;
3575
3576sub wait_for_tick {
3577 return unless $TICK_WATCHER->is_active;
3578 return if $Coro::current == $Coro::main;
3579
3580 my $signal = new Coro::Signal;
3581 push @WAIT_FOR_TICK, $signal;
3582 $signal->wait;
3583}
3584
3585sub wait_for_tick_begin {
3586 return unless $TICK_WATCHER->is_active;
3587 return if $Coro::current == $Coro::main;
3588
3589 my $signal = new Coro::Signal;
3590 push @WAIT_FOR_TICK_BEGIN, $signal;
3591 $signal->wait;
3592}
2570 3593
2571$TICK_WATCHER = Event->timer ( 3594$TICK_WATCHER = Event->timer (
2572 reentrant => 0, 3595 reentrant => 0,
2573 parked => 1, 3596 parked => 1,
2574 prio => 0, 3597 prio => 0,
… …
2579 Carp::cluck "major BUG: server tick called outside of main coro, skipping it" 3602 Carp::cluck "major BUG: server tick called outside of main coro, skipping it"
2580 unless ++$bug_warning > 10; 3603 unless ++$bug_warning > 10;
2581 return; 3604 return;
2582 } 3605 }
2583 3606
2584 $NOW = Event::time; 3607 $NOW = $tick_start = Event::time;
2585 3608
2586 cf::server_tick; # one server iteration 3609 cf::server_tick; # one server iteration
3610
2587 $RUNTIME += $TICK; 3611 $RUNTIME += $TICK;
2588 $NEXT_TICK += $TICK; 3612 $NEXT_TICK += $TICK;
2589 3613
2590 if ($NOW >= $NEXT_RUNTIME_WRITE) { 3614 if ($NOW >= $NEXT_RUNTIME_WRITE) {
2591 $NEXT_RUNTIME_WRITE = $NOW + 10; 3615 $NEXT_RUNTIME_WRITE = $NOW + 10;
2592 Coro::async_pool { 3616 Coro::async_pool {
3617 $Coro::current->{desc} = "runtime saver";
2593 write_runtime 3618 write_runtime
2594 or warn "ERROR: unable to write runtime file: $!"; 3619 or warn "ERROR: unable to write runtime file: $!";
2595 }; 3620 };
2596 } 3621 }
2597 3622
2598 $WAIT_FOR_TICK->broadcast; 3623 if (my $sig = shift @WAIT_FOR_TICK_BEGIN) {
2599 $WAIT_FOR_TICK_ONE->send if $WAIT_FOR_TICK_ONE->awaited; 3624 $sig->send;
3625 }
3626 while (my $sig = shift @WAIT_FOR_TICK) {
3627 $sig->send;
3628 }
2600 3629
2601# my $AFTER = Event::time; 3630 $NOW = Event::time;
2602# warn $AFTER - $NOW;#d#
2603 3631
2604 # if we are delayed by four ticks or more, skip them all 3632 # if we are delayed by four ticks or more, skip them all
2605 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 3633 $NEXT_TICK = $NOW if $NOW >= $NEXT_TICK + $TICK * 4;
2606 3634
2607 $TICK_WATCHER->at ($NEXT_TICK); 3635 $TICK_WATCHER->at ($NEXT_TICK);
2608 $TICK_WATCHER->start; 3636 $TICK_WATCHER->start;
3637
3638 $LOAD = ($NOW - $tick_start) / $TICK;
3639 $LOADAVG = $LOADAVG * 0.75 + $LOAD * 0.25;
3640
3641 _post_tick;
2609 }, 3642 },
2610); 3643);
2611 3644
2612{ 3645{
3646 BDB::min_parallel 8;
2613 BDB::max_poll_time $TICK * 0.1; 3647 BDB::max_poll_time $TICK * 0.1;
2614 $BDB_POLL_WATCHER = Event->io ( 3648 $BDB_POLL_WATCHER = Event->io (
2615 reentrant => 0, 3649 reentrant => 0,
2616 fd => BDB::poll_fileno, 3650 fd => BDB::poll_fileno,
2617 poll => 'r', 3651 poll => 'r',
2618 prio => 0, 3652 prio => 0,
2619 data => WF_AUTOCANCEL, 3653 data => WF_AUTOCANCEL,
2620 cb => \&BDB::poll_cb, 3654 cb => \&BDB::poll_cb,
2621 ); 3655 );
2622 BDB::min_parallel 8;
2623 3656
2624 BDB::set_sync_prepare { 3657 BDB::set_sync_prepare {
2625 my $status; 3658 my $status;
2626 my $current = $Coro::current; 3659 my $current = $Coro::current;
2627 ( 3660 (
… …
2636 ) 3669 )
2637 }; 3670 };
2638 3671
2639 unless ($DB_ENV) { 3672 unless ($DB_ENV) {
2640 $DB_ENV = BDB::db_env_create; 3673 $DB_ENV = BDB::db_env_create;
3674 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC
3675 | BDB::LOG_AUTOREMOVE, 1);
3676 $DB_ENV->set_timeout (30, BDB::SET_TXN_TIMEOUT);
3677 $DB_ENV->set_timeout (30, BDB::SET_LOCK_TIMEOUT);
2641 3678
2642 cf::sync_job { 3679 cf::sync_job {
2643 eval { 3680 eval {
2644 BDB::db_env_open 3681 BDB::db_env_open
2645 $DB_ENV, 3682 $DB_ENV,
2646 $BDB_ENV_DIR, 3683 $BDBDIR,
2647 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN 3684 BDB::INIT_LOCK | BDB::INIT_LOG | BDB::INIT_MPOOL | BDB::INIT_TXN
2648 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE, 3685 | BDB::RECOVER | BDB::REGISTER | BDB::USE_ENVIRON | BDB::CREATE,
2649 0666; 3686 0666;
2650 3687
2651 cf::cleanup "db_env_open($BDB_ENV_DIR): $!" if $!; 3688 cf::cleanup "db_env_open($BDBDIR): $!" if $!;
2652
2653 $DB_ENV->set_flags (BDB::AUTO_COMMIT | BDB::REGION_INIT | BDB::TXN_NOSYNC, 1);
2654 $DB_ENV->set_lk_detect;
2655 }; 3689 };
2656 3690
2657 cf::cleanup "db_env_open(db): $@" if $@; 3691 cf::cleanup "db_env_open(db): $@" if $@;
2658 }; 3692 };
2659 } 3693 }
3694
3695 $BDB_DEADLOCK_WATCHER = Event->timer (
3696 after => 3,
3697 interval => 1,
3698 hard => 1,
3699 prio => 0,
3700 data => WF_AUTOCANCEL,
3701 cb => sub {
3702 BDB::db_env_lock_detect $DB_ENV, 0, BDB::LOCK_DEFAULT, 0, sub { };
3703 },
3704 );
3705 $BDB_CHECKPOINT_WATCHER = Event->timer (
3706 after => 11,
3707 interval => 60,
3708 hard => 1,
3709 prio => 0,
3710 data => WF_AUTOCANCEL,
3711 cb => sub {
3712 BDB::db_env_txn_checkpoint $DB_ENV, 0, 0, 0, sub { };
3713 },
3714 );
3715 $BDB_TRICKLE_WATCHER = Event->timer (
3716 after => 5,
3717 interval => 10,
3718 hard => 1,
3719 prio => 0,
3720 data => WF_AUTOCANCEL,
3721 cb => sub {
3722 BDB::db_env_memp_trickle $DB_ENV, 20, 0, sub { };
3723 },
3724 );
2660} 3725}
2661 3726
2662{ 3727{
2663 IO::AIO::min_parallel 8; 3728 IO::AIO::min_parallel 8;
2664 3729
… …
2667 $AIO_POLL_WATCHER = Event->io ( 3732 $AIO_POLL_WATCHER = Event->io (
2668 reentrant => 0, 3733 reentrant => 0,
2669 data => WF_AUTOCANCEL, 3734 data => WF_AUTOCANCEL,
2670 fd => IO::AIO::poll_fileno, 3735 fd => IO::AIO::poll_fileno,
2671 poll => 'r', 3736 poll => 'r',
2672 prio => 6, 3737 prio => 0,
2673 cb => \&IO::AIO::poll_cb, 3738 cb => \&IO::AIO::poll_cb,
2674 ); 3739 );
2675} 3740}
2676 3741
3742my $_log_backtrace;
3743
3744sub _log_backtrace {
3745 my ($msg, @addr) = @_;
3746
3747 $msg =~ s/\n//;
3748
3749 # limit the # of concurrent backtraces
3750 if ($_log_backtrace < 2) {
3751 ++$_log_backtrace;
3752 async {
3753 $Coro::current->{desc} = "abt $msg";
3754
3755 my @bt = fork_call {
3756 @addr = map { sprintf "%x", $_ } @addr;
3757 my $self = (-f "/proc/$$/exe") ? "/proc/$$/exe" : $^X;
3758 open my $fh, "exec addr2line -C -f -i -e \Q$self\E @addr 2>&1 |"
3759 or die "addr2line: $!";
3760
3761 my @funcs;
3762 my @res = <$fh>;
3763 chomp for @res;
3764 while (@res) {
3765 my ($func, $line) = splice @res, 0, 2, ();
3766 push @funcs, "[$func] $line";
3767 }
3768
3769 @funcs
3770 };
3771
3772 LOG llevInfo, "[ABT] $msg\n";
3773 LOG llevInfo, "[ABT] $_\n" for @bt;
3774 --$_log_backtrace;
3775 };
3776 } else {
3777 LOG llevInfo, "[ABT] $msg\n";
3778 LOG llevInfo, "[ABT] [suppressed]\n";
3779 }
3780}
3781
3782# load additional modules
3783use cf::pod;
3784
2677END { cf::emergency_save } 3785END { cf::emergency_save }
2678 3786
26791 37871
2680 3788

Diff Legend

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