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.130 by root, Thu Jan 4 00:08:08 2007 UTC vs.
Revision 1.146 by root, Sun Jan 7 23:10:43 2007 UTC

… …
17use Coro::Semaphore; 17use Coro::Semaphore;
18use Coro::AIO; 18use Coro::AIO;
19 19
20use Digest::MD5; 20use Digest::MD5;
21use Fcntl; 21use Fcntl;
22use IO::AIO 2.31 (); 22use IO::AIO 2.32 ();
23use YAML::Syck (); 23use YAML::Syck ();
24use Time::HiRes; 24use Time::HiRes;
25 25
26use Event; $Event::Eval = 1; # no idea why this is required, but it is 26use Event; $Event::Eval = 1; # no idea why this is required, but it is
27 27
28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode? 28# work around bug in YAML::Syck - bad news for perl6, will it be as broken wrt. unicode?
29$YAML::Syck::ImplicitUnicode = 1; 29$YAML::Syck::ImplicitUnicode = 1;
30 30
31$Coro::main->prio (2); # run main coroutine ("the server") with very high priority 31$Coro::main->prio (Coro::PRIO_MAX); # run main coroutine ("the server") with very high priority
32 32
33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload 33sub WF_AUTOCANCEL () { 1 } # automatically cancel this watcher on reload
34 34
35our %COMMAND = (); 35our %COMMAND = ();
36our %COMMAND_TIME = (); 36our %COMMAND_TIME = ();
… …
47our %CFG; 47our %CFG;
48 48
49our $UPTIME; $UPTIME ||= time; 49our $UPTIME; $UPTIME ||= time;
50our $RUNTIME; 50our $RUNTIME;
51 51
52our %PLAYER; # all users
52our %MAP; # all maps 53our %MAP; # all maps
53our $LINK_MAP; # the special {link} map 54our $LINK_MAP; # the special {link} map
54our $FREEZE;
55our $RANDOM_MAPS = cf::localdir . "/random"; 55our $RANDOM_MAPS = cf::localdir . "/random";
56our %EXT_CORO; 56our %EXT_CORO; # coroutines bound to extensions
57 57
58binmode STDOUT; 58binmode STDOUT;
59binmode STDERR; 59binmode STDERR;
60 60
61# read virtual server time, if available 61# read virtual server time, if available
… …
71mkdir cf::localdir . "/" . cf::uniquedir; 71mkdir cf::localdir . "/" . cf::uniquedir;
72mkdir $RANDOM_MAPS; 72mkdir $RANDOM_MAPS;
73 73
74# a special map that is always available 74# a special map that is always available
75our $LINK_MAP; 75our $LINK_MAP;
76 76our $EMERGENCY_POSITION;
77our $EMERGENCY_POSITION = $cf::CFG{emergency_position} || ["/world/world_105_115", 5, 37];
78 77
79############################################################################# 78#############################################################################
80 79
81=head2 GLOBAL VARIABLES 80=head2 GLOBAL VARIABLES
82 81
… …
119 utf8::encode $msg; 118 utf8::encode $msg;
120 119
121 $msg .= "\n" 120 $msg .= "\n"
122 unless $msg =~ /\n$/; 121 unless $msg =~ /\n$/;
123 122
124 LOG llevError, "cfperl: $msg"; 123 LOG llevError, $msg;
125 }; 124 };
126} 125}
127 126
128@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable'; 127@safe::cf::global::ISA = @cf::global::ISA = 'cf::attachable';
129@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable'; 128@safe::cf::object::ISA = @cf::object::ISA = 'cf::attachable';
… …
181sub to_json($) { 180sub to_json($) {
182 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs 181 $JSON::Syck::ImplicitUnicode = 0; # work around JSON::Syck bugs
183 JSON::Syck::Dump $_[0] 182 JSON::Syck::Dump $_[0]
184} 183}
185 184
186=item my $guard = cf::guard { BLOCK }
187
188Run the given callback when the guard object gets destroyed (useful for
189coroutine cancellations).
190
191You can call C<< ->cancel >> on the guard object to stop the block from
192being executed.
193
194=cut
195
196sub guard(&) {
197 bless \(my $cb = $_[0]), cf::guard::;
198}
199
200sub cf::guard::cancel {
201 ${$_[0]} = sub { };
202}
203
204sub cf::guard::DESTROY {
205 ${$_[0]}->();
206}
207
208=item cf::lock_wait $string 185=item cf::lock_wait $string
209 186
210Wait until the given lock is available. See cf::lock_acquire. 187Wait until the given lock is available. See cf::lock_acquire.
211 188
212=item my $lock = cf::lock_acquire $string 189=item my $lock = cf::lock_acquire $string
213 190
214Wait until the given lock is available and then acquires it and returns 191Wait until the given lock is available and then acquires it and returns
215a guard object. If the guard object gets destroyed (goes out of scope, 192a Coro::guard object. If the guard object gets destroyed (goes out of scope,
216for example when the coroutine gets canceled), the lock is automatically 193for example when the coroutine gets canceled), the lock is automatically
217returned. 194returned.
218 195
219Lock names should begin with a unique identifier (for example, find_map 196Lock names should begin with a unique identifier (for example, cf::map::find
220uses map_find and load_map uses map_load). 197uses map_find and cf::map::load uses map_load).
221 198
222=cut 199=cut
223 200
224our %LOCK; 201our %LOCK;
225 202
… …
239 # wait, to be sure we are not locked 216 # wait, to be sure we are not locked
240 lock_wait $key; 217 lock_wait $key;
241 218
242 $LOCK{$key} = []; 219 $LOCK{$key} = [];
243 220
244 cf::guard { 221 Coro::guard {
245 # wake up all waiters, to be on the safe side 222 # wake up all waiters, to be on the safe side
246 $_->ready for @{ delete $LOCK{$key} }; 223 $_->ready for @{ delete $LOCK{$key} };
247 } 224 }
248} 225}
249 226
227sub freeze_mainloop {
228 return unless $TICK_WATCHER->is_active;
229
230 my $guard = Coro::guard { $TICK_WATCHER->start };
231 $TICK_WATCHER->stop;
232 $guard
233}
234
250=item cf::async { BLOCK } 235=item cf::async { BLOCK }
251 236
252Like C<Coro::async>, but runs the given BLOCK in an eval and only logs the 237Currently the same as Coro::async_pool, meaning you cannot use
253error instead of exiting the server in case of a problem. 238C<on_destroy>, C<join> or other gimmicks on these coroutines. The only
239thing you are allowed to do is call C<prio> on it.
254 240
255=cut 241=cut
256 242
257sub async(&) { 243BEGIN { *async = \&Coro::async_pool }
258 my ($cb) = @_;
259
260 Coro::async {
261 eval { $cb->() };
262 warn $@ if $@;
263 }
264}
265 244
266=item cf::sync_job { BLOCK } 245=item cf::sync_job { BLOCK }
267 246
268The design of crossfire+ requires that the main coro ($Coro::main) is 247The design of crossfire+ requires that the main coro ($Coro::main) is
269always able to handle events or runnable, as crossfire+ is only partly 248always able to handle events or runnable, as crossfire+ is only partly
… …
283 # this is the main coro, too bad, we have to block 262 # this is the main coro, too bad, we have to block
284 # till the operation succeeds, freezing the server :/ 263 # till the operation succeeds, freezing the server :/
285 264
286 # TODO: use suspend/resume instead 265 # TODO: use suspend/resume instead
287 # (but this is cancel-safe) 266 # (but this is cancel-safe)
288 local $FREEZE = 1; 267 my $freeze_guard = freeze_mainloop;
289 268
290 my $busy = 1; 269 my $busy = 1;
291 my @res; 270 my @res;
292 271
293 (Coro::async { 272 (async {
294 @res = eval { $job->() }; 273 @res = eval { $job->() };
295 warn $@ if $@; 274 warn $@ if $@;
296 undef $busy; 275 undef $busy;
297 })->prio (Coro::PRIO_MAX); 276 })->prio (Coro::PRIO_MAX);
298 277
299 while ($busy) { 278 while ($busy) {
300 Coro::cede_notself; 279 Coro::cede or Event::one_event;
301 Event::one_event unless Coro::nready;
302 } 280 }
303 281
304 wantarray ? @res : $res[0] 282 wantarray ? @res : $res[0]
305 } else { 283 } else {
306 # we are in another coroutine, how wonderful, everything just works 284 # we are in another coroutine, how wonderful, everything just works
307 285
308 $job->() 286 $job->()
309 } 287 }
310} 288}
311 289
312=item $coro = cf::coro { BLOCK } 290=item $coro = cf::async_ext { BLOCK }
313 291
314Creates and returns a new coro. This coro is automcatially being canceled 292Like async, but this coro is automcatially being canceled when the
315when the extension calling this is being unloaded. 293extension calling this is being unloaded.
316 294
317=cut 295=cut
318 296
319sub coro(&) { 297sub async_ext(&) {
320 my $cb = shift; 298 my $cb = shift;
321 299
322 my $coro = &cf::async ($cb); 300 my $coro = &Coro::async ($cb);
323 301
324 $coro->on_destroy (sub { 302 $coro->on_destroy (sub {
325 delete $EXT_CORO{$coro+0}; 303 delete $EXT_CORO{$coro+0};
326 }); 304 });
327 $EXT_CORO{$coro+0} = $coro; 305 $EXT_CORO{$coro+0} = $coro;
… …
1094 1072
1095=head2 CORE EXTENSIONS 1073=head2 CORE EXTENSIONS
1096 1074
1097Functions and methods that extend core crossfire objects. 1075Functions and methods that extend core crossfire objects.
1098 1076
1077=cut
1078
1079package cf::player;
1080
1099=head3 cf::player 1081=head3 cf::player
1100 1082
1101=over 4 1083=over 4
1102 1084
1103=item cf::player::exists $login 1085=item cf::player::find $login
1104 1086
1105Returns true when the given account exists. 1087Returns the given player object, loading it if necessary (might block).
1106 1088
1107=cut 1089=cut
1108 1090
1109sub cf::player::exists($) { 1091sub playerdir($) {
1110 cf::player::find $_[0] 1092 cf::localdir
1111 or -f sprintf "%s/%s/%s/%s.pl", cf::localdir, cf::playerdir, ($_[0]) x 2; 1093 . "/"
1094 . cf::playerdir
1095 . "/"
1096 . (ref $_[0] ? $_[0]->ob->name : $_[0])
1097}
1098
1099sub path($) {
1100 my $login = ref $_[0] ? $_[0]->ob->name : $_[0];
1101
1102 (playerdir $login) . "/$login.pl"
1103}
1104
1105sub find_active($) {
1106 $cf::PLAYER{$_[0]}
1107 and $cf::PLAYER{$_[0]}->active
1108 and $cf::PLAYER{$_[0]}
1109}
1110
1111sub exists($) {
1112 my ($login) = @_;
1113
1114 $cf::PLAYER{$login}
1115 or cf::sync_job { !aio_stat $login }
1116}
1117
1118sub find($) {
1119 return $cf::PLAYER{$_[0]} || do {
1120 my $login = $_[0];
1121
1122 my $guard = cf::lock_acquire "user_find:$login";
1123
1124 $cf::PLAYER{$login} ||= (load_pl path $login or return);
1125 };
1126}
1127
1128sub save($) {
1129 my ($pl) = @_;
1130
1131 return if $pl->{deny_save};
1132
1133 my $path = path $pl;
1134 my $guard = cf::lock_acquire "user_save:$path";
1135
1136 return if $pl->{deny_save};
1137
1138 IO::AIO::aio_mkdir playerdir $pl, 0770;
1139 $pl->{last_save} = $cf::RUNTIME;
1140
1141 Coro::cede;
1142 $pl->save_pl ($path);
1143 Coro::cede;
1144}
1145
1146sub new($) {
1147 my ($login) = @_;
1148
1149 my $self = create;
1150
1151 $self->ob->name ($login);
1152 $self->{deny_save} = 1;
1153
1154 $cf::PLAYER{$login} = $self;
1155
1156 $self
1157}
1158
1159sub quit_character {
1160 my ($pl) = @_;
1161
1162 $pl->{deny_save} = 1;
1163 $pl->password ("*"); # this should lock out the player until we nuked the dir
1164
1165 $pl->invoke (cf::EVENT_PLAYER_LOGOUT, 1) if $pl->active;
1166 $pl->deactivate;
1167 $pl->invoke (cf::EVENT_PLAYER_QUIT);
1168 $pl->ns->destroy if $pl->ns;
1169
1170 my $path = playerdir $pl;
1171 my $temp = "$path~$cf::RUNTIME~deleting~";
1172 IO::AIO::aio_rename $path, $temp, sub {
1173 delete $cf::PLAYER{$pl->ob->name};
1174 $pl->destroy;
1175
1176 IO::AIO::aio_rmtree $temp;
1177 };
1112} 1178}
1113 1179
1114=item $player->ext_reply ($msgid, $msgtype, %msg) 1180=item $player->ext_reply ($msgid, $msgtype, %msg)
1115 1181
1116Sends an ext reply to the player. 1182Sends an ext reply to the player.
1117 1183
1118=cut 1184=cut
1119 1185
1120sub cf::player::ext_reply($$$%) { 1186sub ext_reply($$$%) {
1121 my ($self, $id, %msg) = @_; 1187 my ($self, $id, %msg) = @_;
1122 1188
1123 $msg{msgid} = $id; 1189 $msg{msgid} = $id;
1124 1190
1125 $self->send ("ext " . to_json \%msg); 1191 $self->send ("ext " . cf::to_json \%msg);
1126} 1192}
1193
1194package cf;
1127 1195
1128=back 1196=back
1129 1197
1130 1198
1131=head3 cf::map 1199=head3 cf::map
… …
1137package cf::map; 1205package cf::map;
1138 1206
1139use Fcntl; 1207use Fcntl;
1140use Coro::AIO; 1208use Coro::AIO;
1141 1209
1142our $MAX_RESET = 7200; 1210our $MAX_RESET = 3600;
1143our $DEFAULT_RESET = 3600; 1211our $DEFAULT_RESET = 3000;
1144 1212
1145sub generate_random_map { 1213sub generate_random_map {
1146 my ($path, $rmp) = @_; 1214 my ($path, $rmp) = @_;
1147 1215
1148 # mit "rum" bekleckern, nicht 1216 # mit "rum" bekleckern, nicht
… …
1178 or return; 1246 or return;
1179 1247
1180 my $map = cf::map::new 1248 my $map = cf::map::new
1181 or return; 1249 or return;
1182 1250
1251 # for better error messages only, will be overwritten
1252 $map->path ($path);
1253
1183 $map->load_header ($path) 1254 $map->load_header ($path)
1184 or return; 1255 or return;
1185 1256
1186 $map->{load_path} = $path; 1257 $map->{load_path} = $path;
1187 1258
1188 $map 1259 $map
1189} 1260}
1190 1261
1191sub find_map; 1262sub find;
1192sub find_map { 1263sub find {
1193 my ($path, $origin) = @_; 1264 my ($path, $origin) = @_;
1194 1265
1195 #warn "find_map<$path,$origin>\n";#d# 1266 #warn "find<$path,$origin>\n";#d#
1196 1267
1197 $path = new cf::path $path, $origin && $origin->path; 1268 $path = new cf::path $path, $origin && $origin->path;
1198 my $key = $path->as_string; 1269 my $key = $path->as_string;
1199 1270
1200 cf::lock_wait "map_find:$key"; 1271 cf::lock_wait "map_find:$key";
… …
1203 my $guard = cf::lock_acquire "map_find:$key"; 1274 my $guard = cf::lock_acquire "map_find:$key";
1204 1275
1205 # do it the slow way 1276 # do it the slow way
1206 my $map = try_load_header $path->save_path; 1277 my $map = try_load_header $path->save_path;
1207 1278
1279 Coro::cede;
1280
1208 if ($map) { 1281 if ($map) {
1282 $map->last_access ((delete $map->{last_access})
1283 || $cf::RUNTIME); #d#
1209 # safety 1284 # safety
1210 $map->{instantiate_time} = $cf::RUNTIME 1285 $map->{instantiate_time} = $cf::RUNTIME
1211 if $map->{instantiate_time} > $cf::RUNTIME; 1286 if $map->{instantiate_time} > $cf::RUNTIME;
1212 } else { 1287 } else {
1213 if (my $rmp = $path->random_map_params) { 1288 if (my $rmp = $path->random_map_params) {
… …
1218 1293
1219 $map or return; 1294 $map or return;
1220 1295
1221 $map->{load_original} = 1; 1296 $map->{load_original} = 1;
1222 $map->{instantiate_time} = $cf::RUNTIME; 1297 $map->{instantiate_time} = $cf::RUNTIME;
1298 $map->last_access ($cf::RUNTIME);
1223 $map->instantiate; 1299 $map->instantiate;
1224 1300
1225 # per-player maps become, after loading, normal maps 1301 # per-player maps become, after loading, normal maps
1226 $map->per_player (0) if $path->{user_rel}; 1302 $map->per_player (0) if $path->{user_rel};
1227 } 1303 }
1228 1304
1229 $map->path ($key); 1305 $map->path ($key);
1230 $map->{path} = $path; 1306 $map->{path} = $path;
1231 $map->{last_save} = $cf::RUNTIME; 1307 $map->{last_save} = $cf::RUNTIME;
1232 $map->last_access ($cf::RUNTIME); 1308
1309 Coro::cede;
1233 1310
1234 if ($map->should_reset) { 1311 if ($map->should_reset) {
1235 $map->reset; 1312 $map->reset;
1236 undef $guard; 1313 undef $guard;
1237 $map = find_map $path 1314 $map = find $path
1238 or return; 1315 or return;
1239 } 1316 }
1240 1317
1241 $cf::MAP{$key} = $map 1318 $cf::MAP{$key} = $map
1242 } 1319 }
… …
1264 if (aio_open $uniq, O_RDONLY, 0) { 1341 if (aio_open $uniq, O_RDONLY, 0) {
1265 $self->clear_unique_items; 1342 $self->clear_unique_items;
1266 $self->load_objects ($uniq, 0); 1343 $self->load_objects ($uniq, 0);
1267 } 1344 }
1268 } 1345 }
1346
1347 Coro::cede;
1269 1348
1270 # now do the right thing for maps 1349 # now do the right thing for maps
1271 $self->link_multipart_objects; 1350 $self->link_multipart_objects;
1272 1351
1273 if ($self->{path}->is_style_map) { 1352 if ($self->{path}->is_style_map) {
… …
1281 $self->difficulty ($self->estimate_difficulty) 1360 $self->difficulty ($self->estimate_difficulty)
1282 unless $self->difficulty; 1361 unless $self->difficulty;
1283 $self->activate; 1362 $self->activate;
1284 } 1363 }
1285 1364
1365 Coro::cede;
1366
1286 $self->in_memory (cf::MAP_IN_MEMORY); 1367 $self->in_memory (cf::MAP_IN_MEMORY);
1287} 1368}
1288 1369
1289sub load_map_sync { 1370sub find_sync {
1290 my ($path, $origin) = @_; 1371 my ($path, $origin) = @_;
1291 1372
1292 #warn "load_map_sync<$path, $origin>\n";#d# 1373 cf::sync_job { cf::map::find $path, $origin }
1374}
1293 1375
1294 cf::sync_job { 1376sub do_load_sync {
1295 my $map = cf::map::find_map $path, $origin 1377 my ($map) = @_;
1296 or return; 1378
1297 $map->load; 1379 cf::sync_job { $map->load };
1298 $map
1299 }
1300} 1380}
1301 1381
1302sub save { 1382sub save {
1303 my ($self) = @_; 1383 my ($self) = @_;
1304 1384
1385 my $lock = cf::lock_acquire "map_data:" . $self->path;
1386
1305 $self->{last_save} = $cf::RUNTIME; 1387 $self->{last_save} = $cf::RUNTIME;
1306 1388
1307 return unless $self->dirty; 1389 return unless $self->dirty;
1308 1390
1309 my $save = $self->{path}->save_path; utf8::encode $save; 1391 my $save = $self->{path}->save_path; utf8::encode $save;
1310 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq; 1392 my $uniq = $self->{path}->uniq_path; utf8::encode $uniq;
1311 1393
1312 $self->{load_path} = $save; 1394 $self->{load_path} = $save;
1313 1395
1314 return if $self->{deny_save}; 1396 return if $self->{deny_save};
1397
1398 local $self->{last_access} = $self->last_access;#d#
1399
1400 cf::async {
1401 $_->contr->save for $self->players;
1402 };
1315 1403
1316 if ($uniq) { 1404 if ($uniq) {
1317 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS); 1405 $self->save_objects ($save, cf::IO_HEADER | cf::IO_OBJECTS);
1318 $self->save_objects ($uniq, cf::IO_UNIQUES); 1406 $self->save_objects ($uniq, cf::IO_UNIQUES);
1319 } else { 1407 } else {
… …
1325 my ($self) = @_; 1413 my ($self) = @_;
1326 1414
1327 # save first because save cedes 1415 # save first because save cedes
1328 $self->save; 1416 $self->save;
1329 1417
1418 my $lock = cf::lock_acquire "map_data:" . $self->path;
1419
1330 return if $self->players; 1420 return if $self->players;
1331 return if $self->in_memory != cf::MAP_IN_MEMORY; 1421 return if $self->in_memory != cf::MAP_IN_MEMORY;
1332 return if $self->{deny_save}; 1422 return if $self->{deny_save};
1333 1423
1334 $self->clear; 1424 $self->clear;
… …
1376} 1466}
1377 1467
1378sub reset { 1468sub reset {
1379 my ($self) = @_; 1469 my ($self) = @_;
1380 1470
1471 my $lock = cf::lock_acquire "map_data:" . $self->path;
1472
1381 return if $self->players; 1473 return if $self->players;
1382 return if $self->{path}{user_rel};#d# 1474 return if $self->{path}{user_rel};#d#
1383 1475
1384 warn "resetting map ", $self->path;#d# 1476 warn "resetting map ", $self->path;#d#
1385 1477
… …
1404 1496
1405sub customise_for { 1497sub customise_for {
1406 my ($map, $ob) = @_; 1498 my ($map, $ob) = @_;
1407 1499
1408 if ($map->per_player) { 1500 if ($map->per_player) {
1409 return cf::map::find_map "~" . $ob->name . "/" . $map->{path}{path}; 1501 return cf::map::find "~" . $ob->name . "/" . $map->{path}{path};
1410 } 1502 }
1411 1503
1412 $map 1504 $map
1413} 1505}
1414 1506
1415sub emergency_save { 1507sub emergency_save {
1416 local $cf::FREEZE = 1; 1508 my $freeze_guard = cf::freeze_mainloop;
1417 1509
1418 warn "enter emergency map save\n"; 1510 warn "enter emergency perl save\n";
1419 1511
1420 cf::sync_job { 1512 cf::sync_job {
1513 warn "begin emergency player save\n";
1514 $_->save for values %cf::PLAYER;
1515 warn "end emergency player save\n";
1516
1421 warn "begin emergency map save\n"; 1517 warn "begin emergency map save\n";
1422 $_->save for values %cf::MAP; 1518 $_->save for values %cf::MAP;
1519 warn "end emergency map save\n";
1423 }; 1520 };
1424 1521
1425 warn "end emergency map save\n"; 1522 warn "leave emergency perl save\n";
1426} 1523}
1427 1524
1428package cf; 1525package cf;
1429 1526
1430=back 1527=back
… …
1511 my $link_pos = delete $self->{_link_pos}; 1608 my $link_pos = delete $self->{_link_pos};
1512 1609
1513 unless ($map) { 1610 unless ($map) {
1514 # restore original map position 1611 # restore original map position
1515 ($map, $x, $y) = @{ $link_pos || [] }; 1612 ($map, $x, $y) = @{ $link_pos || [] };
1516 $map = cf::map::find_map $map; 1613 $map = cf::map::find $map;
1517 1614
1518 unless ($map) { 1615 unless ($map) {
1519 ($map, $x, $y) = @$EMERGENCY_POSITION; 1616 ($map, $x, $y) = @$EMERGENCY_POSITION;
1520 $map = cf::map::find_map $map 1617 $map = cf::map::find $map
1521 or die "FATAL: cannot load emergency map\n"; 1618 or die "FATAL: cannot load emergency map\n";
1522 } 1619 }
1523 } 1620 }
1524 1621
1525 ($x, $y) = (-1, -1) 1622 ($x, $y) = (-1, -1)
… …
1529 ($x, $y) = ($map->enter_x, $map->enter_y) 1626 ($x, $y) = ($map->enter_x, $map->enter_y)
1530 if $x <=0 && $y <= 0; 1627 if $x <=0 && $y <= 0;
1531 1628
1532 $map->load; 1629 $map->load;
1533 1630
1631 return unless $self->contr->active;
1534 $self->activate_recursive; 1632 $self->activate_recursive;
1535 $self->enter_map ($map, $x, $y); 1633 $self->enter_map ($map, $x, $y);
1536} 1634}
1537 1635
1538cf::player->attach ( 1636cf::player->attach (
… …
1551 1649
1552 # try to abort aborted map switching on player login :) 1650 # try to abort aborted map switching on player login :)
1553 # should happen only on crashes 1651 # should happen only on crashes
1554 if ($pl->ob->{_link_pos}) { 1652 if ($pl->ob->{_link_pos}) {
1555 $pl->ob->enter_link; 1653 $pl->ob->enter_link;
1556 cf::async { 1654 (async {
1557 # we need this sleep as the login has a concurrent enter_exit running 1655 # we need this sleep as the login has a concurrent enter_exit running
1558 # and this sleep increases chances of the player not ending up in scorn 1656 # and this sleep increases chances of the player not ending up in scorn
1657 $pl->ob->reply (undef,
1658 "There was an internal problem at your last logout, "
1659 . "the server will try to bring you to your intended destination in a second.",
1660 cf::NDI_RED);
1559 Coro::Timer::sleep 1; 1661 Coro::Timer::sleep 1;
1560 $pl->ob->leave_link; 1662 $pl->ob->leave_link;
1561 }; 1663 })->prio (2);
1562 } 1664 }
1563 }, 1665 },
1564); 1666);
1565 1667
1566=item $player_object->goto_map ($path, $x, $y) 1668=item $player_object->goto ($path, $x, $y)
1567 1669
1568=cut 1670=cut
1569 1671
1570sub cf::object::player::goto_map { 1672sub cf::object::player::goto {
1571 my ($self, $path, $x, $y) = @_; 1673 my ($self, $path, $x, $y) = @_;
1572 1674
1573 $self->enter_link; 1675 $self->enter_link;
1574 1676
1575 (cf::async { 1677 (async {
1576 $path = new cf::path $path; 1678 $path = new cf::path $path;
1577 1679
1578 my $map = cf::map::find_map $path->as_string; 1680 my $map = cf::map::find $path->as_string;
1579 $map = $map->customise_for ($self) if $map; 1681 $map = $map->customise_for ($self) if $map;
1580 1682
1581# warn "entering ", $map->path, " at ($x, $y)\n" 1683# warn "entering ", $map->path, " at ($x, $y)\n"
1582# if $map; 1684# if $map;
1583 1685
… …
1642 1744
1643 return unless $self->type == cf::PLAYER; 1745 return unless $self->type == cf::PLAYER;
1644 1746
1645 $self->enter_link; 1747 $self->enter_link;
1646 1748
1647 (cf::async { 1749 (async {
1750 $self->deactivate_recursive; # just to be sure
1648 unless (eval { 1751 unless (eval {
1649 prepare_random_map $exit 1752 prepare_random_map $exit
1650 if $exit->slaying eq "/!"; 1753 if $exit->slaying eq "/!";
1651 1754
1652 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path; 1755 my $path = new cf::path $exit->slaying, $exit->map && $exit->map->path;
1653 $self->goto_map ($path, $exit->stats->hp, $exit->stats->sp); 1756 $self->goto ($path, $exit->stats->hp, $exit->stats->sp);
1654 1757
1655 1; 1758 1;
1656 }) { 1759 }) {
1657 $self->message ("Something went wrong deep within the crossfire server. " 1760 $self->message ("Something went wrong deep within the crossfire server. "
1658 . "I'll try to bring you back to the map you were before. " 1761 . "I'll try to bring you back to the map you were before. "
… …
1732 } 1835 }
1733 } 1836 }
1734 }, 1837 },
1735); 1838);
1736 1839
1737=item $client->coro (\&cb) 1840=item $client->async (\&cb)
1738 1841
1739Create a new coroutine, running the specified callback. The coroutine will 1842Create a new coroutine, running the specified callback. The coroutine will
1740be automatically cancelled when the client gets destroyed (e.g. on logout, 1843be automatically cancelled when the client gets destroyed (e.g. on logout,
1741or loss of connection). 1844or loss of connection).
1742 1845
1743=cut 1846=cut
1744 1847
1745sub cf::client::coro { 1848sub cf::client::async {
1746 my ($self, $cb) = @_; 1849 my ($self, $cb) = @_;
1747 1850
1748 my $coro = &cf::async ($cb); 1851 my $coro = &Coro::async ($cb);
1749 1852
1750 $coro->on_destroy (sub { 1853 $coro->on_destroy (sub {
1751 delete $self->{_coro}{$coro+0}; 1854 delete $self->{_coro}{$coro+0};
1752 }); 1855 });
1753 1856
… …
1988 open my $fh, "<:utf8", cf::confdir . "/config" 2091 open my $fh, "<:utf8", cf::confdir . "/config"
1989 or return; 2092 or return;
1990 2093
1991 local $/; 2094 local $/;
1992 *CFG = YAML::Syck::Load <$fh>; 2095 *CFG = YAML::Syck::Load <$fh>;
2096
2097 $EMERGENCY_POSITION = $CFG{emergency_position} || ["/world/world_105_115", 5, 37];
2098
2099 $cf::map::MAX_RESET = $CFG{map_max_reset} if exists $CFG{map_max_reset};
2100 $cf::map::DEFAULT_RESET = $CFG{map_default_reset} if exists $CFG{map_default_reset};
2101
2102 if (exists $CFG{mlockall}) {
2103 eval {
2104 $CFG{mlockall} ? &mlockall : &munlockall
2105 and die "WARNING: m(un)lockall failed: $!\n";
2106 };
2107 warn $@ if $@;
2108 }
1993} 2109}
1994 2110
1995sub main { 2111sub main {
1996 # we must not ever block the main coroutine 2112 # we must not ever block the main coroutine
1997 local $Coro::idle = sub { 2113 local $Coro::idle = sub {
1998 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d# 2114 Carp::cluck "FATAL: Coro::idle was called, major BUG, use cf::sync_job!\n";#d#
1999 (Coro::unblock_sub {
2000 Event::one_event; 2115 async { Event::one_event };
2001 })->();
2002 }; 2116 };
2003 2117
2004 cfg_load; 2118 cfg_load;
2005 db_load; 2119 db_load;
2006 load_extensions; 2120 load_extensions;
… …
2017 return; 2131 return;
2018 } 2132 }
2019 2133
2020 warn "reloading..."; 2134 warn "reloading...";
2021 2135
2022 local $FREEZE = 1; 2136 my $guard = freeze_mainloop;
2023 cf::emergency_save; 2137 cf::emergency_save;
2024 2138
2025 eval { 2139 eval {
2026 # if anything goes wrong in here, we should simply crash as we already saved 2140 # if anything goes wrong in here, we should simply crash as we already saved
2027 2141
… …
2089 cf::load_extensions; 2203 cf::load_extensions;
2090 2204
2091 # reattach attachments to objects 2205 # reattach attachments to objects
2092 warn "reattach"; 2206 warn "reattach";
2093 _global_reattach; 2207 _global_reattach;
2208 reattach $_ for values %MAP;
2094 }; 2209 };
2095 2210
2096 if ($@) { 2211 if ($@) {
2097 warn $@; 2212 warn $@;
2098 warn "error while reloading, exiting."; 2213 warn "error while reloading, exiting.";
… …
2114 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path"; 2229 $LINK_MAP->{path} = bless { path => "{link}" }, "cf::path";
2115 $LINK_MAP->in_memory (MAP_IN_MEMORY); 2230 $LINK_MAP->in_memory (MAP_IN_MEMORY);
2116 2231
2117 # dirty hack because... archetypes are not yet loaded 2232 # dirty hack because... archetypes are not yet loaded
2118 Event->timer ( 2233 Event->timer (
2119 after => 2, 2234 after => 10,
2120 cb => sub { 2235 cb => sub {
2121 $_[0]->w->cancel; 2236 $_[0]->w->cancel;
2122 2237
2123 # provide some exits "home" 2238 # provide some exits "home"
2124 my $exit = cf::object::new "exit"; 2239 my $exit = cf::object::new "exit";
… …
2163 reentrant => 0, 2278 reentrant => 0,
2164 prio => 0, 2279 prio => 0,
2165 at => $NEXT_TICK || $TICK, 2280 at => $NEXT_TICK || $TICK,
2166 data => WF_AUTOCANCEL, 2281 data => WF_AUTOCANCEL,
2167 cb => sub { 2282 cb => sub {
2168 unless ($FREEZE) {
2169 cf::server_tick; # one server iteration 2283 cf::server_tick; # one server iteration
2170 $RUNTIME += $TICK; 2284 $RUNTIME += $TICK;
2171 }
2172
2173 $NEXT_TICK += $TICK; 2285 $NEXT_TICK += $TICK;
2174 2286
2175 # if we are delayed by four ticks or more, skip them all 2287 # if we are delayed by four ticks or more, skip them all
2176 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4; 2288 $NEXT_TICK = Event::time if Event::time >= $NEXT_TICK + $TICK * 4;
2177 2289

Diff Legend

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